ARM: shmobile: sh73a0: move SDHI and MMCIF DT nodes to sh73a0.dtsi

To avoid having to repeat common DT node properties in all .dts files
move them to SoC's .dtsi file, setting their status to "disabled."
Individual boards will pick up devices, that they want to use and
change their DT node status to enabled.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

diff --git a/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts b/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
index cadcf30e9641f5e79b08ac6074115ae8860902ab..f33b5ccb744655de591a1f8b071036de5b9d6078 100644 (file)
--- a/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
+++ b/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
@@ -12,7 +12,7 @@
  */
 
 /dts-v1/;
-/include/ "sh73a0-reference.dtsi"
+/include/ "sh73a0.dtsi"
 
 / {
        model = "KZM-A9-GT";
@@ -44,34 +44,23 @@
                regulator-always-on;
                regulator-boot-on;
        };
-
-       sdhi0: sdhi@0xee100000 {
-               compatible = "renesas,shmobile-sdhi";
-               reg = <0xee100000 0x100>;
-               interrupt-parent = <&gic>;
-               interrupts = <0 83 4
-                               0 84 4
-                               0 85 4>;
-               vmmc-supply = <&reg_3p3v>;
-               bus-width = <4>;
-               toshiba,mmc-has-idle-wait;
-       };
-
-       sdhi2: sdhi@0xee140000 {
-               compatible = "renesas,shmobile-sdhi";
-               reg = <0xee140000 0x100>;
-               interrupt-parent = <&gic>;
-               interrupts = <0 104 4
-                               0 105 4>;
-               vmmc-supply = <&reg_3p3v>;
-               bus-width = <4>;
-               broken-cd;
-               toshiba,mmc-wrprotect-disable;
-               toshiba,mmc-has-idle-wait;
-       };
 };
 
 &mmcif {
        bus-width = <8>;
        vmmc-supply = <&reg_1p8v>;
+       status = "okay";
+};
+
+&sdhi0 {
+       vmmc-supply = <&reg_3p3v>;
+       bus-width = <4>;
+       status = "okay";
+};
+
+&sdhi2 {
+       vmmc-supply = <&reg_3p3v>;
+       bus-width = <4>;
+       broken-cd;
+       status = "okay";
 };

diff --git a/arch/arm/boot/dts/sh73a0-reference.dtsi b/arch/arm/boot/dts/sh73a0-reference.dtsi
deleted file mode 100644 (file)
index d4bb012..0000000
--- a/arch/arm/boot/dts/sh73a0-reference.dtsi
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Device Tree Source for the SH73A0 SoC
- *
- * Copyright (C) 2012 Renesas Solutions Corp.
- *
- * This file is licensed under the terms of the GNU General Public License
- * version 2.  This program is licensed "as is" without any warranty of any
- * kind, whether express or implied.
- */
-
-/include/ "sh73a0.dtsi"
-
-/ {
-       compatible = "renesas,sh73a0";
-
-       mmcif: mmcif@0x10010000 {
-               compatible = "renesas,sh-mmcif";
-               reg = <0xe6bd0000 0x100>;
-               interrupt-parent = <&gic>;
-               interrupts = <0 140 0x4
-                             0 141 0x4>;
-               reg-io-width = <4>;
-       };
-};

diff --git a/arch/arm/boot/dts/sh73a0.dtsi b/arch/arm/boot/dts/sh73a0.dtsi
index 8a59465d0231c63abe3d49329747226360f48841..c89be386cd3779400f973edffad758af5ea1e055 100644 (file)
--- a/arch/arm/boot/dts/sh73a0.dtsi
+++ b/arch/arm/boot/dts/sh73a0.dtsi
@@ -97,4 +97,48 @@
                              0 189 0x4
                              0 190 0x4>;
        };
+
+       mmcif: mmcif@0x10010000 {
+               compatible = "renesas,sh-mmcif";
+               reg = <0xe6bd0000 0x100>;
+               interrupt-parent = <&gic>;
+               interrupts = <0 140 0x4
+                             0 141 0x4>;
+               reg-io-width = <4>;
+               status = "disabled";
+       };
+
+       sdhi0: sdhi@0xee100000 {
+               compatible = "renesas,shmobile-sdhi";
+               reg = <0xee100000 0x100>;
+               interrupt-parent = <&gic>;
+               interrupts = <0 83 4
+                               0 84 4
+                               0 85 4>;
+               toshiba,mmc-has-idle-wait;
+               status = "disabled";
+       };
+
+       /* SDHI1 and SDHI2 have no CD pins, no need for CD IRQ */
+       sdhi1: sdhi@0xee120000 {
+               compatible = "renesas,shmobile-sdhi";
+               reg = <0xee120000 0x100>;
+               interrupt-parent = <&gic>;
+               interrupts = <0 88 4
+                               0 89 4>;
+               toshiba,mmc-wrprotect-disable;
+               toshiba,mmc-has-idle-wait;
+               status = "disabled";
+       };
+
+       sdhi2: sdhi@0xee140000 {
+               compatible = "renesas,shmobile-sdhi";
+               reg = <0xee140000 0x100>;
+               interrupt-parent = <&gic>;
+               interrupts = <0 104 4
+                               0 105 4>;
+               toshiba,mmc-wrprotect-disable;
+               toshiba,mmc-has-idle-wait;
+               status = "disabled";
+       };
 };