From patchwork Thu Dec 8 18:45:40 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 130211 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 318751007D1 for ; Fri, 9 Dec 2011 05:48:39 +1100 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1RYiya-0007Ei-0Q; Thu, 08 Dec 2011 18:45:48 +0000 Received: from na3sys009aog120.obsmtp.com ([74.125.149.140]) by merlin.infradead.org with smtps (Exim 4.76 #1 (Red Hat Linux)) id 1RYiyW-0007EG-Ex for linux-arm-kernel@lists.infradead.org; Thu, 08 Dec 2011 18:45:45 +0000 Received: from mail-iy0-f175.google.com ([209.85.210.175]) (using TLSv1) by na3sys009aob120.postini.com ([74.125.148.12]) with SMTP ID DSNKTuEF1nKjkhmDwbiAQ6lJC6ryEit45m1n@postini.com; Thu, 08 Dec 2011 10:45:44 PST Received: by iadj38 with SMTP id j38so2956975iad.6 for ; Thu, 08 Dec 2011 10:45:42 -0800 (PST) Received: by 10.231.63.140 with SMTP id b12mr9767ibi.2.1323369942306; Thu, 08 Dec 2011 10:45:42 -0800 (PST) Received: from localhost (c-24-19-7-36.hsd1.wa.comcast.net. [24.19.7.36]) by mx.google.com with ESMTPS id zs7sm12118714igb.0.2011.12.08.10.45.41 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 08 Dec 2011 10:45:42 -0800 (PST) From: Kevin Hilman To: Tony Lindgren Subject: [GIT PULL] OMAP: PM support for OMAP4 MPU sub-system Organization: Texas Instruments, Inc. Date: Thu, 08 Dec 2011 10:45:40 -0800 Message-ID: <874nxaewbv.fsf@ti.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.3 (gnu/linux) MIME-Version: 1.0 X-Spam-Note: CRM114 invocation failed X-Spam-Score: -4.2 (----) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-4.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [74.125.149.140 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: linux-omap , linux-arm-kernel 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 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 MPUSS PM series below. It is based on the Russell's devel-stable branch due to dependencies Kevin The following changes since commit 3ee0fc5ca129cbae81c073756febcb1c552af446: Merge branch 'kexec/idmap' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into devel-stable (2011-12-06 20:27:54 +0000) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm.git for_3.3/pm/omap4-mpuss 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: Fix errata i688 with MPU interconnect barriers. 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 arch/arm/mach-omap2/Kconfig | 21 + arch/arm/mach-omap2/Makefile | 16 +- arch/arm/mach-omap2/common.h | 64 +++- arch/arm/mach-omap2/cpuidle34xx.c | 15 + arch/arm/mach-omap2/cpuidle44xx.c | 245 ++++++++++++ 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/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 | 153 ++++++++- arch/arm/mach-omap2/sleep44xx.S | 379 +++++++++++++++++++ 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 | 6 +- arch/arm/plat-omap/sram.c | 8 + 26 files changed, 2126 insertions(+), 34 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