ARM: dts: bcm283x: Move ACT LED into separate dtsi

[linux-2.6-microblaze.git] / arch / arm / boot / dts / bcm2836-rpi-2-b.dts

diff --git a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
index 3635502..6068ec3 100644 (file)
--- a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
+++ b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
@@ -2,6 +2,7 @@
 /dts-v1/;
 #include "bcm2836.dtsi"
 #include "bcm2836-rpi.dtsi"
+#include "bcm283x-rpi-led-deprecated.dtsi"
 #include "bcm283x-rpi-smsc9514.dtsi"
 #include "bcm283x-rpi-usb-host.dtsi"
 
@@ -13,19 +14,6 @@
                device_type = "memory";
                reg = <0 0x40000000>;
        };
-
-       leds {
-               led-act {
-                       gpios = <&gpio 47 GPIO_ACTIVE_HIGH>;
-               };
-
-               led-pwr {
-                       label = "PWR";
-                       gpios = <&gpio 35 GPIO_ACTIVE_HIGH>;
-                       default-state = "keep";
-                       linux,default-trigger = "default-on";
-               };
-       };
 };
 
 &gpio {
@@ -109,6 +97,19 @@
        status = "okay";
 };
 
+&led_act {
+       gpios = <&gpio 47 GPIO_ACTIVE_HIGH>;
+};
+
+&leds {
+       led-pwr {
+               label = "PWR";
+               gpios = <&gpio 35 GPIO_ACTIVE_HIGH>;
+               default-state = "keep";
+               linux,default-trigger = "default-on";
+       };
+};
+
 &pwm {
        pinctrl-names = "default";
        pinctrl-0 = <&pwm0_gpio40 &pwm1_gpio45>;