From patchwork Wed Apr 19 09:15:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 9687123 X-Patchwork-Delegate: horms@verge.net.au Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id DBAE160375 for ; Wed, 19 Apr 2017 09:16:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CDC0C2838E for ; Wed, 19 Apr 2017 09:16:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C2CF8283F9; Wed, 19 Apr 2017 09:16:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6BBBF2838E for ; Wed, 19 Apr 2017 09:16:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761453AbdDSJQC (ORCPT ); Wed, 19 Apr 2017 05:16:02 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:60670 "EHLO andre.telenet-ops.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1761481AbdDSJPz (ORCPT ); Wed, 19 Apr 2017 05:15:55 -0400 Received: from ayla.of.borg ([84.193.137.253]) by andre.telenet-ops.be with bizsmtp id A9Ft1v00D5UCtCs019Ftsl; Wed, 19 Apr 2017 11:15:53 +0200 Received: from ramsan.of.borg ([192.168.97.29] helo=ramsan) by ayla.of.borg with esmtp (Exim 4.86_2) (envelope-from ) id 1d0liL-0007IX-3v; Wed, 19 Apr 2017 11:15:53 +0200 Received: from geert by ramsan with local (Exim 4.86_2) (envelope-from ) id 1d0liL-0003cK-2Y; Wed, 19 Apr 2017 11:15:53 +0200 From: Geert Uytterhoeven To: Simon Horman , Magnus Damm , Kuninori Morimoto , Yoshihiro Shimoda , Rob Herring , Mark Rutland Cc: linux-renesas-soc@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Geert Uytterhoeven Subject: [PATCH 5/8] [RFC] arm64: dts: renesas: Migrate R-Car H3 Salvator-X to r8j7795-4x1g.dtsi Date: Wed, 19 Apr 2017 11:15:48 +0200 Message-Id: <1492593351-13835-6-git-send-email-geert+renesas@glider.be> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1492593351-13835-1-git-send-email-geert+renesas@glider.be> References: <1492593351-13835-1-git-send-email-geert+renesas@glider.be> Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The Renesas R-Car H3 Salvator-X development board is equipped with an r8j7795 SiP with 4 GiB of RAM. Hence migrate from r8a7795.dtsi to r8j7795-4x1g.dtsi. Signed-off-by: Geert Uytterhoeven --- Questions: - Should this file be renamed to r8j7795-salvator-x.dts? --- arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 27 +++------------------- 1 file changed, 3 insertions(+), 24 deletions(-) diff --git a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts index ff68bac4cd7ed2f5..e5b9409bf2d218d8 100644 --- a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts +++ b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts @@ -32,12 +32,12 @@ */ /dts-v1/; -#include "r8a7795.dtsi" +#include "r8j7795-4x1g.dtsi" #include / { - model = "Renesas Salvator-X board based on r8a7795"; - compatible = "renesas,salvator-x", "renesas,r8a7795"; + model = "Renesas Salvator-X board based on r8j7795"; + compatible = "renesas,salvator-x", "renesas,r8j7795", "renesas,r8a7795"; aliases { serial0 = &scif2; @@ -50,27 +50,6 @@ stdout-path = "serial0:115200n8"; }; - memory@48000000 { - device_type = "memory"; - /* first 128MB is reserved for secure area. */ - reg = <0x0 0x48000000 0x0 0x38000000>; - }; - - memory@500000000 { - device_type = "memory"; - reg = <0x5 0x00000000 0x0 0x40000000>; - }; - - memory@600000000 { - device_type = "memory"; - reg = <0x6 0x00000000 0x0 0x40000000>; - }; - - memory@700000000 { - device_type = "memory"; - reg = <0x7 0x00000000 0x0 0x40000000>; - }; - x12_clk: x12 { compatible = "fixed-clock"; #clock-cells = <0>;