Merge tag 'nfs-for-4.6-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / rk3066a-marsboard.dts

diff --git a/arch/arm/boot/dts/rk3066a-marsboard.dts b/arch/arm/boot/dts/rk3066a-marsboard.dts
index 7cdc308bfac54c1ec6e286f29c4ad0c846df41aa..a2b763e949b4648f60e3929d0afba5afc711a61b 100644 (file)
--- a/arch/arm/boot/dts/rk3066a-marsboard.dts
+++ b/arch/arm/boot/dts/rk3066a-marsboard.dts
@@ -52,6 +52,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: sdmmc-regulator {
                compatible = "regulator-fixed";
                regulator-name = "sdmmc-supply";
@@ -194,6 +206,10 @@
        };
 };
 
+&pwm3 {
+       status = "okay";
+};
+
 &uart0 {
        status = "okay";
 };