From patchwork Fri Oct 26 21:23:40 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Lindgren X-Patchwork-Id: 194567 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:4978:20e::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 0AA582C0093 for ; Sat, 27 Oct 2012 08:26:14 +1100 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TRrO0-00087R-UM; Fri, 26 Oct 2012 21:24:12 +0000 Received: from mho-04-ewr.mailhop.org ([204.13.248.74] helo=mho-02-ewr.mailhop.org) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TRrNc-00082R-PK for linux-arm-kernel@lists.infradead.org; Fri, 26 Oct 2012 21:23:50 +0000 Received: from c-98-234-237-12.hsd1.ca.comcast.net ([98.234.237.12] helo=localhost.localdomain) by mho-02-ewr.mailhop.org with esmtpa (Exim 4.72) (envelope-from ) id 1TRrNb-000Mkv-4x; Fri, 26 Oct 2012 21:23:47 +0000 X-Mail-Handler: Dyn Standard SMTP by Dyn X-Originating-IP: 98.234.237.12 X-Report-Abuse-To: abuse@dyndns.com (see http://www.dyndns.com/services/sendlabs/outbound_abuse.html for abuse reporting information) X-MHO-User: U2FsdGVkX19WBuCn9d5YO0A5UXuj9xex Content-Disposition: inline MIME-Version: 1.0 X-Mailer: MIME::Lite 3.028 (F2.82; T1.35; A2.09; B3.13; Q3.13) Date: Fri, 26 Oct 2012 14:23:40 -0700 From: Tony Lindgren To: Arnd Bergmann , Olof Johansson Subject: [GIT PULL 3/3] omap prcm cleanup for v3.8 merge window, part1 In-Reply-To: X-Bad-Reply: In-Reply-To but no 'Re:' in Subject. X-Spam-Note: CRM114 invocation failed X-Spam-Score: -1.4 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.4 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [204.13.248.74 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 0.5 MISSING_MID Missing Message-Id: header Cc: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Message-ID: Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org The following changes since commit a0212796b58061a9716178d261f318925c246643: Merge tag 'omap-cleanup-fixes-a-for-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v3.8/cleanup-headers (2012-10-26 13:18:19 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/cleanup-prcm-part1-take2-signed for you to fetch changes up to 7fc54fd3084457c7f11b9e2e1e3fcd19a3badc33: Merge branch 'omap-for-v3.8/cleanup-headers' into omap-for-v3.8/cleanup-prcm (2012-10-26 13:32:22 -0700) ---------------------------------------------------------------- >From Paul Walmsley : The first set of OMAP PRM/CM-related cleanup patches for 3.8. Prepares for the future move of the PRM/CM code to drivers/. Also includes some prcm.[ch] cleanup patches from the WDTIMER cleanup series that don't need external acks. ---------------------------------------------------------------- Paul Walmsley (9): ARM: OMAP2+: PRM: remove PRM weak functions ARM: OMAP2+: PRM: split PRM functions into OMAP2, OMAP3-specific files ARM: OMAP2+: powerdomain/PRM: move the low-level powerdomain functions into PRM ARM: OMAP2+: CM/hwmod: split CM functions into OMAP2, OMAP3-specific files ARM: OMAP2/3: clockdomain/PRM/CM: move the low-level clockdomain functions into PRM/CM ARM: OMAP2+: PRM: prepare for use of prm_ll_data function pointers ARM: OMAP2+: CM: prepare for use of cm_ll_data function pointers ARM: OMAP1: create read_reset_sources() function (for initial use by watchdog) ARM: OMAP2+: PRM: create PRM reset source API for the watchdog timer driver Tony Lindgren (2): Merge tag 'omap-cleanup-a-for-3.8' of git://git.kernel.org/.../pjw/omap-pending into omap-for-v3.8/cleanup-prcm Merge branch 'omap-for-v3.8/cleanup-headers' into omap-for-v3.8/cleanup-prcm arch/arm/mach-omap1/common.h | 2 + arch/arm/mach-omap1/reset.c | 38 +++ arch/arm/mach-omap2/Makefile | 110 ++++--- arch/arm/mach-omap2/clkt2xxx_apll.c | 2 +- arch/arm/mach-omap2/clkt2xxx_dpll.c | 2 +- arch/arm/mach-omap2/clock.c | 3 +- arch/arm/mach-omap2/clock2420_data.c | 2 +- arch/arm/mach-omap2/clock2430.c | 2 +- arch/arm/mach-omap2/clock2430_data.c | 2 +- arch/arm/mach-omap2/clock34xx.c | 2 +- arch/arm/mach-omap2/clock3517.c | 2 +- arch/arm/mach-omap2/clock3xxx_data.c | 2 +- arch/arm/mach-omap2/clockdomain2xxx_3xxx.c | 341 ------------------- arch/arm/mach-omap2/clockdomain33xx.c | 74 ----- arch/arm/mach-omap2/clockdomain44xx.c | 151 --------- arch/arm/mach-omap2/cm.h | 12 + arch/arm/mach-omap2/cm2xxx.c | 255 ++++++++++++++ arch/arm/mach-omap2/cm2xxx.h | 66 ++++ arch/arm/mach-omap2/cm2xxx_3xxx.h | 119 +++---- arch/arm/mach-omap2/cm33xx.c | 56 ++++ arch/arm/mach-omap2/{cm2xxx_3xxx.c => cm3xxx.c} | 307 +++++++++-------- arch/arm/mach-omap2/cm3xxx.h | 86 +++++ arch/arm/mach-omap2/cm_common.c | 71 ++++ arch/arm/mach-omap2/cminst44xx.c | 142 +++++++- arch/arm/mach-omap2/control.c | 4 +- arch/arm/mach-omap2/omap_hwmod.c | 51 ++- arch/arm/mach-omap2/pm24xx.c | 4 +- arch/arm/mach-omap2/pm34xx.c | 5 +- arch/arm/mach-omap2/powerdomain2xxx_3xxx.c | 242 -------------- arch/arm/mach-omap2/powerdomain33xx.c | 229 ------------- arch/arm/mach-omap2/powerdomain44xx.c | 285 ---------------- arch/arm/mach-omap2/prm-regbits-24xx.h | 6 +- arch/arm/mach-omap2/prm-regbits-34xx.h | 12 +- arch/arm/mach-omap2/prm.h | 53 +++ arch/arm/mach-omap2/prm2xxx.c | 126 +++++++ arch/arm/mach-omap2/prm2xxx.h | 132 ++++++++ arch/arm/mach-omap2/prm2xxx_3xxx.c | 332 +++++++------------ arch/arm/mach-omap2/prm2xxx_3xxx.h | 277 ++++------------ arch/arm/mach-omap2/prm33xx.c | 202 ++++++++++++ arch/arm/mach-omap2/prm3xxx.c | 403 +++++++++++++++++++++++ arch/arm/mach-omap2/prm3xxx.h | 160 +++++++++ arch/arm/mach-omap2/prm44xx.c | 355 +++++++++++++++++++- arch/arm/mach-omap2/prm44xx.h | 2 + arch/arm/mach-omap2/prm_common.c | 104 +++--- arch/arm/mach-omap2/sdrc2xxx.c | 2 +- arch/arm/mach-omap2/sleep34xx.S | 4 +- arch/arm/mach-omap2/sram242x.S | 4 +- arch/arm/mach-omap2/sram243x.S | 4 +- arch/arm/mach-omap2/sram34xx.S | 2 +- 49 files changed, 2750 insertions(+), 2099 deletions(-) delete mode 100644 arch/arm/mach-omap2/clockdomain2xxx_3xxx.c delete mode 100644 arch/arm/mach-omap2/clockdomain33xx.c delete mode 100644 arch/arm/mach-omap2/clockdomain44xx.c create mode 100644 arch/arm/mach-omap2/cm2xxx.c create mode 100644 arch/arm/mach-omap2/cm2xxx.h rename arch/arm/mach-omap2/{cm2xxx_3xxx.c => cm3xxx.c} (72%) create mode 100644 arch/arm/mach-omap2/cm3xxx.h create mode 100644 arch/arm/mach-omap2/cm_common.c delete mode 100644 arch/arm/mach-omap2/powerdomain2xxx_3xxx.c delete mode 100644 arch/arm/mach-omap2/powerdomain33xx.c delete mode 100644 arch/arm/mach-omap2/powerdomain44xx.c create mode 100644 arch/arm/mach-omap2/prm2xxx.c create mode 100644 arch/arm/mach-omap2/prm2xxx.h create mode 100644 arch/arm/mach-omap2/prm3xxx.c create mode 100644 arch/arm/mach-omap2/prm3xxx.h