Merge tag 'y2038-vfs' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground

[linux-2.6-microblaze.git] / arch / arm / boot / dts / meson8m2-mxiii-plus.dts

diff --git a/arch/arm/boot/dts/meson8m2-mxiii-plus.dts b/arch/arm/boot/dts/meson8m2-mxiii-plus.dts
index 29d830a..d54477b 100644 (file)
--- a/arch/arm/boot/dts/meson8m2-mxiii-plus.dts
+++ b/arch/arm/boot/dts/meson8m2-mxiii-plus.dts
@@ -73,10 +73,6 @@
 
        amlogic,tx-delay-ns = <4>;
 
-       snps,reset-gpio = <&gpio GPIOH_4 0>;
-       snps,reset-delays-us = <0 10000 1000000>;
-       snps,reset-active-low;
-
        mdio {
                compatible = "snps,dwmac-mdio";
                #address-cells = <1>;
@@ -85,6 +81,10 @@
                eth_phy0: ethernet-phy@0 {
                        /* Realtek RTL8211F (0x001cc916) */
                        reg = <0>;
+
+                       reset-assert-us = <10000>;
+                       reset-deassert-us = <30000>;
+                       reset-gpios = <&gpio GPIOH_4 GPIO_ACTIVE_LOW>;
                };
        };
 };
@@ -114,8 +114,9 @@
                                regulator-always-on;
                        };
 
-                       DCDC2 {
-                               regulator-name = "VDDAO";
+                       vddee: DCDC2 {
+                               /* the output is also used as VDDAO */
+                               regulator-name = "VDD_EE";
                                regulator-min-microvolt = <950000>;
                                regulator-max-microvolt = <1150000>;
                                regulator-boot-on;
@@ -189,6 +190,10 @@
        };
 };
 
+&mali {
+       mali-supply = <&vddee>;
+};
+
 &saradc {
        status = "okay";
        vref-supply = <&vddio_ao1v8>;