From patchwork Mon Jan 25 15:14:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sudeep Holla X-Patchwork-Id: 8109471 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 6CDDFBEEE5 for ; Mon, 25 Jan 2016 15:16:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 91FC6202F2 for ; Mon, 25 Jan 2016 15:16:32 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id AE9C1202E5 for ; Mon, 25 Jan 2016 15:16:31 +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 1aNir1-0003hH-BI; Mon, 25 Jan 2016 15:14:55 +0000 Received: from foss.arm.com ([217.140.101.70]) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1aNiqn-0003Zn-J3 for linux-arm-kernel@lists.infradead.org; Mon, 25 Jan 2016 15:14:42 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 909A43F8; Mon, 25 Jan 2016 07:13:42 -0800 (PST) Received: from e103737-lin.cambridge.arm.com (e103737-lin.cambridge.arm.com [10.1.207.150]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 1D9733F246; Mon, 25 Jan 2016 07:14:21 -0800 (PST) From: Sudeep Holla To: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 2/2] arm64: dts: Add support for Juno r2 board Date: Mon, 25 Jan 2016 15:14:09 +0000 Message-Id: <1453734849-13790-2-git-send-email-sudeep.holla@arm.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1453734849-13790-1-git-send-email-sudeep.holla@arm.com> References: <1453734849-13790-1-git-send-email-sudeep.holla@arm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160125_071441_741126_7DE0F8B0 X-CRM114-Status: UNSURE ( 9.66 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -6.9 (------) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jon Medhurst , Rob Herring , Liviu Dudau , Sudeep Holla 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=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, 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 Juno r2 is identical to Juno r1 with Cortex A57 cores replaced by Cortex A72 cores. Acked-by: Liviu Dudau Signed-off-by: Sudeep Holla Acked-by: Rob Herring --- Documentation/devicetree/bindings/arm/arm-boards | 1 + arch/arm64/boot/dts/arm/Makefile | 2 +- .../boot/dts/arm/{juno-r1.dts => juno-r2.dts} | 30 +++++++++++----------- 3 files changed, 17 insertions(+), 16 deletions(-) copy arch/arm64/boot/dts/arm/{juno-r1.dts => juno-r2.dts} (87%) diff --git a/Documentation/devicetree/bindings/arm/arm-boards b/Documentation/devicetree/bindings/arm/arm-boards index 1a709970e7f7..70601a58c433 100644 --- a/Documentation/devicetree/bindings/arm/arm-boards +++ b/Documentation/devicetree/bindings/arm/arm-boards @@ -180,6 +180,7 @@ described under the RS1 memory mapping. Required properties (in root node): compatible = "arm,juno"; /* For Juno r0 board */ compatible = "arm,juno-r1"; /* For Juno r1 board */ + compatible = "arm,juno-r2"; /* For Juno r2 board */ Required nodes: The description for the board must include: diff --git a/arch/arm64/boot/dts/arm/Makefile b/arch/arm64/boot/dts/arm/Makefile index bb3c07209676..c0bf56b9ce3d 100644 --- a/arch/arm64/boot/dts/arm/Makefile +++ b/arch/arm64/boot/dts/arm/Makefile @@ -1,5 +1,5 @@ dtb-$(CONFIG_ARCH_VEXPRESS) += foundation-v8.dtb -dtb-$(CONFIG_ARCH_VEXPRESS) += juno.dtb juno-r1.dtb +dtb-$(CONFIG_ARCH_VEXPRESS) += juno.dtb juno-r1.dtb juno-r2.dtb dtb-$(CONFIG_ARCH_VEXPRESS) += rtsm_ve-aemv8a.dtb dtb-$(CONFIG_ARCH_VEXPRESS) += vexpress-v2f-1xv7-ca53x2.dtb diff --git a/arch/arm64/boot/dts/arm/juno-r1.dts b/arch/arm64/boot/dts/arm/juno-r2.dts similarity index 87% copy from arch/arm64/boot/dts/arm/juno-r1.dts copy to arch/arm64/boot/dts/arm/juno-r2.dts index d95d9e7e2dc0..88ecd6182b67 100644 --- a/arch/arm64/boot/dts/arm/juno-r1.dts +++ b/arch/arm64/boot/dts/arm/juno-r2.dts @@ -11,8 +11,8 @@ #include / { - model = "ARM Juno development board (r1)"; - compatible = "arm,juno-r1", "arm,juno", "arm,vexpress"; + model = "ARM Juno development board (r2)"; + compatible = "arm,juno-r2", "arm,juno", "arm,vexpress"; interrupt-parent = <&gic>; #address-cells = <2>; #size-cells = <2>; @@ -37,10 +37,10 @@ cpu-map { cluster0 { core0 { - cpu = <&A57_0>; + cpu = <&A72_0>; }; core1 { - cpu = <&A57_1>; + cpu = <&A72_1>; }; }; @@ -82,22 +82,22 @@ }; }; - A57_0: cpu@0 { - compatible = "arm,cortex-a57","arm,armv8"; + A72_0: cpu@0 { + compatible = "arm,cortex-a72","arm,armv8"; reg = <0x0 0x0>; device_type = "cpu"; enable-method = "psci"; - next-level-cache = <&A57_L2>; + next-level-cache = <&A72_L2>; clocks = <&scpi_dvfs 0>; cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>; }; - A57_1: cpu@1 { - compatible = "arm,cortex-a57","arm,armv8"; + A72_1: cpu@1 { + compatible = "arm,cortex-a72","arm,armv8"; reg = <0x0 0x1>; device_type = "cpu"; enable-method = "psci"; - next-level-cache = <&A57_L2>; + next-level-cache = <&A72_L2>; clocks = <&scpi_dvfs 0>; cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>; }; @@ -142,7 +142,7 @@ cpu-idle-states = <&CPU_SLEEP_0 &CLUSTER_SLEEP_0>; }; - A57_L2: l2-cache0 { + A72_L2: l2-cache0 { compatible = "cache"; }; @@ -151,12 +151,12 @@ }; }; - pmu_a57 { - compatible = "arm,cortex-a57-pmu"; + pmu_a72 { + compatible = "arm,cortex-a72-pmu"; interrupts = , ; - interrupt-affinity = <&A57_0>, - <&A57_1>; + interrupt-affinity = <&A72_0>, + <&A72_1>; }; pmu_a53 {