From patchwork Fri Aug 16 17:20:26 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Warren X-Patchwork-Id: 267724 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from casper.infradead.org (unknown [IPv6:2001:770:15f::2]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 018E12C0287 for ; Sat, 17 Aug 2013 03:23:18 +1000 (EST) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VANis-0004wE-87; Fri, 16 Aug 2013 17:22:02 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VANib-0007RT-NY; Fri, 16 Aug 2013 17:21:45 +0000 Received: from avon.wwwdotorg.org ([2001:470:1f0f:bd7::2]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VANhv-0007LS-HC for linux-arm-kernel@lists.infradead.org; Fri, 16 Aug 2013 17:21:09 +0000 Received: from severn.wwwdotorg.org (unknown [192.168.65.5]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by avon.wwwdotorg.org (Postfix) with ESMTPS id EEB79631F; Fri, 16 Aug 2013 11:20:41 -0600 (MDT) Received: from swarren-lx1.nvidia.com (localhost [127.0.0.1]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by severn.wwwdotorg.org (Postfix) with ESMTPSA id 684B1E47A4; Fri, 16 Aug 2013 11:20:40 -0600 (MDT) From: Stephen Warren To: arm@kernel.org Subject: [GIT PULL 2/4] ARM: tegra: core SoC enhancements for 3.12 Date: Fri, 16 Aug 2013 11:20:26 -0600 Message-Id: <1376673628-5867-2-git-send-email-swarren@wwwdotorg.org> X-Mailer: git-send-email 1.8.1.5 In-Reply-To: <1376673628-5867-1-git-send-email-swarren@wwwdotorg.org> References: <1376673628-5867-1-git-send-email-swarren@wwwdotorg.org> X-NVConfidentiality: public X-Virus-Scanned: clamav-milter 0.97.8 at avon.wwwdotorg.org X-Virus-Status: Clean X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130816_132103_966218_C1593707 X-CRM114-Status: GOOD ( 17.39 ) X-Spam-Score: -4.6 (----) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-4.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -2.7 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: linux-tegra@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Stephen Warren X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org This branch includes a number of enhancements to core SoC support for Tegra devices. The major new features are: * Adds a new CPU-power-gated cpuidle state for Tegra114. * Adds initial system suspend support for Tegra114, initially supporting just CPU-power-gating during suspend. * Adds "LP1" suspend mode support for all of Tegra20/30/114. This mode both gates CPU power, and places the DRAM into self-refresh mode. * A new DT-driven PCIe driver to Tegra20/30. The driver is also moved from arch/arm/mach-tegra/ to drivers/pci/host/. The PCIe driver work depends on the following tag from Thomas Petazzoni: git://git.infradead.org/linux-mvebu.git mis-3.12.2 ... which is merged into the middle of this pull request. ---------------------------------------------------------------- (If the location of the merge into this branch is problematic, just let me know and I'll rebase everything on top of the merge) The following changes since commit ad81f0545ef01ea651886dddac4bef6cec930092: Linux 3.11-rc1 are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git tegra-for-3.12-soc for you to fetch changes up to b4f173752a56187bd55752b0474429202f2ab1d3: ARM: tegra: disable LP2 cpuidle state if PCIe is enabled ---------------------------------------------------------------- Jay Agarwal (1): PCI: tegra: Add Tegra 30 PCIe support Joseph Lo (21): ARM: tegra: enable Cortex-A15 erratum 798181 Revert "ARM: tegra: add cpu_disable for hotplug" ARM: tegra114: Reprogram GIC CPU interface to bypass IRQ on CPU PM entry ARM: tegra114: add low level support for CPU idle powered-down mode ARM: tegra114: cpuidle: add powered-down state ARM: tegra: do v7_invalidate_l1 only when CPU is Cortex-A9 ARM: tegra: add a flag for tegra_disable_clean_inv_dcache to do LoUIS or ALL ARM: tegra: set up the correct L2 data RAM latency for Cortex-A15 ARM: tegra: add low level code for Tegra114 cluster power down ARM: tegra: shut off the CPU rail when the last CPU in suspend ARM: tegra: hook tegra_tear_down_cpu function ARM: tegra: flowctrl: add support for cpu_suspend_enter/exit clk: tegra: add suspend/resume function for tegra_cpu_car_ops ARM: tegra: remove the limitation that Tegra114 can't support suspend ARM: tegra: add common resume handling code for LP1 resuming ARM: tegra: config the polarity of the request of sys clock clk: tegra114: add LP1 suspend/resume support ARM: tegra: add common LP1 suspend support ARM: tegra: add LP1 suspend support for Tegra30 ARM: tegra: add LP1 suspend support for Tegra20 ARM: tegra: add LP1 suspend support for Tegra114 Stephen Warren (4): ARM: tegra: unify Tegra's Kconfig a bit more Merge tag 'msi-3.12-2' into for-3.12/soc PCI: tegra: set up PADS_REFCLK_CFG1 ARM: tegra: disable LP2 cpuidle state if PCIe is enabled Thierry Reding (3): PCI: tegra: Move PCIe driver to drivers/pci/host MAINTAINERS: Add myself as Tegra PCIe maintainer (and the following from the dependency branch) Thierry Reding (3): PCI: Introduce new MSI chip infrastructure Thomas Petazzoni (5): PCI: use weak functions for MSI arch-specific functions PCI: remove ARCH_SUPPORTS_MSI kconfig option of: pci: add registry of MSI chips ARM: pci: add ->add_bus() and ->remove_bus() hooks to hw_pci PCI: msi: add default MSI operations for !HAVE_GENERIC_HARDIRQS platforms .../bindings/pci/nvidia,tegra20-pcie.txt | 163 ++ MAINTAINERS | 7 + arch/arm/Kconfig | 1 - arch/arm/include/asm/mach/pci.h | 4 + arch/arm/kernel/bios32.c | 16 + arch/arm/mach-tegra/Kconfig | 29 +- arch/arm/mach-tegra/Makefile | 6 +- arch/arm/mach-tegra/board-harmony-pcie.c | 89 - arch/arm/mach-tegra/board.h | 8 - arch/arm/mach-tegra/common.h | 1 - arch/arm/mach-tegra/cpuidle-tegra114.c | 51 +- arch/arm/mach-tegra/cpuidle-tegra20.c | 12 + arch/arm/mach-tegra/cpuidle.c | 10 + arch/arm/mach-tegra/cpuidle.h | 1 + arch/arm/mach-tegra/flowctrl.c | 2 + arch/arm/mach-tegra/flowctrl.h | 9 + arch/arm/mach-tegra/headsmp.S | 3 +- arch/arm/mach-tegra/hotplug.c | 13 +- arch/arm/mach-tegra/iomap.h | 11 +- arch/arm/mach-tegra/irq.c | 40 + arch/arm/mach-tegra/pcie.c | 886 --------- arch/arm/mach-tegra/platsmp.c | 1 - arch/arm/mach-tegra/pm-tegra20.c | 34 + arch/arm/mach-tegra/pm-tegra30.c | 34 + arch/arm/mach-tegra/pm.c | 148 +- arch/arm/mach-tegra/pm.h | 12 + arch/arm/mach-tegra/pmc.c | 53 +- arch/arm/mach-tegra/pmc.h | 3 + arch/arm/mach-tegra/reset-handler.S | 21 +- arch/arm/mach-tegra/reset.c | 2 + arch/arm/mach-tegra/reset.h | 4 + arch/arm/mach-tegra/sleep-tegra20.S | 297 +++ arch/arm/mach-tegra/sleep-tegra30.S | 616 ++++++- arch/arm/mach-tegra/sleep.S | 37 +- arch/arm/mach-tegra/sleep.h | 14 +- arch/arm/mach-tegra/tegra.c | 24 - arch/ia64/Kconfig | 1 - arch/mips/Kconfig | 2 - arch/mips/include/asm/pci.h | 5 - arch/powerpc/Kconfig | 1 - arch/powerpc/include/asm/pci.h | 5 - arch/s390/Kconfig | 1 - arch/s390/include/asm/pci.h | 4 - arch/sparc/Kconfig | 1 - arch/tile/Kconfig | 1 - arch/x86/Kconfig | 1 - arch/x86/include/asm/pci.h | 30 - arch/x86/kernel/x86_init.c | 24 + drivers/clk/tegra/clk-tegra114.c | 38 + drivers/of/of_pci.c | 45 + drivers/pci/Kconfig | 4 - drivers/pci/host/Kconfig | 4 + drivers/pci/host/Makefile | 1 + drivers/pci/host/pci-tegra.c | 1702 ++++++++++++++++++ drivers/pci/msi.c | 85 +- drivers/pci/probe.c | 1 + include/linux/msi.h | 21 +- include/linux/of_pci.h | 12 + include/linux/pci.h | 1 + include/linux/tegra-cpuidle.h | 19 + 60 files changed, 3521 insertions(+), 1150 deletions(-) create mode 100644 Documentation/devicetree/bindings/pci/nvidia,tegra20-pcie.txt delete mode 100644 arch/arm/mach-tegra/board-harmony-pcie.c delete mode 100644 arch/arm/mach-tegra/pcie.c create mode 100644 arch/arm/mach-tegra/pm-tegra20.c create mode 100644 arch/arm/mach-tegra/pm-tegra30.c create mode 100644 drivers/pci/host/pci-tegra.c create mode 100644 include/linux/tegra-cpuidle.h