From patchwork Sun Mar 12 15:16:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 95179 Delivered-To: patch@linaro.org Received: by 10.140.82.71 with SMTP id g65csp830546qgd; Sun, 12 Mar 2017 08:17:20 -0700 (PDT) X-Received: by 10.28.93.194 with SMTP id r185mr7113560wmb.47.1489331840290; Sun, 12 Mar 2017 08:17:20 -0700 (PDT) Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id 76si4209149wmw.165.2017.03.12.08.17.19; Sun, 12 Mar 2017 08:17:20 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) client-ip=81.169.180.215; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by lists.denx.de (Postfix, from userid 105) id 5C5E6C21C7B; Sun, 12 Mar 2017 15:17:18 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 19A72C21BE6; Sun, 12 Mar 2017 15:17:15 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 031DAC21C34; Sun, 12 Mar 2017 15:17:12 +0000 (UTC) Received: from conuserg-08.nifty.com (conuserg-08.nifty.com [210.131.2.75]) by lists.denx.de (Postfix) with ESMTPS id 850EEC21BE5 for ; Sun, 12 Mar 2017 15:17:11 +0000 (UTC) Received: from grover.sesame (FL1-111-169-71-157.osk.mesh.ad.jp [111.169.71.157]) (authenticated) by conuserg-08.nifty.com with ESMTP id v2CFGnTr028763; Mon, 13 Mar 2017 00:16:54 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com v2CFGnTr028763 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1489331814; bh=BDAike2sAphaJMCVPAiwCCqxRRjsdM5TUbBlfn+DmBs=; h=From:To:Cc:Subject:Date:From; b=VNBrHzJjWZq3y/ewYNrvvLEOxMbzl9bmGnMDoe9VMcQOAfzj3A2DfxGW2TtBhUwPX tYIycQFopnhFhzpmmocbEEyPU3dTEPF1qcLxLcqv/R29QcV6cCTRVeabn9ztTVHgAb 5UJ7WYtU+lt959yz+Ypgntim0YypEugx/p0aBWUXFpqIbSgFo1i1jFLJqxfsXgy22L lJ4oBnJA0Vs8l36xg6/ntXyc5+R8TLYJmx3YVr3Jzv7WMGZEBxBpQcEt9qh2aDfhpG pQxt2W0kfbtORfS6eDx1gBr/dApPmwqnddCz4QCq5cBqG+9pwTNU5TSZplaRXtoAGl WOhCid5fSIiIQ== X-Nifty-SrcIP: [111.169.71.157] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Mon, 13 Mar 2017 00:16:39 +0900 Message-Id: <1489331802-28231-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 Subject: [U-Boot] [PATCH v2 1/3] ARM: dts: uniphier: remove skeleton.dtsi inclusion X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Linux Commit 9c0da3cc61f1 ("ARM: dts: explicitly mark skeleton.dtsi as deprecated") declared that skeleton.dtsi was deprecated. Move the memory node below to suppress warnings of FDTGREP. Signed-off-by: Masahiro Yamada --- Changes in v2: - Fix FDTGREP warnings arch/arm/dts/uniphier-ld4-ref.dts | 10 +++++----- arch/arm/dts/uniphier-ld4.dtsi | 4 ++-- arch/arm/dts/uniphier-ld6b-ref.dts | 10 +++++----- arch/arm/dts/uniphier-pro4-ace.dts | 10 +++++----- arch/arm/dts/uniphier-pro4-ref.dts | 10 +++++----- arch/arm/dts/uniphier-pro4-sanji.dts | 10 +++++----- arch/arm/dts/uniphier-pro4.dtsi | 4 ++-- arch/arm/dts/uniphier-pro5-4kbox.dts | 10 +++++----- arch/arm/dts/uniphier-pro5.dtsi | 4 ++-- arch/arm/dts/uniphier-pxs2-gentil.dts | 10 +++++----- arch/arm/dts/uniphier-pxs2-vodka.dts | 10 +++++----- arch/arm/dts/uniphier-pxs2.dtsi | 4 ++-- arch/arm/dts/uniphier-sld3-ref.dts | 12 ++++++------ arch/arm/dts/uniphier-sld3.dtsi | 4 ++-- arch/arm/dts/uniphier-sld8-ref.dts | 10 +++++----- arch/arm/dts/uniphier-sld8.dtsi | 4 ++-- 16 files changed, 63 insertions(+), 63 deletions(-) diff --git a/arch/arm/dts/uniphier-ld4-ref.dts b/arch/arm/dts/uniphier-ld4-ref.dts index 0f4bd9b..f397a4c 100644 --- a/arch/arm/dts/uniphier-ld4-ref.dts +++ b/arch/arm/dts/uniphier-ld4-ref.dts @@ -16,11 +16,6 @@ model = "UniPhier LD4 Reference Board"; compatible = "socionext,uniphier-ld4-ref", "socionext,uniphier-ld4"; - memory { - device_type = "memory"; - reg = <0x80000000 0x20000000>; - }; - chosen { stdout-path = "serial0:115200n8"; }; @@ -35,6 +30,11 @@ i2c2 = &i2c2; i2c3 = &i2c3; }; + + memory { + device_type = "memory"; + reg = <0x80000000 0x20000000>; + }; }; ðsc { diff --git a/arch/arm/dts/uniphier-ld4.dtsi b/arch/arm/dts/uniphier-ld4.dtsi index bbfa164..0d3d963 100644 --- a/arch/arm/dts/uniphier-ld4.dtsi +++ b/arch/arm/dts/uniphier-ld4.dtsi @@ -7,10 +7,10 @@ * SPDX-License-Identifier: GPL-2.0+ X11 */ -/include/ "skeleton.dtsi" - / { compatible = "socionext,uniphier-ld4"; + #address-cells = <1>; + #size-cells = <1>; cpus { #address-cells = <1>; diff --git a/arch/arm/dts/uniphier-ld6b-ref.dts b/arch/arm/dts/uniphier-ld6b-ref.dts index 4da3c63..fdfb533 100644 --- a/arch/arm/dts/uniphier-ld6b-ref.dts +++ b/arch/arm/dts/uniphier-ld6b-ref.dts @@ -16,11 +16,6 @@ model = "UniPhier LD6b Reference Board"; compatible = "socionext,uniphier-ld6b-ref", "socionext,uniphier-ld6b"; - memory { - device_type = "memory"; - reg = <0x80000000 0x80000000>; - }; - chosen { stdout-path = "serial0:115200n8"; }; @@ -37,6 +32,11 @@ i2c5 = &i2c5; i2c6 = &i2c6; }; + + memory { + device_type = "memory"; + reg = <0x80000000 0x80000000>; + }; }; ðsc { diff --git a/arch/arm/dts/uniphier-pro4-ace.dts b/arch/arm/dts/uniphier-pro4-ace.dts index f70bc82..b9d4315 100644 --- a/arch/arm/dts/uniphier-pro4-ace.dts +++ b/arch/arm/dts/uniphier-pro4-ace.dts @@ -14,11 +14,6 @@ model = "UniPhier Pro4 Ace Board"; compatible = "socionext,uniphier-pro4-ace", "socionext,uniphier-pro4"; - memory { - device_type = "memory"; - reg = <0x80000000 0x40000000>; - }; - chosen { stdout-path = "serial0:115200n8"; }; @@ -34,6 +29,11 @@ i2c5 = &i2c5; i2c6 = &i2c6; }; + + memory { + device_type = "memory"; + reg = <0x80000000 0x40000000>; + }; }; &serial0 { diff --git a/arch/arm/dts/uniphier-pro4-ref.dts b/arch/arm/dts/uniphier-pro4-ref.dts index 9714fb0..920fd54 100644 --- a/arch/arm/dts/uniphier-pro4-ref.dts +++ b/arch/arm/dts/uniphier-pro4-ref.dts @@ -16,11 +16,6 @@ model = "UniPhier Pro4 Reference Board"; compatible = "socionext,uniphier-pro4-ref", "socionext,uniphier-pro4"; - memory { - device_type = "memory"; - reg = <0x80000000 0x40000000>; - }; - chosen { stdout-path = "serial0:115200n8"; }; @@ -38,6 +33,11 @@ i2c6 = &i2c6; usb0 = &usb0; }; + + memory { + device_type = "memory"; + reg = <0x80000000 0x40000000>; + }; }; ðsc { diff --git a/arch/arm/dts/uniphier-pro4-sanji.dts b/arch/arm/dts/uniphier-pro4-sanji.dts index d43f725..b103ba5 100644 --- a/arch/arm/dts/uniphier-pro4-sanji.dts +++ b/arch/arm/dts/uniphier-pro4-sanji.dts @@ -14,11 +14,6 @@ model = "UniPhier Pro4 Sanji Board"; compatible = "socionext,uniphier-pro4-sanji", "socionext,uniphier-pro4"; - memory { - device_type = "memory"; - reg = <0x80000000 0x80000000>; - }; - chosen { stdout-path = "serial0:115200n8"; }; @@ -33,6 +28,11 @@ i2c5 = &i2c5; i2c6 = &i2c6; }; + + memory { + device_type = "memory"; + reg = <0x80000000 0x80000000>; + }; }; &serial0 { diff --git a/arch/arm/dts/uniphier-pro4.dtsi b/arch/arm/dts/uniphier-pro4.dtsi index 9b881f6..210ac27 100644 --- a/arch/arm/dts/uniphier-pro4.dtsi +++ b/arch/arm/dts/uniphier-pro4.dtsi @@ -7,10 +7,10 @@ * SPDX-License-Identifier: GPL-2.0+ X11 */ -/include/ "skeleton.dtsi" - / { compatible = "socionext,uniphier-pro4"; + #address-cells = <1>; + #size-cells = <1>; cpus { #address-cells = <1>; diff --git a/arch/arm/dts/uniphier-pro5-4kbox.dts b/arch/arm/dts/uniphier-pro5-4kbox.dts index ffc21a7..ce12f4a 100644 --- a/arch/arm/dts/uniphier-pro5-4kbox.dts +++ b/arch/arm/dts/uniphier-pro5-4kbox.dts @@ -14,11 +14,6 @@ model = "UniPhier Pro5 4KBOX Board"; compatible = "socionext,uniphier-pro5-4kbox", "socionext,uniphier-pro5"; - memory { - device_type = "memory"; - reg = <0x80000000 0x40000000>; - }; - chosen { stdout-path = "serial1:115200n8"; }; @@ -30,6 +25,11 @@ i2c5 = &i2c5; i2c6 = &i2c6; }; + + memory { + device_type = "memory"; + reg = <0x80000000 0x40000000>; + }; }; &serial1 { diff --git a/arch/arm/dts/uniphier-pro5.dtsi b/arch/arm/dts/uniphier-pro5.dtsi index 68866e1..de98697 100644 --- a/arch/arm/dts/uniphier-pro5.dtsi +++ b/arch/arm/dts/uniphier-pro5.dtsi @@ -7,10 +7,10 @@ * SPDX-License-Identifier: GPL-2.0+ X11 */ -/include/ "skeleton.dtsi" - / { compatible = "socionext,uniphier-pro5"; + #address-cells = <1>; + #size-cells = <1>; cpus { #address-cells = <1>; diff --git a/arch/arm/dts/uniphier-pxs2-gentil.dts b/arch/arm/dts/uniphier-pxs2-gentil.dts index 0a6d46c..aac4781 100644 --- a/arch/arm/dts/uniphier-pxs2-gentil.dts +++ b/arch/arm/dts/uniphier-pxs2-gentil.dts @@ -15,11 +15,6 @@ compatible = "socionext,uniphier-pxs2-gentil", "socionext,uniphier-pxs2"; - memory { - device_type = "memory"; - reg = <0x80000000 0x80000000>; - }; - chosen { stdout-path = "serial0:115200n8"; }; @@ -34,6 +29,11 @@ i2c5 = &i2c5; i2c6 = &i2c6; }; + + memory { + device_type = "memory"; + reg = <0x80000000 0x80000000>; + }; }; &serial2 { diff --git a/arch/arm/dts/uniphier-pxs2-vodka.dts b/arch/arm/dts/uniphier-pxs2-vodka.dts index 770edca..f381696 100644 --- a/arch/arm/dts/uniphier-pxs2-vodka.dts +++ b/arch/arm/dts/uniphier-pxs2-vodka.dts @@ -14,11 +14,6 @@ model = "UniPhier PXs2 Vodka Board"; compatible = "socionext,uniphier-pxs2-vodka", "socionext,uniphier-pxs2"; - memory { - device_type = "memory"; - reg = <0x80000000 0x80000000>; - }; - chosen { stdout-path = "serial0:115200n8"; }; @@ -32,6 +27,11 @@ i2c5 = &i2c5; i2c6 = &i2c6; }; + + memory { + device_type = "memory"; + reg = <0x80000000 0x80000000>; + }; }; &serial2 { diff --git a/arch/arm/dts/uniphier-pxs2.dtsi b/arch/arm/dts/uniphier-pxs2.dtsi index da62070..904320c 100644 --- a/arch/arm/dts/uniphier-pxs2.dtsi +++ b/arch/arm/dts/uniphier-pxs2.dtsi @@ -7,10 +7,10 @@ * SPDX-License-Identifier: GPL-2.0+ X11 */ -/include/ "skeleton.dtsi" - / { compatible = "socionext,uniphier-pxs2"; + #address-cells = <1>; + #size-cells = <1>; cpus { #address-cells = <1>; diff --git a/arch/arm/dts/uniphier-sld3-ref.dts b/arch/arm/dts/uniphier-sld3-ref.dts index f35500d..01aed3d 100644 --- a/arch/arm/dts/uniphier-sld3-ref.dts +++ b/arch/arm/dts/uniphier-sld3-ref.dts @@ -16,12 +16,6 @@ model = "UniPhier sLD3 Reference Board"; compatible = "socionext,uniphier-sld3-ref", "socionext,uniphier-sld3"; - memory { - device_type = "memory"; - reg = <0x80000000 0x20000000 - 0xc0000000 0x20000000>; - }; - chosen { stdout-path = "serial0:115200n8"; }; @@ -36,6 +30,12 @@ i2c3 = &i2c3; i2c4 = &i2c4; }; + + memory { + device_type = "memory"; + reg = <0x80000000 0x20000000 + 0xc0000000 0x20000000>; + }; }; ðsc { diff --git a/arch/arm/dts/uniphier-sld3.dtsi b/arch/arm/dts/uniphier-sld3.dtsi index 919cbff..7578920 100644 --- a/arch/arm/dts/uniphier-sld3.dtsi +++ b/arch/arm/dts/uniphier-sld3.dtsi @@ -7,10 +7,10 @@ * SPDX-License-Identifier: GPL-2.0+ X11 */ -/include/ "skeleton.dtsi" - / { compatible = "socionext,uniphier-sld3"; + #address-cells = <1>; + #size-cells = <1>; cpus { #address-cells = <1>; diff --git a/arch/arm/dts/uniphier-sld8-ref.dts b/arch/arm/dts/uniphier-sld8-ref.dts index 6c0544b..3c78997 100644 --- a/arch/arm/dts/uniphier-sld8-ref.dts +++ b/arch/arm/dts/uniphier-sld8-ref.dts @@ -16,11 +16,6 @@ model = "UniPhier sLD8 Reference Board"; compatible = "socionext,uniphier-sld8-ref", "socionext,uniphier-sld8"; - memory { - device_type = "memory"; - reg = <0x80000000 0x20000000>; - }; - chosen { stdout-path = "serial0:115200n8"; }; @@ -35,6 +30,11 @@ i2c2 = &i2c2; i2c3 = &i2c3; }; + + memory { + device_type = "memory"; + reg = <0x80000000 0x20000000>; + }; }; ðsc { diff --git a/arch/arm/dts/uniphier-sld8.dtsi b/arch/arm/dts/uniphier-sld8.dtsi index 5550bb8..4117132 100644 --- a/arch/arm/dts/uniphier-sld8.dtsi +++ b/arch/arm/dts/uniphier-sld8.dtsi @@ -7,10 +7,10 @@ * SPDX-License-Identifier: GPL-2.0+ X11 */ -/include/ "skeleton.dtsi" - / { compatible = "socionext,uniphier-sld8"; + #address-cells = <1>; + #size-cells = <1>; cpus { #address-cells = <1>; From patchwork Sun Mar 12 15:16:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 95180 Delivered-To: patch@linaro.org Received: by 10.140.82.71 with SMTP id g65csp830746qgd; Sun, 12 Mar 2017 08:18:07 -0700 (PDT) X-Received: by 10.28.182.10 with SMTP id g10mr6937771wmf.123.1489331887457; Sun, 12 Mar 2017 08:18:07 -0700 (PDT) Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id v202si7305102wmv.158.2017.03.12.08.18.07; Sun, 12 Mar 2017 08:18:07 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) client-ip=81.169.180.215; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by lists.denx.de (Postfix, from userid 105) id EEEDDC21BE6; Sun, 12 Mar 2017 15:17:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id A5731C21C4D; Sun, 12 Mar 2017 15:17:15 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 10F7DC21BE5; Sun, 12 Mar 2017 15:17:12 +0000 (UTC) Received: from conuserg-08.nifty.com (conuserg-08.nifty.com [210.131.2.75]) by lists.denx.de (Postfix) with ESMTPS id 8635FC21BE6 for ; Sun, 12 Mar 2017 15:17:11 +0000 (UTC) Received: from grover.sesame (FL1-111-169-71-157.osk.mesh.ad.jp [111.169.71.157]) (authenticated) by conuserg-08.nifty.com with ESMTP id v2CFGnTs028763; Mon, 13 Mar 2017 00:16:54 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com v2CFGnTs028763 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1489331814; bh=CIwb7KTXKWLajl9bCqT+tYmAjJSZG58HrlxOeCFG6u4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=H+SW7oJKvo7IE7oMwIk8Wgg9juzumWkfPYviu1ri4Ry75Yr+1sQ6loNmmYFcbZ6QA K9gPeg8acqvOs90YRdmKdygtBnIVSCdLuF1iNh8ClZRxElNnWZVohXayWUlgZzlXBB WfdJJ7LhpgusxMgG8bx6KiGZlN4uGuBbx+/3o6PopsT1ojfzfd+1chji04AEdvdVaa 7pFGJknj/BpVmNw9tqB6XdKpRgJ4pjWG4fKT19iRZ1Yz0Q4r5yz6s7vOJFT+jq3x76 5e7NCUc/+tAAK+T6iqzAoI2MCII8psPlY6o0E+vNqyPSW4gwtgVBCWN7q6mYMOolHS GTbqo4u+r9djA== X-Nifty-SrcIP: [111.169.71.157] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Mon, 13 Mar 2017 00:16:40 +0900 Message-Id: <1489331802-28231-2-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1489331802-28231-1-git-send-email-yamada.masahiro@socionext.com> References: <1489331802-28231-1-git-send-email-yamada.masahiro@socionext.com> Subject: [U-Boot] [PATCH v2 2/3] ARM: dts: uniphier: fix no unit name warnings X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Fix warnings reported when built with W=1, by DTC 1.4.2 or later: Node /memory has a reg or ranges property, but no unit name Signed-off-by: Masahiro Yamada --- Changes in v2: - Adjust comments to the recent change of build system arch/arm/dts/uniphier-ld11-ref.dts | 10 +++++----- arch/arm/dts/uniphier-ld11.dtsi | 2 +- arch/arm/dts/uniphier-ld20-ref.dts | 10 +++++----- arch/arm/dts/uniphier-ld20.dtsi | 2 +- arch/arm/dts/uniphier-ld4-ref.dts | 2 +- arch/arm/dts/uniphier-ld6b-ref.dts | 2 +- arch/arm/dts/uniphier-pro4-ace.dts | 2 +- arch/arm/dts/uniphier-pro4-ref.dts | 2 +- arch/arm/dts/uniphier-pro4-sanji.dts | 2 +- arch/arm/dts/uniphier-pxs2-gentil.dts | 2 +- arch/arm/dts/uniphier-pxs2-vodka.dts | 2 +- arch/arm/dts/uniphier-pxs3-ref.dts | 10 +++++----- arch/arm/dts/uniphier-pxs3.dtsi | 2 +- arch/arm/dts/uniphier-sld3-ref.dts | 2 +- arch/arm/dts/uniphier-sld8-ref.dts | 2 +- arch/arm/dts/uniphier-support-card.dtsi | 2 +- 16 files changed, 28 insertions(+), 28 deletions(-) diff --git a/arch/arm/dts/uniphier-ld11-ref.dts b/arch/arm/dts/uniphier-ld11-ref.dts index 7693bf2..1b5f2d8 100644 --- a/arch/arm/dts/uniphier-ld11-ref.dts +++ b/arch/arm/dts/uniphier-ld11-ref.dts @@ -16,6 +16,10 @@ model = "UniPhier LD11 Reference Board"; compatible = "socionext,uniphier-ld11-ref", "socionext,uniphier-ld11"; + chosen { + stdout-path = "serial0:115200n8"; + }; + aliases { serial0 = &serial0; serial1 = &serial1; @@ -29,14 +33,10 @@ i2c5 = &i2c5; }; - memory { + memory@80000000 { device_type = "memory"; reg = <0 0x80000000 0 0x40000000>; }; - - chosen { - stdout-path = "serial0:115200n8"; - }; }; ðsc { diff --git a/arch/arm/dts/uniphier-ld11.dtsi b/arch/arm/dts/uniphier-ld11.dtsi index 38dc1ec..8488984 100644 --- a/arch/arm/dts/uniphier-ld11.dtsi +++ b/arch/arm/dts/uniphier-ld11.dtsi @@ -104,7 +104,7 @@ <1 10 4>; }; - soc { + soc@0 { compatible = "simple-bus"; #address-cells = <1>; #size-cells = <1>; diff --git a/arch/arm/dts/uniphier-ld20-ref.dts b/arch/arm/dts/uniphier-ld20-ref.dts index 41ee07e..9cbd1f2 100644 --- a/arch/arm/dts/uniphier-ld20-ref.dts +++ b/arch/arm/dts/uniphier-ld20-ref.dts @@ -16,6 +16,10 @@ model = "UniPhier LD20 Reference Board"; compatible = "socionext,uniphier-ld20-ref", "socionext,uniphier-ld20"; + chosen { + stdout-path = "serial0:115200n8"; + }; + aliases { serial0 = &serial0; serial1 = &serial1; @@ -29,14 +33,10 @@ i2c5 = &i2c5; }; - memory { + memory@80000000 { device_type = "memory"; reg = <0 0x80000000 0 0xc0000000>; }; - - chosen { - stdout-path = "serial0:115200n8"; - }; }; ðsc { diff --git a/arch/arm/dts/uniphier-ld20.dtsi b/arch/arm/dts/uniphier-ld20.dtsi index 7176757..d853526 100644 --- a/arch/arm/dts/uniphier-ld20.dtsi +++ b/arch/arm/dts/uniphier-ld20.dtsi @@ -173,7 +173,7 @@ <1 10 4>; }; - soc { + soc@0 { compatible = "simple-bus"; #address-cells = <1>; #size-cells = <1>; diff --git a/arch/arm/dts/uniphier-ld4-ref.dts b/arch/arm/dts/uniphier-ld4-ref.dts index f397a4c..d3177e9 100644 --- a/arch/arm/dts/uniphier-ld4-ref.dts +++ b/arch/arm/dts/uniphier-ld4-ref.dts @@ -31,7 +31,7 @@ i2c3 = &i2c3; }; - memory { + memory@80000000 { device_type = "memory"; reg = <0x80000000 0x20000000>; }; diff --git a/arch/arm/dts/uniphier-ld6b-ref.dts b/arch/arm/dts/uniphier-ld6b-ref.dts index fdfb533..7cdc923 100644 --- a/arch/arm/dts/uniphier-ld6b-ref.dts +++ b/arch/arm/dts/uniphier-ld6b-ref.dts @@ -33,7 +33,7 @@ i2c6 = &i2c6; }; - memory { + memory@80000000 { device_type = "memory"; reg = <0x80000000 0x80000000>; }; diff --git a/arch/arm/dts/uniphier-pro4-ace.dts b/arch/arm/dts/uniphier-pro4-ace.dts index b9d4315..0183df0 100644 --- a/arch/arm/dts/uniphier-pro4-ace.dts +++ b/arch/arm/dts/uniphier-pro4-ace.dts @@ -30,7 +30,7 @@ i2c6 = &i2c6; }; - memory { + memory@80000000 { device_type = "memory"; reg = <0x80000000 0x40000000>; }; diff --git a/arch/arm/dts/uniphier-pro4-ref.dts b/arch/arm/dts/uniphier-pro4-ref.dts index 920fd54..a1fbbdc 100644 --- a/arch/arm/dts/uniphier-pro4-ref.dts +++ b/arch/arm/dts/uniphier-pro4-ref.dts @@ -34,7 +34,7 @@ usb0 = &usb0; }; - memory { + memory@80000000 { device_type = "memory"; reg = <0x80000000 0x40000000>; }; diff --git a/arch/arm/dts/uniphier-pro4-sanji.dts b/arch/arm/dts/uniphier-pro4-sanji.dts index b103ba5..11016a4 100644 --- a/arch/arm/dts/uniphier-pro4-sanji.dts +++ b/arch/arm/dts/uniphier-pro4-sanji.dts @@ -29,7 +29,7 @@ i2c6 = &i2c6; }; - memory { + memory@80000000 { device_type = "memory"; reg = <0x80000000 0x80000000>; }; diff --git a/arch/arm/dts/uniphier-pxs2-gentil.dts b/arch/arm/dts/uniphier-pxs2-gentil.dts index aac4781..a26d586 100644 --- a/arch/arm/dts/uniphier-pxs2-gentil.dts +++ b/arch/arm/dts/uniphier-pxs2-gentil.dts @@ -30,7 +30,7 @@ i2c6 = &i2c6; }; - memory { + memory@80000000 { device_type = "memory"; reg = <0x80000000 0x80000000>; }; diff --git a/arch/arm/dts/uniphier-pxs2-vodka.dts b/arch/arm/dts/uniphier-pxs2-vodka.dts index f381696..f296c7d 100644 --- a/arch/arm/dts/uniphier-pxs2-vodka.dts +++ b/arch/arm/dts/uniphier-pxs2-vodka.dts @@ -28,7 +28,7 @@ i2c6 = &i2c6; }; - memory { + memory@80000000 { device_type = "memory"; reg = <0x80000000 0x80000000>; }; diff --git a/arch/arm/dts/uniphier-pxs3-ref.dts b/arch/arm/dts/uniphier-pxs3-ref.dts index 27f0cb0..cb1eef4 100644 --- a/arch/arm/dts/uniphier-pxs3-ref.dts +++ b/arch/arm/dts/uniphier-pxs3-ref.dts @@ -16,6 +16,10 @@ model = "UniPhier PXs3 Reference Board"; compatible = "socionext,uniphier-pxs3-ref", "socionext,uniphier-pxs3"; + chosen { + stdout-path = "serial0:115200n8"; + }; + aliases { serial0 = &serial0; serial1 = &serial1; @@ -28,14 +32,10 @@ i2c6 = &i2c6; }; - memory { + memory@80000000 { device_type = "memory"; reg = <0 0x80000000 0 0xa0000000>; }; - - chosen { - stdout-path = "serial0:115200n8"; - }; }; ðsc { diff --git a/arch/arm/dts/uniphier-pxs3.dtsi b/arch/arm/dts/uniphier-pxs3.dtsi index 3b30eef..76b6566 100644 --- a/arch/arm/dts/uniphier-pxs3.dtsi +++ b/arch/arm/dts/uniphier-pxs3.dtsi @@ -86,7 +86,7 @@ <1 10 4>; }; - soc { + soc@0 { compatible = "simple-bus"; #address-cells = <1>; #size-cells = <1>; diff --git a/arch/arm/dts/uniphier-sld3-ref.dts b/arch/arm/dts/uniphier-sld3-ref.dts index 01aed3d..907448a 100644 --- a/arch/arm/dts/uniphier-sld3-ref.dts +++ b/arch/arm/dts/uniphier-sld3-ref.dts @@ -31,7 +31,7 @@ i2c4 = &i2c4; }; - memory { + memory@8000000 { device_type = "memory"; reg = <0x80000000 0x20000000 0xc0000000 0x20000000>; diff --git a/arch/arm/dts/uniphier-sld8-ref.dts b/arch/arm/dts/uniphier-sld8-ref.dts index 3c78997..99a284a 100644 --- a/arch/arm/dts/uniphier-sld8-ref.dts +++ b/arch/arm/dts/uniphier-sld8-ref.dts @@ -31,7 +31,7 @@ i2c3 = &i2c3; }; - memory { + memory@80000000 { device_type = "memory"; reg = <0x80000000 0x20000000>; }; diff --git a/arch/arm/dts/uniphier-support-card.dtsi b/arch/arm/dts/uniphier-support-card.dtsi index be0f1d6..58a853c 100644 --- a/arch/arm/dts/uniphier-support-card.dtsi +++ b/arch/arm/dts/uniphier-support-card.dtsi @@ -10,7 +10,7 @@ status = "okay"; ranges = <1 0x00000000 0x42000000 0x02000000>; - support_card: support_card { + support_card: support_card@1,1f00000 { compatible = "simple-bus"; #address-cells = <1>; #size-cells = <1>; From patchwork Sun Mar 12 15:16:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 95181 Delivered-To: patch@linaro.org Received: by 10.140.82.71 with SMTP id g65csp830961qgd; Sun, 12 Mar 2017 08:18:49 -0700 (PDT) X-Received: by 10.223.136.4 with SMTP id d4mr24332754wrd.44.1489331929390; Sun, 12 Mar 2017 08:18:49 -0700 (PDT) Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id l91si21034877wrc.30.2017.03.12.08.18.49; Sun, 12 Mar 2017 08:18:49 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) client-ip=81.169.180.215; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by lists.denx.de (Postfix, from userid 105) id F1360C21C34; Sun, 12 Mar 2017 15:18:05 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 98615C21C5E; Sun, 12 Mar 2017 15:17:16 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 2C7AAC21BE6; Sun, 12 Mar 2017 15:17:13 +0000 (UTC) Received: from conuserg-08.nifty.com (conuserg-08.nifty.com [210.131.2.75]) by lists.denx.de (Postfix) with ESMTPS id 957F6C21C32 for ; Sun, 12 Mar 2017 15:17:11 +0000 (UTC) Received: from grover.sesame (FL1-111-169-71-157.osk.mesh.ad.jp [111.169.71.157]) (authenticated) by conuserg-08.nifty.com with ESMTP id v2CFGnTt028763; Mon, 13 Mar 2017 00:16:55 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com v2CFGnTt028763 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1489331815; bh=5FvJcrdrUgKYNWyb6Pac/11Gb2izUlYbthiW3mo7rGw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VUoaYwIcDgi0vEPHBfWtWUC46HMkxNSHChcC+U47v1ZXGIM8VLVgjsRYyRYEN7mc0 eg6U2UaFUCzb6Of0YcYsmJWZy7YdsUebrYB6G7bPLcgTXuZWhFT817QbOLBUZTeto4 atrEYtHqqroxv2V75Q107zV72J+mPVmUJPpQhatXKSICM3S5k4WvExY3piEi4eZ85Y N9qCooL9ki83JePCmH7Z8AW0FQ0wf+DVrLeF3mEYtgGYPVe+AS/lOE6ccl7F2aS/QL 4Xpcv9vg22qQb4xmJuwzxaCI5p/GT/FGfw5x5gpb+rK3x5gT9ynyajncJ1FcwTDwWJ Ywi2NQUol96YQ== X-Nifty-SrcIP: [111.169.71.157] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Mon, 13 Mar 2017 00:16:41 +0900 Message-Id: <1489331802-28231-3-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1489331802-28231-1-git-send-email-yamada.masahiro@socionext.com> References: <1489331802-28231-1-git-send-email-yamada.masahiro@socionext.com> Subject: [U-Boot] [PATCH v2 3/3] ARM: dts: uniphier: more re-sync DT with Linux X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" For better maintainability. Signed-off-by: Masahiro Yamada --- Changes in v2: - Newly added arch/arm/dts/uniphier-ld11.dtsi | 2 +- arch/arm/dts/uniphier-pxs2.dtsi | 22 ++++++++-------------- arch/arm/dts/uniphier-sld3.dtsi | 7 +++++-- 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/arch/arm/dts/uniphier-ld11.dtsi b/arch/arm/dts/uniphier-ld11.dtsi index 8488984..2843adb 100644 --- a/arch/arm/dts/uniphier-ld11.dtsi +++ b/arch/arm/dts/uniphier-ld11.dtsi @@ -318,7 +318,7 @@ }; mioctrl@5b3e0000 { - compatible = "socionext,uniphier-mioctrl", + compatible = "socionext,uniphier-ld11-mioctrl", "simple-mfd", "syscon"; reg = <0x5b3e0000 0x800>; diff --git a/arch/arm/dts/uniphier-pxs2.dtsi b/arch/arm/dts/uniphier-pxs2.dtsi index 904320c..b0f6f94 100644 --- a/arch/arm/dts/uniphier-pxs2.dtsi +++ b/arch/arm/dts/uniphier-pxs2.dtsi @@ -112,12 +112,6 @@ compatible = "fixed-clock"; clock-frequency = <50000000>; }; - - i2c_clk: i2c_clk { - #clock-cells = <0>; - compatible = "fixed-clock"; - clock-frequency = <50000000>; - }; }; soc { @@ -389,7 +383,7 @@ interrupts = <0 41 4>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_i2c0>; - clocks = <&i2c_clk>; + clocks = <&peri_clk 4>; clock-frequency = <100000>; }; @@ -402,7 +396,7 @@ interrupts = <0 42 4>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_i2c1>; - clocks = <&i2c_clk>; + clocks = <&peri_clk 5>; clock-frequency = <100000>; }; @@ -415,7 +409,7 @@ interrupts = <0 43 4>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_i2c2>; - clocks = <&i2c_clk>; + clocks = <&peri_clk 6>; clock-frequency = <100000>; }; @@ -428,7 +422,7 @@ interrupts = <0 44 4>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_i2c3>; - clocks = <&i2c_clk>; + clocks = <&peri_clk 7>; clock-frequency = <100000>; }; @@ -439,7 +433,7 @@ #address-cells = <1>; #size-cells = <0>; interrupts = <0 45 4>; - clocks = <&i2c_clk>; + clocks = <&peri_clk 8>; clock-frequency = <400000>; }; @@ -450,7 +444,7 @@ #address-cells = <1>; #size-cells = <0>; interrupts = <0 25 4>; - clocks = <&i2c_clk>; + clocks = <&peri_clk 9>; clock-frequency = <400000>; }; @@ -461,7 +455,7 @@ #address-cells = <1>; #size-cells = <0>; interrupts = <0 26 4>; - clocks = <&i2c_clk>; + clocks = <&peri_clk 10>; clock-frequency = <400000>; }; @@ -590,7 +584,7 @@ sysctrl@61840000 { compatible = "socionext,uniphier-pxs2-sysctrl", "simple-mfd", "syscon"; - reg = <0x61840000 0x4000>; + reg = <0x61840000 0x10000>; sys_clk: clock { compatible = "socionext,uniphier-pxs2-clock"; diff --git a/arch/arm/dts/uniphier-sld3.dtsi b/arch/arm/dts/uniphier-sld3.dtsi index 7578920..9e458d3 100644 --- a/arch/arm/dts/uniphier-sld3.dtsi +++ b/arch/arm/dts/uniphier-sld3.dtsi @@ -101,6 +101,7 @@ interrupts = <0 33 4>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart0>; + clocks = <&sys_clk 0>; clock-frequency = <36864000>; }; @@ -111,6 +112,7 @@ interrupts = <0 35 4>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart1>; + clocks = <&sys_clk 0>; clock-frequency = <36864000>; }; @@ -121,6 +123,7 @@ interrupts = <0 37 4>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart2>; + clocks = <&sys_clk 0>; clock-frequency = <36864000>; }; @@ -307,7 +310,7 @@ }; mioctrl@59810000 { - compatible = "socionext,uniphier-mioctrl", + compatible = "socionext,uniphier-sld3-mioctrl", "simple-mfd", "syscon"; reg = <0x59810000 0x800>; u-boot,dm-pre-reloc; @@ -427,7 +430,7 @@ sysctrl@f1840000 { compatible = "socionext,uniphier-sld3-sysctrl", "simple-mfd", "syscon"; - reg = <0xf1840000 0x4000>; + reg = <0xf1840000 0x10000>; sys_clk: clock { compatible = "socionext,uniphier-sld3-clock";