From patchwork Fri Apr 18 14:43:01 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Figa X-Patchwork-Id: 4016551 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 4B7DABFF02 for ; Fri, 18 Apr 2014 14:46:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7C438203B1 for ; Fri, 18 Apr 2014 14:46:12 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id AED8B202B4 for ; Fri, 18 Apr 2014 14:46:11 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WbA15-00078m-9p; Fri, 18 Apr 2014 14:43:47 +0000 Received: from mailout3.w1.samsung.com ([210.118.77.13]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WbA0w-0006ku-QR for linux-arm-kernel@lists.infradead.org; Fri, 18 Apr 2014 14:43:39 +0000 Received: from eucpsbgm1.samsung.com (unknown [203.254.199.244]) by mailout3.w1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N4800BJDE81LB60@mailout3.w1.samsung.com> for linux-arm-kernel@lists.infradead.org; Fri, 18 Apr 2014 15:43:14 +0100 (BST) X-AuditID: cbfec7f4-b7f796d000005a13-c9-53513a015b00 Received: from eusync3.samsung.com ( [203.254.199.213]) by eucpsbgm1.samsung.com (EUCPMTA) with SMTP id B1.56.23059.10A31535; Fri, 18 Apr 2014 15:43:13 +0100 (BST) Received: from AMDC1227.digital.local ([106.116.147.199]) by eusync3.samsung.com (Oracle Communications Messaging Server 7u4-23.01(7.0.4.23.0) 64bit (built Aug 10 2011)) with ESMTPA id <0N480017ZE7W2P00@eusync3.samsung.com>; Fri, 18 Apr 2014 15:43:13 +0100 (BST) From: Tomasz Figa To: linux-samsung-soc@vger.kernel.org Subject: [PATCH 4/4] ARM: dts: exynos4: Add CPU topology data Date: Fri, 18 Apr 2014 16:43:01 +0200 Message-id: <1397832181-5153-5-git-send-email-t.figa@samsung.com> X-Mailer: git-send-email 1.9.2 In-reply-to: <1397832181-5153-1-git-send-email-t.figa@samsung.com> References: <1397832181-5153-1-git-send-email-t.figa@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprDLMWRmVeSWpSXmKPExsVy+t/xq7qMVoHBBjsn6lv8nXSM3WL+kXOs Fr0LrrJZbHp8jdVixvl9TBZrj9xlt/h75x+bxdLrF5ksWvceYbdYP+M1i8XmTVOZLVbt+sPo wOOxZt4aRo/fvyYxeuycdZfdY9OqTjaPd+fOsXtsXlLv0bdlFaPH501yARxRXDYpqTmZZalF +nYJXBk/tvUwF6wWrzh06Bl7A+MOoS5GDg4JAROJjum8XYycQKaYxIV769m6GLk4hASWMkps 2bieCSQhJNDHJPHlQDWIzSagJvG54REbiC0ioCrxuW0BO0gDs8B0ZolvRzpZQBLCArYSk94v BGtmASrqfdnIDmLzCjhKLFt1nA1im5zE/5crwGo4BZwklk+8wAKxzFFiy7UGxgmMvAsYGVYx iqaWJhcUJ6XnGuoVJ+YWl+al6yXn525ihITolx2Mi49ZHWIU4GBU4uHV+OEfLMSaWFZcmXuI UYKDWUmEd/ffgGAh3pTEyqrUovz4otKc1OJDjEwcnFINjFXhFcprPy7g4riSEiB4rWb+5eQP NWeXMv5nDqqxn2m/kfU1y+9zD4rPsfVVbT/70bHxSvp5iaOp54v6p36sX/Joau+PXPbdGSu9 pmkecOXkPHNk1lypqJjWyefjAtMrgl8KOKkEd1U9j6vtsU+Q/udxe2e2wqUDLNVrpf+E7L+3 KG3J9Fj770osxRmJhlrMRcWJACVT618vAgAA X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140418_074339_013792_28FB2884 X-CRM114-Status: UNSURE ( 8.95 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -5.7 (-----) Cc: Mark Rutland , devicetree@vger.kernel.org, Kukjin Kim , Arnd Bergmann , Marc Zyngier , Tomasz Figa , Tomasz Figa , Rob Herring , Thomas Gleixner , linux-arm-kernel@lists.infradead.org, Marek Szyprowski X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP After fixing non-banked GIC support in GIC driver, CPU nodes can be safely added to Exynos4 device tree sources, along with appropriate gic-offset properties. Signed-off-by: Tomasz Figa --- arch/arm/boot/dts/exynos4210.dtsi | 19 +++++++++++++++++++ arch/arm/boot/dts/exynos4212.dtsi | 19 +++++++++++++++++++ arch/arm/boot/dts/exynos4412.dtsi | 37 +++++++++++++++++++++++++++++++++---- 3 files changed, 71 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/exynos4210.dtsi b/arch/arm/boot/dts/exynos4210.dtsi index cacf614..e463361 100644 --- a/arch/arm/boot/dts/exynos4210.dtsi +++ b/arch/arm/boot/dts/exynos4210.dtsi @@ -25,6 +25,25 @@ / { compatible = "samsung,exynos4210", "samsung,exynos4"; + cpus { + #address-cells = <1>; + #size-cells = <0>; + + cpu@900 { + compatible = "arm,cortex-a9"; + device_type = "cpu"; + reg = <0x900>; + gic-offset = <0x0000>; + }; + + cpu@901 { + compatible = "arm,cortex-a9"; + device_type = "cpu"; + reg = <0x901>; + gic-offset = <0x8000>; + }; + }; + aliases { pinctrl0 = &pinctrl_0; pinctrl1 = &pinctrl_1; diff --git a/arch/arm/boot/dts/exynos4212.dtsi b/arch/arm/boot/dts/exynos4212.dtsi index 3c00e6e..211e129 100644 --- a/arch/arm/boot/dts/exynos4212.dtsi +++ b/arch/arm/boot/dts/exynos4212.dtsi @@ -22,6 +22,25 @@ / { compatible = "samsung,exynos4212", "samsung,exynos4"; + cpus { + #address-cells = <1>; + #size-cells = <0>; + + cpu@a00 { + compatible = "arm,cortex-a9"; + device_type = "cpu"; + reg = <0xa00>; + gic-offset = <0x0000>; + }; + + cpu@a01 { + compatible = "arm,cortex-a9"; + device_type = "cpu"; + reg = <0xa01>; + gic-offset = <0x8000>; + }; + }; + combiner: interrupt-controller@10440000 { samsung,combiner-nr = <18>; }; diff --git a/arch/arm/boot/dts/exynos4412.dtsi b/arch/arm/boot/dts/exynos4412.dtsi index 15d3c0a..04530ef 100644 --- a/arch/arm/boot/dts/exynos4412.dtsi +++ b/arch/arm/boot/dts/exynos4412.dtsi @@ -22,11 +22,40 @@ / { compatible = "samsung,exynos4412", "samsung,exynos4"; - combiner: interrupt-controller@10440000 { - samsung,combiner-nr = <20>; + cpus { + #address-cells = <1>; + #size-cells = <0>; + + cpu@a00 { + compatible = "arm,cortex-a9"; + device_type = "cpu"; + reg = <0xa00>; + gic-offset = <0x0000>; + }; + + cpu@a01 { + compatible = "arm,cortex-a9"; + device_type = "cpu"; + reg = <0xa01>; + gic-offset = <0x4000>; + }; + + cpu@a02 { + compatible = "arm,cortex-a9"; + device_type = "cpu"; + reg = <0xa02>; + gic-offset = <0x8000>; + }; + + cpu@a03 { + compatible = "arm,cortex-a9"; + device_type = "cpu"; + reg = <0xa03>; + gic-offset = <0xc000>; + }; }; - gic: interrupt-controller@10490000 { - cpu-offset = <0x4000>; + combiner: interrupt-controller@10440000 { + samsung,combiner-nr = <20>; }; };