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 / imx6qdl-cubox-i.dtsi

diff --git a/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi b/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi
index 6704279..1e530d8 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi
@@ -55,12 +55,12 @@
                pinctrl-0 = <&pinctrl_cubox_i_ir>;
        };
 
-       pwmleds {
+       led-controller {
                compatible = "pwm-leds";
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_cubox_i_pwm1>;
 
-               front {
+               led-1 {
                        active-low;
                        label = "imx6:red:front";
                        max-brightness = <248>;