Merge git://git.denx.de/u-boot-dm

[oweals/u-boot.git] / arch / arm / dts / salvator-common.dtsi

diff --git a/arch/arm/dts/salvator-common.dtsi b/arch/arm/dts/salvator-common.dtsi
index abc87c01914d249fa4642a70c4623b7bda96d47d..e95c0060670586ec47b0ea917dee6bc40a0545f7 100644 (file)
--- a/arch/arm/dts/salvator-common.dtsi
+++ b/arch/arm/dts/salvator-common.dtsi
@@ -62,6 +62,7 @@
                brightness-levels = <256 128 64 16 8 4 0>;
                default-brightness-level = <6>;
 
+               power-supply = <&reg_12v>;
                enable-gpios = <&gpio6 7 GPIO_ACTIVE_HIGH>;
        };
 
@@ -83,6 +84,15 @@
                regulator-always-on;
        };
 
+       reg_12v: regulator2 {
+               compatible = "regulator-fixed";
+               regulator-name = "fixed-12V";
+               regulator-min-microvolt = <12000000>;
+               regulator-max-microvolt = <12000000>;
+               regulator-boot-on;
+               regulator-always-on;
+       };
+
        rsnd_ak4613: sound {
                compatible = "simple-audio-card";
 
@@ -247,7 +257,6 @@
        pinctrl-names = "default";
        renesas,no-ether-link;
        phy-handle = <&phy0>;
-       reset-gpios = <&gpio2 10 GPIO_ACTIVE_LOW>;
        status = "okay";
 
        phy0: ethernet-phy@0 {
@@ -269,10 +278,6 @@
                                remote-endpoint = <&adv7123_in>;
                        };
                };
-               port@3 {
-                       lvds_connector: endpoint {
-                       };
-               };
        };
 };
 
@@ -438,7 +443,7 @@
        sdhi2_pins: sd2 {
                groups = "sdhi2_data8", "sdhi2_ctrl";
                function = "sdhi2";
-               power-source = <3300>;
+               power-source = <1800>;
        };
 
        sdhi2_pins_uhs: sd2_uhs {
@@ -570,7 +575,10 @@
        wp-gpios = <&gpio3 13 GPIO_ACTIVE_HIGH>;
        bus-width = <4>;
        sd-uhs-sdr50;
+       sd-uhs-sdr104;
        status = "okay";
+
+       max-frequency = <208000000>;
 };
 
 &sdhi2 {
@@ -582,9 +590,12 @@
        vmmc-supply = <&reg_3p3v>;
        vqmmc-supply = <&reg_1p8v>;
        bus-width = <8>;
+       mmc-ddr-1_8v;
        mmc-hs200-1_8v;
        non-removable;
        status = "okay";
+
+       max-frequency = <200000000>;
 };
 
 &sdhi3 {
@@ -598,7 +609,10 @@
        wp-gpios = <&gpio4 16 GPIO_ACTIVE_HIGH>;
        bus-width = <4>;
        sd-uhs-sdr50;
+       sd-uhs-sdr104;
        status = "okay";
+
+       max-frequency = <208000000>;
 };
 
 &ssi1 {