Merge remote-tracking branch 'net-next/master'

[karo-tx-linux.git] / arch / arm / boot / dts / rk3066a-bqcurie2.dts

diff --git a/arch/arm/boot/dts/rk3066a-bqcurie2.dts b/arch/arm/boot/dts/rk3066a-bqcurie2.dts
index 38c91a839795f3cf77103f56fdb7bb0185ad2854..6d2a5b3a84a86635f65b8d43aae475040dc54c4e 100644 (file)
--- a/arch/arm/boot/dts/rk3066a-bqcurie2.dts
+++ b/arch/arm/boot/dts/rk3066a-bqcurie2.dts
@@ -53,6 +53,18 @@
                reg = <0x60000000 0x40000000>;
        };
 
+       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";
+       };
+
        vcc_sd0: fixed-regulator {
                compatible = "regulator-fixed";
                regulator-name = "sdmmc-supply";
@@ -74,7 +86,7 @@
                        linux,code = <116>;
                        label = "GPIO Key Power";
                        linux,input-type = <1>;
-                       gpio-key,wakeup = <1>;
+                       wakeup-source;
                        debounce-interval = <100>;
                };
                button@1 {
@@ -82,7 +94,6 @@
                        linux,code = <104>;
                        label = "GPIO Key Vol-";
                        linux,input-type = <1>;
-                       gpio-key,wakeup = <0>;
                        debounce-interval = <100>;
                };
                /* VOL+ comes somehow thru the ADC */
@@ -203,6 +214,10 @@
        disable-wp;
 };
 
+&pwm3 {
+       status = "okay";
+};
+
 &uart0 {
        status = "okay";
 };