ARM: dts: rockchip: replace gpio-key,wakeup with wakeup-source property

[mirror_ubuntu-zesty-kernel.git] / arch / arm / boot / dts / rk3288-evb.dtsi

diff --git a/arch/arm/boot/dts/rk3288-evb.dtsi b/arch/arm/boot/dts/rk3288-evb.dtsi
index f6d2e7894b051bbde8333b41427c613d8a560aff..78d47f7d2938532d435954c731ba7e99063939c2 100644 (file)
--- a/arch/arm/boot/dts/rk3288-evb.dtsi
+++ b/arch/arm/boot/dts/rk3288-evb.dtsi
@@ -89,6 +89,13 @@
                pwms = <&pwm0 0 1000000 PWM_POLARITY_INVERTED>;
        };
 
+       ext_gmac: external-gmac-clock {
+               compatible = "fixed-clock";
+               clock-frequency = <125000000>;
+               clock-output-names = "ext_gmac";
+               #clock-cells = <0>;
+       };
+
        gpio-keys {
                compatible = "gpio-keys";
                #address-cells = <1>;
@@ -103,7 +110,7 @@
                        linux,code = <116>;
                        label = "GPIO Key Power";
                        linux,input-type = <1>;
-                       gpio-key,wakeup = <1>;
+                       wakeup-source;
                        debounce-interval = <100>;
                };
        };
@@ -160,6 +167,10 @@
        };
 };
 
+&cpu0 {
+       cpu0-supply = <&vdd_cpu>;
+};
+
 &emmc {
        broken-cd;
        bus-width = <8>;
@@ -172,11 +183,6 @@
        status = "okay";
 };
 
-&hdmi {
-       ddc-i2c-bus = <&i2c5>;
-       status = "okay";
-};
-
 &sdmmc {
        bus-width = <4>;
        cap-mmc-highspeed;
@@ -191,6 +197,27 @@
        vqmmc-supply = <&vccio_sd>;
 };
 
+&gmac {
+       phy-supply = <&vcc_phy>;
+       phy-mode = "rgmii";
+       clock_in_out = "input";
+       snps,reset-gpio = <&gpio4 7 0>;
+       snps,reset-active-low;
+       snps,reset-delays-us = <0 10000 1000000>;
+       assigned-clocks = <&cru SCLK_MAC>;
+       assigned-clock-parents = <&ext_gmac>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&rgmii_pins>;
+       tx_delay = <0x30>;
+       rx_delay = <0x10>;
+       status = "ok";
+};
+
+&hdmi {
+       ddc-i2c-bus = <&i2c5>;
+       status = "okay";
+};
+
 &i2c0 {
        status = "okay";
 };