| Submitter | Kevin Hilman |
|---|---|
| Date | Oct. 14, 2011, 10:54 p.m. |
| Message ID | <878vonchh1.fsf@ti.com> |
| Download | mbox |
| Permalink | /patch/119934/ |
| State | New |
| Headers | show
Return-Path: <linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org> 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 0C03CB70FF for <incoming-imx@patchwork.ozlabs.org>; Sat, 15 Oct 2011 09:54:27 +1100 (EST) Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1REqdp-0000w1-VO; Fri, 14 Oct 2011 22:54:14 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1REqdp-0005UQ-Mt; Fri, 14 Oct 2011 22:54:13 +0000 Received: from na3sys009aog121.obsmtp.com ([74.125.149.145]) by canuck.infradead.org with smtps (Exim 4.76 #1 (Red Hat Linux)) id 1REqdm-0005Tt-2X for linux-arm-kernel@lists.infradead.org; Fri, 14 Oct 2011 22:54:11 +0000 Received: from mail-pz0-f49.google.com ([209.85.210.49]) (using TLSv1) by na3sys009aob121.postini.com ([74.125.148.12]) with SMTP; Fri, 14 Oct 2011 15:54:09 PDT Received: by pzk32 with SMTP id 32so734709pzk.8 for <linux-arm-kernel@lists.infradead.org>; Fri, 14 Oct 2011 15:54:06 -0700 (PDT) Received: by 10.68.31.231 with SMTP id d7mr19492560pbi.131.1318632846507; Fri, 14 Oct 2011 15:54:06 -0700 (PDT) Received: from localhost (c-24-19-7-36.hsd1.wa.comcast.net. [24.19.7.36]) by mx.google.com with ESMTPS id z1sm27408570pbl.5.2011.10.14.15.54.04 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 14 Oct 2011 15:54:05 -0700 (PDT) From: Kevin Hilman <khilman@ti.com> To: Tony Lindgren <tony@atomide.com> Subject: [GIT PULL] OMAP4 MPU sub-system PM for v3.2 Organization: Texas Instruments, Inc. Date: Fri, 14 Oct 2011 15:54:02 -0700 Message-ID: <878vonchh1.fsf@ti.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.50 (gnu/linux) MIME-Version: 1.0 X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20111014_185410_379915_DC50D24D X-CRM114-Status: GOOD ( 14.32 ) X-Spam-Score: -2.3 (--) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (-2.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [74.125.149.145 listed in list.dnswl.org] Cc: linux-omap <linux-omap@vger.kernel.org>, linux-arm-kernel <linux-arm-kernel@lists.infradead.org> X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe> List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/> List-Post: <mailto:linux-arm-kernel@lists.infradead.org> List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org |
Tony, Please pull the OMAP4 PM support for the MPU sub-system. This branch is built on top of my for_3.2/omap4-pm-base branch which is simply a merge of Russell's devel-stable and Thomas' irq/core branch (both already part of Arnd's arm-soc/for-next branch.) Special thanks to Santosh for this series and also the quick response on a few last minute build/test issues I came across so we can hopefully still get this in for v3.2. Kevin The following changes since commit fe7f69ad79056043413aeb7e5ce27841fe3eb20e: Merge branch 'irq/core' of git://tesla.tglx.de/git/linux-2.6-tip into for_3.2/omap4-mpuss-pm (2011-10-07 11:29:32 -0700) are available in the git repository at: git://github.com/khilman/linux-omap-pm.git for_3.2/omap4-pm Kevin Hilman (1): Merge branch 'for_3.2/omap4-mpuss-pm' into for_3.2/omap4-pm Santosh Shilimkar (24): ARM: OMAP4: Use WARN_ON() instead of BUG_ON() with graceful exit ARM: OMAP4: Export omap4_get_base*() rather than global address pointers ARM: OMAP4: PM: Add SAR RAM support ARM: OMAP4: PM: Keep static dep between MPUSS-EMIF and MPUSS-L3/L4 and DUCATI-L3 ARM: OMAP4: PM: Avoid omap4_pm_init() on OMAP4430 ES1.0 ARM: OMAP4: PM: Initialise all the clockdomains to supported states ARM: OMAP: Add Secure HAL and monitor mode API infrastructure. ARM: OMAP: PM: Add support to allocate the memory for secure RAM ARM: OMAP4: PM: Add WakeupGen module as OMAP gic_arch_extn ARM: OMAP4: PM: Add CPUX OFF mode support ARM: OMAP4: Remove __INIT from omap_secondary_startup() to re-use it for hotplug. ARM: OMAP4: PM: Program CPU1 to hit OFF when off-lined ARM: OMAP4: PM: CPU1 wakeup workaround from Low power modes ARM: OMAP4: PM: Use custom omap_do_wfi() for default idle. ARM: OMAP4: suspend: Add MPUSS power domain RETENTION support ARM: OMAP4: Remove un-used do_wfi() macro. ARM: OMAP4: PM: Add WakeupGen and secure GIC low power support ARM: OMAP4: PM: Add L2X0 cache lowpower support ARM: OMAP4: PM: Add MPUSS power domain OSWR support ARM: OMAP4: PM: Add power domain statistics support ARM: OMAP4: PM: Add CPUidle support ARM: OMAP4: cpuidle: Switch to gptimer from twd in deeper C-states. ARM: OMAP3: CPUidle: Make use of CPU PM notifiers ARM: OMAP4: Fix errata i688 with MPU interconnect barriers. arch/arm/mach-omap2/Kconfig | 21 + arch/arm/mach-omap2/Makefile | 16 +- arch/arm/mach-omap2/cpuidle34xx.c | 15 + arch/arm/mach-omap2/cpuidle44xx.c | 218 +++++++++++ arch/arm/mach-omap2/include/mach/barriers.h | 31 ++ arch/arm/mach-omap2/include/mach/omap-secure.h | 57 +++ arch/arm/mach-omap2/include/mach/omap-wakeupgen.h | 39 ++ arch/arm/mach-omap2/include/mach/omap4-common.h | 67 +++- arch/arm/mach-omap2/io.c | 9 + arch/arm/mach-omap2/omap-headsmp.S | 5 - arch/arm/mach-omap2/omap-hotplug.c | 14 +- arch/arm/mach-omap2/omap-mpuss-lowpower.c | 398 ++++++++++++++++++++ arch/arm/mach-omap2/omap-secure.c | 81 ++++ arch/arm/mach-omap2/{omap44xx-smc.S => omap-smc.S} | 23 ++ arch/arm/mach-omap2/omap-smp.c | 45 +++ arch/arm/mach-omap2/omap-wakeupgen.c | 389 +++++++++++++++++++ arch/arm/mach-omap2/omap4-common.c | 94 +++++- arch/arm/mach-omap2/omap4-sar-layout.h | 50 +++ arch/arm/mach-omap2/pm.h | 1 + arch/arm/mach-omap2/pm44xx.c | 156 ++++++++- arch/arm/mach-omap2/sleep44xx.S | 378 +++++++++++++++++++ arch/arm/plat-omap/common.c | 3 + arch/arm/plat-omap/include/plat/omap-secure.h | 13 + arch/arm/plat-omap/include/plat/omap44xx.h | 1 + arch/arm/plat-omap/include/plat/sram.h | 5 + arch/arm/plat-omap/sram.c | 11 +- 26 files changed, 2104 insertions(+), 36 deletions(-) create mode 100644 arch/arm/mach-omap2/cpuidle44xx.c create mode 100644 arch/arm/mach-omap2/include/mach/barriers.h create mode 100644 arch/arm/mach-omap2/include/mach/omap-secure.h create mode 100644 arch/arm/mach-omap2/include/mach/omap-wakeupgen.h create mode 100644 arch/arm/mach-omap2/omap-mpuss-lowpower.c create mode 100644 arch/arm/mach-omap2/omap-secure.c rename arch/arm/mach-omap2/{omap44xx-smc.S => omap-smc.S} (70%) create mode 100644 arch/arm/mach-omap2/omap-wakeupgen.c create mode 100644 arch/arm/mach-omap2/omap4-sar-layout.h create mode 100644 arch/arm/mach-omap2/sleep44xx.S create mode 100644 arch/arm/plat-omap/include/plat/omap-secure.h