From patchwork Thu Dec 15 14:02:32 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pawel Moll X-Patchwork-Id: 131647 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 C4BDC1007E5 for ; Fri, 16 Dec 2011 01:07:07 +1100 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1RbBtt-0006N4-VW; Thu, 15 Dec 2011 14:03:10 +0000 Received: from service87.mimecast.com ([91.220.42.44]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1RbBtl-0006JZ-W1 for linux-arm-kernel@lists.infradead.org; Thu, 15 Dec 2011 14:03:05 +0000 Received: from cam-owa1.Emea.Arm.com (fw-tnat.cambridge.arm.com [217.140.96.21]) by service87.mimecast.com; Thu, 15 Dec 2011 14:02:57 +0000 Received: from hornet.cambridge.arm.com ([10.1.255.212]) by cam-owa1.Emea.Arm.com with Microsoft SMTPSVC(6.0.3790.0); Thu, 15 Dec 2011 14:02:55 +0000 From: Pawel Moll To: devicetree-discuss@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v6 0/9] Versatile Express DT support Date: Thu, 15 Dec 2011 14:02:32 +0000 Message-Id: <1323957761-13553-1-git-send-email-pawel.moll@arm.com> X-Mailer: git-send-email 1.7.5.4 X-OriginalArrivalTime: 15 Dec 2011 14:02:55.0538 (UTC) FILETIME=[3E546920:01CCBB32] X-MC-Unique: 111121514025704501 X-Spam-Note: CRM114 invocation failed X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -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: Pawel Moll 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: , MIME-Version: 1.0 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 Hi All, This is the last (at least this year) version of the patches. I've added Tested-by: Tixy to the patches that hasn't change since v5. I didn't add Arnd's and Rob's Acked-bys as the code changed significantly since. If still applicable, I'll add then on the first opportunity. Arnd, Russell, if you think that the code is ready enough for 3.3, please pull from this branch based on today's tip (v3.2-rc5+): 8<--------------------------------------------------------------------- The following changes since commit 55b02d2f4445ad625213817a1736bf2884d32547: Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux (2011-12-14 19:45:40 -0800) are available in the git repository at: git://git.linaro.org/people/pawelmoll/linux.git vexpress-dt 8<--------------------------------------------------------------------- I also have a "vexpress-dt-rmk-devel-stable" branch there, based on today's Russell's devel-stable. The only difference is "handle_irq" added to DT machine description. If there are still some issues I'll address them once I'm back from holiday (today it's the last day before I loose all access to the Internet for a month). Changes since v5: * As suggested by Russell, DT-based local timers take precedence over statically defined ones (so the twd_base if overwritten). * Minor redactorial changes in DT-based SMP initialization (the logic stays the same). * Added last missing device node to the V2M trees: "arm,vexpress-vram". * Similarly to "arm,vexpress-cf" added "arm,vexpress-psram" to the relevant node, just in case we need to detect it in future. Tested on: - V2P-CA9 with ATAGs (both with a ATAGs-only and ATAGs+DT kernels). - V2P-CA9 with DT - V2P-CA5s with DT - V2P-CA15 with DT - V2F-2XV6 Cortex-A7 SMM with DT Thanks to all involved for your help! 8<--------------------------------------------------------------------- Pawel Moll (9): ARM: versatile: Add missing ENDPROC to headsmp.S 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 | 144 ++++++++++ arch/arm/Kconfig | 2 +- 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 | 155 +++++++++++ arch/arm/boot/dts/vexpress-v2p-ca5s.dts | 160 +++++++++++ arch/arm/boot/dts/vexpress-v2p-ca9.dts | 190 +++++++++++++ arch/arm/include/asm/hardware/arm_timer.h | 5 + arch/arm/mach-realview/platsmp.c | 3 +- arch/arm/mach-vexpress/Kconfig | 45 +++- arch/arm/mach-vexpress/Makefile.boot | 6 + arch/arm/mach-vexpress/core.h | 9 +- arch/arm/mach-vexpress/ct-ca9x4.c | 48 +--- arch/arm/mach-vexpress/include/mach/ct-ca9x4.h | 13 +- arch/arm/mach-vexpress/include/mach/debug-macro.S | 37 +++- 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 | 13 +- arch/arm/mach-vexpress/platsmp.c | 153 ++++++++++- arch/arm/mach-vexpress/v2m.c | 282 ++++++++++++++++++-- arch/arm/mm/Kconfig | 2 +- arch/arm/plat-versatile/headsmp.S | 1 + arch/arm/plat-versatile/localtimer.c | 12 + 23 files changed, 1621 insertions(+), 120 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