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

[cascardo/linux.git] / arch / arm / boot / dts / rk3066a-rayeager.dts

diff --git a/arch/arm/boot/dts/rk3066a-rayeager.dts b/arch/arm/boot/dts/rk3066a-rayeager.dts
index 341c1f8..0553300 100644 (file)
--- a/arch/arm/boot/dts/rk3066a-rayeager.dts
+++ b/arch/arm/boot/dts/rk3066a-rayeager.dts
@@ -65,7 +65,7 @@
                #size-cells = <0>;
 
                button@0 {
-                       gpio-key,wakeup = <1>;
+                       wakeup-source;
                        gpios = <&gpio6 2 GPIO_ACTIVE_LOW>;
                        label = "GPIO Power";
                        linux,code = <116>;
@@ -74,6 +74,18 @@
                };
        };
 
+       vdd_log: vdd-log {
+               compatible = "pwm-regulator";
+               pwms = <&pwm3 0 1000>;
+               regulator-name = "vdd_log";
+               regulator-min-microvolt = <1200000>;
+               regulator-max-microvolt = <1200000>;
+               regulator-always-on;
+               voltage-table = <1000000 100>,
+                               <1200000 42>;
+               status = "okay";
+       };
+
        vsys: vsys-regulator {
                compatible = "regulator-fixed";
                regulator-name = "vsys";
@@ -431,6 +443,10 @@
        status = "okay";
 };
 
+&pwm3 {
+       status = "okay";
+};
+
 &saradc {
        vref-supply = <&vcc_25>;
        status = "okay";