Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

[linux-2.6-microblaze.git] / arch / arm / boot / dts / imx6sx-softing-vining-2000.dts

diff --git a/arch/arm/boot/dts/imx6sx-softing-vining-2000.dts b/arch/arm/boot/dts/imx6sx-softing-vining-2000.dts
index 5547916..b9a1401 100644 (file)
--- a/arch/arm/boot/dts/imx6sx-softing-vining-2000.dts
+++ b/arch/arm/boot/dts/imx6sx-softing-vining-2000.dts
@@ -40,22 +40,22 @@
                regulator-max-microvolt = <3300000>;
        };
 
-       pwmleds {
+       led-controller {
                compatible = "pwm-leds";
 
-               red {
+               led-1 {
                        label = "red";
                        max-brightness = <255>;
                        pwms = <&pwm6 0 50000>;
                };
 
-               green {
+               led-2 {
                        label = "green";
                        max-brightness = <255>;
                        pwms = <&pwm2 0 50000>;
                };
 
-               blue {
+               led-3 {
                        label = "blue";
                        max-brightness = <255>;
                        pwms = <&pwm1 0 50000>;