From patchwork Tue Sep 13 17:51:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 9329705 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 4F7B760231 for ; Tue, 13 Sep 2016 17:55:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 429A329508 for ; Tue, 13 Sep 2016 17:55:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 33B7129562; Tue, 13 Sep 2016 17:55:12 +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=-3.7 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.1 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.wl.linuxfoundation.org (Postfix) with ESMTPS id 7C4F429508 for ; Tue, 13 Sep 2016 17:55:11 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bjrto-0003Bj-Is; Tue, 13 Sep 2016 17:53:36 +0000 Received: from mout.kundenserver.de ([217.72.192.75]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bjrtZ-0002oz-Sb for linux-arm-kernel@lists.infradead.org; Tue, 13 Sep 2016 17:53:31 +0000 Received: from localhost.localdomain ([95.91.36.119]) by mrelayeu.kundenserver.de (mreue103) with ESMTPSA (Nemesis) id 0MQcnt-1baGZl0zMb-00U6m2; Tue, 13 Sep 2016 19:51:16 +0200 From: Stefan Wahren To: Shawn Guo , Fabio Estevam Subject: [PATCH 1/4] ARM: dts: imx23: Remove fake "reg" properties from bus nodes Date: Tue, 13 Sep 2016 17:51:03 +0000 Message-Id: <1473789066-8955-2-git-send-email-stefan.wahren@i2se.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1473789066-8955-1-git-send-email-stefan.wahren@i2se.com> References: <1473789066-8955-1-git-send-email-stefan.wahren@i2se.com> X-Provags-ID: V03:K0:JBomSlFGYl/z31IjFsDCEkUzEUl11GcbP7UktilJCUVSRKghlM4 5v7OyoIF2mwESw0e1YRUG3x3Lid/JTprPBBDMHW56EkITJzST3aF01YFqlpr9huetXXTzGV nCGW20w3xyUn0r4mMtXl8L7KmjnFGHV/Gwg6kRQDEHsMLKJsGk/6vmRxw9kNQHk2xZIhHFz WQuk1ULPYVmlXIcNrmjCQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:IqA9ntQR1DM=:DH5RH8Vh7yGnKdqlaerPfV mYAQJkOse4qLvVtFcPvWPQ401fS0MfYHJ1PuK6/i3AMir1JZ5L38DZCGPzH9Xlzq72eS9XO45 czDd6WS4yfSrUjs1v2g4IXvoD5OkIYc4+B2qEQIn6snBDXRPp9RA+wrxd5MTZMjH3B0+hLpQS +eW98wNeG6JPdhGb55TRf7j4U7VuOcTeDNp919JMy2amCUUn81AquX1iLMgjDdNfzOAUlq5wQ wkaNjjS/wQeQILS/IV3BBip9PCHiokLG/i8gjp05YKZvMD7qg2r2QHoWCauBnyTDPZthXT8xO rrFT9LLNVOZjU4XvzgXib43XumFtBY0cPUB965fMmOdFnNUg7MU1wI4uKMV0Fr6hUUkjbzy9J N7fwJ6FpU3BQ9c8ikqM+RRZYFBJwkcWs3qKNKSpgJ2HHV2Mfitc9i3DFcC5Ye7r3+WPyuo1VB emXrQlEvE5hHk4QImhkFbwiHi1a4CxN/h0TZd47XX8hp6T0zOhuHrKmtjnEcAknI9RdQFGOrf EfMEfIdRrCKaO3GK35eNJlGThrMAZjVZJZGNNO2AeIUBsLIh0P6Ip68CJhVtJrBsSgsMPDuPR 3NcostVJqT6l9BCanG+qQY5PRfQM+r5THpwhAKSTNPXbdQetqSGKMQwWKEd/Dtwc5K8vsAXEJ Yqabi46DHGsAGf/8Uu4ndTNgshlPwyD1ORu4NcJJhTQVK6PDgg0zgRX14Nu06n90EDxmbCWXr GsrerF+xkkFMnUHZRZONiX3f+LWGVAJV7u6X0wy6PYe8t+uWaOauAzQvY5nwh3rzkOBDxIbLT 4Iidije X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160913_105322_467059_F66426AF X-CRM114-Status: GOOD ( 10.04 ) 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: Mark Rutland , Marek Vasut , Arnd Bergmann , devicetree@vger.kernel.org, Stefan Wahren , =?UTF-8?q?J=C3=B6rg=20Krause?= , Rob Herring , Sascha Hauer , linux-arm-kernel@lists.infradead.org, =?UTF-8?q?Lothar=20Wa=C3=9Fmann?= MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP There is no need to specify fake "reg" properties for the internal bus nodes based on the registers of its child devices. This also avoids overlapping issues on adding the sram node. Suggested-by: Arnd Bergmann Signed-off-by: Stefan Wahren --- arch/arm/boot/dts/imx23-evk.dts | 8 ++++---- arch/arm/boot/dts/imx23-olinuxino.dts | 8 ++++---- arch/arm/boot/dts/imx23-sansa.dts | 8 ++++---- arch/arm/boot/dts/imx23-stmp378x_devb.dts | 6 +++--- arch/arm/boot/dts/imx23-xfi3.dts | 8 ++++---- arch/arm/boot/dts/imx23.dtsi | 10 ++++------ 6 files changed, 23 insertions(+), 25 deletions(-) diff --git a/arch/arm/boot/dts/imx23-evk.dts b/arch/arm/boot/dts/imx23-evk.dts index bd06402..c74c648 100644 --- a/arch/arm/boot/dts/imx23-evk.dts +++ b/arch/arm/boot/dts/imx23-evk.dts @@ -21,8 +21,8 @@ reg = <0x40000000 0x08000000>; }; - apb@80000000 { - apbh@80000000 { + apb { + apbh { gpmi-nand@8000c000 { pinctrl-names = "default"; pinctrl-0 = <&gpmi_pins_a &gpmi_pins_fixup>; @@ -90,7 +90,7 @@ }; }; - apbx@80040000 { + apbx { lradc@80050000 { status = "okay"; fsl,lradc-touchscreen-wires = <4>; @@ -120,7 +120,7 @@ }; }; - ahb@80080000 { + ahb { usb0: usb@80080000 { status = "okay"; }; diff --git a/arch/arm/boot/dts/imx23-olinuxino.dts b/arch/arm/boot/dts/imx23-olinuxino.dts index 109f516..ae7538b 100644 --- a/arch/arm/boot/dts/imx23-olinuxino.dts +++ b/arch/arm/boot/dts/imx23-olinuxino.dts @@ -24,8 +24,8 @@ reg = <0x40000000 0x04000000>; }; - apb@80000000 { - apbh@80000000 { + apb { + apbh { ssp0: ssp@80010000 { compatible = "fsl,imx23-mmc"; pinctrl-names = "default"; @@ -70,7 +70,7 @@ }; }; - apbx@80040000 { + apbx { lradc@80050000 { status = "okay"; }; @@ -99,7 +99,7 @@ }; }; - ahb@80080000 { + ahb { usb0: usb@80080000 { dr_mode = "host"; vbus-supply = <®_usb0_vbus>; diff --git a/arch/arm/boot/dts/imx23-sansa.dts b/arch/arm/boot/dts/imx23-sansa.dts index 9cf40d3..65fb08b 100644 --- a/arch/arm/boot/dts/imx23-sansa.dts +++ b/arch/arm/boot/dts/imx23-sansa.dts @@ -53,8 +53,8 @@ reg = <0x40000000 0x04000000>; }; - apb@80000000 { - apbh@80000000 { + apb { + apbh { ssp0: ssp@80010000 { compatible = "fsl,imx23-mmc"; pinctrl-names = "default"; @@ -99,7 +99,7 @@ }; }; - apbx@80040000 { + apbx { pwm: pwm@80064000 { pinctrl-names = "default"; pinctrl-0 = <&pwm2_pins_a>; @@ -122,7 +122,7 @@ }; }; - ahb@80080000 { + ahb { usb0: usb@80080000 { dr_mode = "peripheral"; status = "okay"; diff --git a/arch/arm/boot/dts/imx23-stmp378x_devb.dts b/arch/arm/boot/dts/imx23-stmp378x_devb.dts index aab0293..d9b1758 100644 --- a/arch/arm/boot/dts/imx23-stmp378x_devb.dts +++ b/arch/arm/boot/dts/imx23-stmp378x_devb.dts @@ -21,8 +21,8 @@ reg = <0x40000000 0x04000000>; }; - apb@80000000 { - apbh@80000000 { + apb { + apbh { ssp0: ssp@80010000 { compatible = "fsl,imx23-mmc"; pinctrl-names = "default"; @@ -50,7 +50,7 @@ }; }; - apbx@80040000 { + apbx { auart0: serial@8006c000 { pinctrl-names = "default"; pinctrl-0 = <&auart0_pins_a>; diff --git a/arch/arm/boot/dts/imx23-xfi3.dts b/arch/arm/boot/dts/imx23-xfi3.dts index 2b5df8d..1eb1196 100644 --- a/arch/arm/boot/dts/imx23-xfi3.dts +++ b/arch/arm/boot/dts/imx23-xfi3.dts @@ -53,8 +53,8 @@ reg = <0x40000000 0x04000000>; }; - apb@80000000 { - apbh@80000000 { + apb { + apbh { ssp0: ssp@80010000 { compatible = "fsl,imx23-mmc"; pinctrl-names = "default"; @@ -101,7 +101,7 @@ }; }; - apbx@80040000 { + apbx { i2c: i2c@80058000 { pinctrl-names = "default"; pinctrl-0 = <&i2c_pins_a>; @@ -136,7 +136,7 @@ }; }; - ahb@80080000 { + ahb { usb0: usb@80080000 { dr_mode = "peripheral"; status = "okay"; diff --git a/arch/arm/boot/dts/imx23.dtsi b/arch/arm/boot/dts/imx23.dtsi index 9d0e9e1..c0a59d2 100644 --- a/arch/arm/boot/dts/imx23.dtsi +++ b/arch/arm/boot/dts/imx23.dtsi @@ -38,14 +38,13 @@ }; }; - apb@80000000 { + apb { compatible = "simple-bus"; #address-cells = <1>; #size-cells = <1>; - reg = <0x80000000 0x80000>; ranges; - apbh@80000000 { + apbh { compatible = "simple-bus"; #address-cells = <1>; #size-cells = <1>; @@ -468,7 +467,7 @@ }; }; - apbx@80040000 { + apbx { compatible = "simple-bus"; #address-cells = <1>; #size-cells = <1>; @@ -602,11 +601,10 @@ }; }; - ahb@80080000 { + ahb { compatible = "simple-bus"; #address-cells = <1>; #size-cells = <1>; - reg = <0x80080000 0x80000>; ranges; usb0: usb@80080000 {