Merge tag 'powerpc-3.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / rk3188-radxarock.dts

diff --git a/arch/arm/boot/dts/rk3188-radxarock.dts b/arch/arm/boot/dts/rk3188-radxarock.dts
index 15910c9ddbc7c6cb33c30904a4107b387693e132..9a09579b8309c39fbb767c7798adee8f56062cea 100644 (file)
--- a/arch/arm/boot/dts/rk3188-radxarock.dts
+++ b/arch/arm/boot/dts/rk3188-radxarock.dts
@@ -43,16 +43,19 @@
                compatible = "gpio-leds";
 
                green {
+                       label = "rock:green:user1";
                        gpios = <&gpio0 12 GPIO_ACTIVE_LOW>;
                        default-state = "off";
                };
 
-               yellow {
+               blue {
+                       label = "rock:blue:user2";
                        gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
                        default-state = "off";
                };
 
                sleep {
+                       label = "rock:red:power";
                        gpios = <&gpio0 15 0>;
                        default-state = "off";
                };
@@ -118,6 +121,10 @@
        };
 };
 
+&cpu0 {
+       cpu0-supply = <&vdd_arm>;
+};
+
 &i2c1 {
        status = "okay";
        clock-frequency = <400000>;
@@ -159,7 +166,7 @@
                        vdd_arm: REG3 {
                                regulator-name = "VDD_ARM";
                                regulator-min-microvolt = <875000>;
-                               regulator-max-microvolt = <1300000>;
+                               regulator-max-microvolt = <1350000>;
                                regulator-always-on;
                        };
 
@@ -239,6 +246,18 @@
        disable-wp;
 };
 
+&pwm1 {
+       status = "okay";
+};
+
+&pwm2 {
+       status = "okay";
+};
+
+&pwm3 {
+       status = "okay";
+};
+
 &pinctrl {
        pcfg_output_low: pcfg-output-low {
                output-low;