[U-Boot] [PATCH 08/13] ARM: dts: rmobile: Extract SDHI extras on H3, M3W, M3N Salvator-X

[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-salvator-x-u-boot.dts  | 28 +++++++++++++++++++
 arch/arm/dts/r8a7796-salvator-x-u-boot.dts  | 28 +++++++++++++++++++
 arch/arm/dts/r8a77965-salvator-x-u-boot.dts | 31 +++++++++++++++++++++
 arch/arm/dts/salvator-common.dtsi           | 17 ++---------
 4 files changed, 90 insertions(+), 14 deletions(-)

diff --git a/arch/arm/dts/r8a7795-salvator-x-u-boot.dts 
b/arch/arm/dts/r8a7795-salvator-x-u-boot.dts
index 6b29aaaf90..8ad21ca4f9 100644
--- a/arch/arm/dts/r8a7795-salvator-x-u-boot.dts
+++ b/arch/arm/dts/r8a7795-salvator-x-u-boot.dts
@@ -8,7 +8,35 @@
 #include "r8a7795-salvator-x.dts"
 #include "r8a7795-u-boot.dtsi"
 
+&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>;
+};
+
+&sdhi3 {
+       sd-uhs-sdr12;
+       sd-uhs-sdr25;
+       sd-uhs-sdr104;
+       max-frequency = <208000000>;
+};
diff --git a/arch/arm/dts/r8a7796-salvator-x-u-boot.dts 
b/arch/arm/dts/r8a7796-salvator-x-u-boot.dts
index 00ec01299a..7614a810b6 100644
--- a/arch/arm/dts/r8a7796-salvator-x-u-boot.dts
+++ b/arch/arm/dts/r8a7796-salvator-x-u-boot.dts
@@ -8,7 +8,35 @@
 #include "r8a7796-salvator-x.dts"
 #include "r8a7796-u-boot.dtsi"
 
+&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>;
+};
+
+&sdhi3 {
+       sd-uhs-sdr12;
+       sd-uhs-sdr25;
+       sd-uhs-sdr104;
+       max-frequency = <208000000>;
+};
diff --git a/arch/arm/dts/r8a77965-salvator-x-u-boot.dts 
b/arch/arm/dts/r8a77965-salvator-x-u-boot.dts
index 4245a88d53..bd32a25409 100644
--- a/arch/arm/dts/r8a77965-salvator-x-u-boot.dts
+++ b/arch/arm/dts/r8a77965-salvator-x-u-boot.dts
@@ -8,7 +8,38 @@
 #include "r8a77965-salvator-x.dts"
 #include "r8a77965-u-boot.dtsi"
 
+&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>;
+       status = "okay";
+};
+
+&sdhi2 {
+       mmc-hs400-1_8v;
+       max-frequency = <200000000>;
+       status = "okay";
+};
+
+&sdhi3 {
+       sd-uhs-sdr12;
+       sd-uhs-sdr25;
+       sd-uhs-sdr104;
+       max-frequency = <208000000>;
+       status = "okay";
+};
diff --git a/arch/arm/dts/salvator-common.dtsi 
b/arch/arm/dts/salvator-common.dtsi
index b036a713ea..2a7f36abd2 100644
--- a/arch/arm/dts/salvator-common.dtsi
+++ b/arch/arm/dts/salvator-common.dtsi
@@ -480,13 +480,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>;
        };
@@ -618,13 +618,8 @@
        cd-gpios = <&gpio3 12 GPIO_ACTIVE_LOW>;
        wp-gpios = <&gpio3 13 GPIO_ACTIVE_HIGH>;
        bus-width = <4>;
-       sd-uhs-sdr12;
-       sd-uhs-sdr25;
        sd-uhs-sdr50;
-       sd-uhs-sdr104;
        status = "okay";
-
-       max-frequency = <208000000>;
 };
 
 &sdhi2 {
@@ -637,11 +632,9 @@
        vqmmc-supply = <&reg_1p8v>;
        bus-width = <8>;
        mmc-hs200-1_8v;
-       mmc-hs400-1_8v;
        non-removable;
        fixed-emmc-driver-type = <1>;
        status = "okay";
-       max-frequency = <200000000>;
 };
 
 &sdhi3 {
@@ -654,12 +647,8 @@
        cd-gpios = <&gpio4 15 GPIO_ACTIVE_LOW>;
        wp-gpios = <&gpio4 16 GPIO_ACTIVE_HIGH>;
        bus-width = <4>;
-       sd-uhs-sdr12;
-       sd-uhs-sdr25;
        sd-uhs-sdr50;
-       sd-uhs-sdr104;
        status = "okay";
-       max-frequency = <208000000>;
 };
 
 &ssi1 {
-- 
2.18.0

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