[U-Boot] [PATCH 07/13] ARM: dts: rmobile: Extract SDHI extras on H3 and M3W ULCB

[Marek Vasut]

The SDHI nodes are missing features supported in upstream U-Boot,
like mode support properties. Pull the extras into U-Boot specific
DT until it hits mainline Linux, to make syncing of DTs easier.

Signed-off-by: Marek Vasut <marek.vasut+rene...@gmail.com>
Cc: Nobuhiro Iwamatsu <iwama...@nigauri.org>
---
 arch/arm/dts/r8a7795-h3ulcb-u-boot.dts | 21 +++++++++++++++++++++
 arch/arm/dts/r8a7796-m3ulcb-u-boot.dts | 21 +++++++++++++++++++++
 arch/arm/dts/ulcb.dtsi                 | 12 +++---------
 3 files changed, 45 insertions(+), 9 deletions(-)

diff --git a/arch/arm/dts/r8a7795-h3ulcb-u-boot.dts 
b/arch/arm/dts/r8a7795-h3ulcb-u-boot.dts
index e8e73a95a4..4f5410f1e8 100644
--- a/arch/arm/dts/r8a7795-h3ulcb-u-boot.dts
+++ b/arch/arm/dts/r8a7795-h3ulcb-u-boot.dts
@@ -19,7 +19,28 @@
        };
 };
 
+&sdhi2_pins {
+       groups = "sdhi2_data8", "sdhi2_ctrl", "sdhi2_ds";
+       power-source = <1800>;
+};
+
+&sdhi2_pins_uhs {
+       groups = "sdhi2_data8", "sdhi2_ctrl", "sdhi2_ds";
+};
+
 &rpc {
        reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0x04000000>;
        status = "okay";
 };
+
+&sdhi0 {
+       sd-uhs-sdr12;
+       sd-uhs-sdr25;
+       sd-uhs-sdr104;
+       max-frequency = <208000000>;
+};
+
+&sdhi2 {
+       mmc-hs400-1_8v;
+       max-frequency = <200000000>;
+};
diff --git a/arch/arm/dts/r8a7796-m3ulcb-u-boot.dts 
b/arch/arm/dts/r8a7796-m3ulcb-u-boot.dts
index 5cfadef87d..843be4b67e 100644
--- a/arch/arm/dts/r8a7796-m3ulcb-u-boot.dts
+++ b/arch/arm/dts/r8a7796-m3ulcb-u-boot.dts
@@ -19,7 +19,28 @@
        };
 };
 
+&sdhi2_pins {
+       groups = "sdhi2_data8", "sdhi2_ctrl", "sdhi2_ds";
+       power-source = <1800>;
+};
+
+&sdhi2_pins_uhs {
+       groups = "sdhi2_data8", "sdhi2_ctrl", "sdhi2_ds";
+};
+
 &rpc {
        reg = <0 0xee200000 0 0x100>, <0 0x08000000 0 0x04000000>;
        status = "okay";
 };
+
+&sdhi0 {
+       sd-uhs-sdr12;
+       sd-uhs-sdr25;
+       sd-uhs-sdr104;
+       max-frequency = <208000000>;
+};
+
+&sdhi2 {
+       mmc-hs400-1_8v;
+       max-frequency = <200000000>;
+};
diff --git a/arch/arm/dts/ulcb.dtsi b/arch/arm/dts/ulcb.dtsi
index c805265343..6f814845f8 100644
--- a/arch/arm/dts/ulcb.dtsi
+++ b/arch/arm/dts/ulcb.dtsi
@@ -299,13 +299,13 @@
        };
 
        sdhi2_pins: sd2 {
-               groups = "sdhi2_data8", "sdhi2_ctrl", "sdhi2_ds";
+               groups = "sdhi2_data8", "sdhi2_ctrl";
                function = "sdhi2";
-               power-source = <1800>;
+               power-source = <3300>;
        };
 
        sdhi2_pins_uhs: sd2_uhs {
-               groups = "sdhi2_data8", "sdhi2_ctrl", "sdhi2_ds";
+               groups = "sdhi2_data8", "sdhi2_ctrl";
                function = "sdhi2";
                power-source = <1800>;
        };
@@ -387,12 +387,8 @@
        vqmmc-supply = <&vccq_sdhi0>;
        cd-gpios = <&gpio3 12 GPIO_ACTIVE_LOW>;
        bus-width = <4>;
-       sd-uhs-sdr12;
-       sd-uhs-sdr25;
        sd-uhs-sdr50;
-       sd-uhs-sdr104;
        status = "okay";
-       max-frequency = <208000000>;
 };
 
 &sdhi2 {
@@ -405,10 +401,8 @@
        vqmmc-supply = <&reg_1p8v>;
        bus-width = <8>;
        mmc-hs200-1_8v;
-       mmc-hs400-1_8v;
        non-removable;
        status = "okay";
-       max-frequency = <200000000>;
 };
 
 &ssi1 {
-- 
2.18.0

_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot