ARM: dts: rmobile: Extract SDHI extras on H3, M3W, M3N Salvator-X

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+renesas@gmail.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
---
V2: Rebase on u-boot/master

diff --git a/arch/arm/dts/r8a7795-salvator-x-u-boot.dts b/arch/arm/dts/r8a7795-salvator-x-u-boot.dts
index 666fbf5a83fac005a977e24a1c9080bfb71253a2..8be5e41a511bfda58340f23fce6f3307c766833c 100644 (file)
--- a/arch/arm/dts/r8a7795-salvator-x-u-boot.dts
+++ b/arch/arm/dts/r8a7795-salvator-x-u-boot.dts
@@ -7,3 +7,31 @@
 
 #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";
+};
+
+&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 7a8ad27795910dda6fc868a4df234ac25a8ef468..44b2f9fb3731fa1ce6765d5c9a6794dd9d46dd00 100644 (file)
--- a/arch/arm/dts/r8a7796-salvator-x-u-boot.dts
+++ b/arch/arm/dts/r8a7796-salvator-x-u-boot.dts
@@ -7,3 +7,31 @@
 
 #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";
+};
+
+&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 06002b629aeb8c83b21ce3f394dba9a46a3ca325..9e0cd26f4086e965512c3e8f86dd5fc78f2bc9d2 100644 (file)
--- a/arch/arm/dts/r8a77965-salvator-x-u-boot.dts
+++ b/arch/arm/dts/r8a77965-salvator-x-u-boot.dts
@@ -7,3 +7,34 @@
 
 #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";
+};
+
+&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 b036a713ea67039f9a68a2dffab4dcc1cb1214df..2a7f36abd2dd85c6c71ff17ca9cf85324c893a80 100644 (file)
--- 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 {