ARM: tegra: remove "0, " from DT unit addresses

[u-boot] / arch / arm / dts / dra72-evm.dts

diff --git a/arch/arm/dts/dra72-evm.dts b/arch/arm/dts/dra72-evm.dts
index 277745fec998657f5935e8e4fa3d6f3117cb161b..e7c5db2f93d5b4f6b378863fb68e2946d01771ee 100644 (file)
--- a/arch/arm/dts/dra72-evm.dts
+++ b/arch/arm/dts/dra72-evm.dts
@@ -35,6 +35,15 @@
                regulator-max-microvolt = <3300000>;
        };
 
+       evm_3v3_sd: fixedregulator-sd {
+               compatible = "regulator-fixed";
+               regulator-name = "evm_3v3_sd";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               enable-active-high;
+               gpio = <&pcf_gpio_21 5 GPIO_ACTIVE_HIGH>;
+       };
+
        extcon_usb1: extcon_usb1 {
                compatible = "linux,extcon-usb-gpio";
                id-gpio = <&pcf_gpio_21 1 GPIO_ACTIVE_HIGH>;
@@ -499,7 +508,8 @@
        pinctrl-names = "default";
        pinctrl-0 = <&mmc1_pins_default>;
 
-       vmmc-supply = <&ldo1_reg>;
+       vmmc_aux-supply = <&ldo1_reg>;
+       vmmc-supply = <&evm_3v3_sd>;
        bus-width = <4>;
        /*
         * SDCD signal is not being used here - using the fact that GPIO mode
@@ -578,9 +588,10 @@
        pinctrl-names = "default", "sleep";
        pinctrl-0 = <&cpsw_default>;
        pinctrl-1 = <&cpsw_sleep>;
+       mode-gpios = <&pcf_gpio_21 4 GPIO_ACTIVE_HIGH>;
 };
 
-&cpsw_emac1 {
+&cpsw_emac0 {
        phy_id = <&davinci_mdio>, <3>;
        phy-mode = "rgmii";
 };
@@ -589,7 +600,6 @@
        pinctrl-names = "default", "sleep";
        pinctrl-0 = <&davinci_mdio_default>;
        pinctrl-1 = <&davinci_mdio_sleep>;
-       active_slave = <1>;
 };
 
 &dcan1 {