Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livep...

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / at91-kizbox.dts

diff --git a/arch/arm/boot/dts/at91-kizbox.dts b/arch/arm/boot/dts/at91-kizbox.dts
index b567b5ff908fa8d94619d30e5524b442234ffd71..bf18ece0c02708c4d7b99ac543e2bc9045daf63b 100644 (file)
--- a/arch/arm/boot/dts/at91-kizbox.dts
+++ b/arch/arm/boot/dts/at91-kizbox.dts
@@ -16,7 +16,7 @@
 
        chosen {
                bootargs = "ubi.mtd=ubi";
-               linux,stdout-path = &dbgu;
+               stdout-path = &dbgu;
        };
 
        memory {
@@ -126,7 +126,7 @@
 
                network_red {
                        label = "pwm:red:network";
-                       pwms = <&tcb_pwm 3 10000000 PWM_POLARITY_INVERTED>;
+                       pwms = <&tcb_pwm 4 10000000 PWM_POLARITY_INVERTED>;
                        max-brightness = <255>;
                        linux,default-trigger = "default-on";
                };