From patchwork Thu Feb 23 18:00:05 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pawel Moll X-Patchwork-Id: 142687 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from merlin.infradead.org (unknown [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 7FFBBB6EF1 for ; Fri, 24 Feb 2012 05:02:41 +1100 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1S0cxh-0000E3-83; Thu, 23 Feb 2012 18:00:13 +0000 Received: from service87.mimecast.com ([91.220.42.44]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1S0cxd-0000Dg-5P for linux-arm-kernel@lists.infradead.org; Thu, 23 Feb 2012 18:00:10 +0000 Received: from cam-owa2.Emea.Arm.com (fw-tnat.cambridge.arm.com [217.140.96.21]) by service87.mimecast.com; Thu, 23 Feb 2012 18:00:05 +0000 Received: from [10.1.205.47] ([10.1.255.212]) by cam-owa2.Emea.Arm.com with Microsoft SMTPSVC(6.0.3790.3959); Thu, 23 Feb 2012 18:00:21 +0000 Message-ID: <1330020005.2727.11.camel@hornet.cambridge.arm.com> Subject: [GIT PULL] Versatile Express DT support From: Pawel Moll To: arm@kernel.org Date: Thu, 23 Feb 2012 18:00:05 +0000 X-Mailer: Evolution 3.2.2- Mime-Version: 1.0 X-OriginalArrivalTime: 23 Feb 2012 18:00:21.0579 (UTC) FILETIME=[028C41B0:01CCF255] X-MC-Unique: 112022318000600201 X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [91.220.42.44 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: Marc Zyngier , Jon Medhurst , Will Deacon , 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 Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org Hello Arnd, Olof, Please pull the Versatile Express DT patches, rebased on top of v3.3-rc4. I think I addressed all the comments I received: - fixed the difference between DT and non-DT machine name (missing '-') - as probing DEBUG_LL UART address proved to be unsafe, it is now determined based on a PERIPHBASE register, which can be safely checked - DTS don't include skeleton.dtsi any more, so there is no bogus memory node - changed TWD bindings to be in line with Marc Zygier's series - as the static mappings are now reused, all pointer arithmetic was replaced with ioremap()s First patch causes one trivial conflict with depends/rmk/for-armsoc (for your reference, I resolved it in vexpress-dt-rmk-for-armsoc branch) Thanks! Pawel The following changes since commit b01543dfe67bb1d191998e90d20534dc354de059: Linux 3.3-rc4 (2012-02-18 15:53:33 -0800) are available in the git repository at: git://git.linaro.org/people/pawelmoll/linux.git vexpress-dt-v3.3-rc4 Pawel Moll (8): ARM: vexpress: Get rid of MMIO_P2V ARM: versatile: Map local timers using Device Tree when possible ARM: vexpress: Use FDT data in platform SMP calls ARM: vexpress: Add Device Tree support ARM: vexpress: Motherboard RS1 memory map support ARM: vexpress: Add Device Tree for V2P-CA5s core tile ARM: vexpress: Add Device Tree for V2P-CA9 core tile ARM: vexpress: Add Device Tree for V2P-CA15 core tile (TC1 variant) Documentation/devicetree/bindings/arm/vexpress.txt | 146 ++++++++++ arch/arm/boot/dts/vexpress-v2m-rs1.dtsi | 201 ++++++++++++++ arch/arm/boot/dts/vexpress-v2m.dtsi | 200 ++++++++++++++ arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts | 157 +++++++++++ arch/arm/boot/dts/vexpress-v2p-ca5s.dts | 162 +++++++++++ arch/arm/boot/dts/vexpress-v2p-ca9.dts | 192 +++++++++++++ arch/arm/include/asm/hardware/arm_timer.h | 5 + arch/arm/mach-vexpress/Kconfig | 47 +++- arch/arm/mach-vexpress/Makefile.boot | 6 + arch/arm/mach-vexpress/core.h | 11 +- arch/arm/mach-vexpress/ct-ca9x4.c | 58 ++--- arch/arm/mach-vexpress/include/mach/ct-ca9x4.h | 3 - arch/arm/mach-vexpress/include/mach/debug-macro.S | 30 ++- arch/arm/mach-vexpress/include/mach/irqs.h | 2 +- arch/arm/mach-vexpress/include/mach/motherboard.h | 58 +++-- arch/arm/mach-vexpress/include/mach/uncompress.h | 22 ++- arch/arm/mach-vexpress/platsmp.c | 160 +++++++++++- arch/arm/mach-vexpress/v2m.c | 281 ++++++++++++++++++-- arch/arm/plat-versatile/localtimer.c | 26 ++ 19 files changed, 1656 insertions(+), 111 deletions(-) create mode 100644 Documentation/devicetree/bindings/arm/vexpress.txt create mode 100644 arch/arm/boot/dts/vexpress-v2m-rs1.dtsi create mode 100644 arch/arm/boot/dts/vexpress-v2m.dtsi create mode 100644 arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts create mode 100644 arch/arm/boot/dts/vexpress-v2p-ca5s.dts create mode 100644 arch/arm/boot/dts/vexpress-v2p-ca9.dts