Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / armada-370-mirabox.dts

diff --git a/arch/arm/boot/dts/armada-370-mirabox.dts b/arch/arm/boot/dts/armada-370-mirabox.dts
index 2b6d24e0d1e8a2a33a879bea7689514f840f95dc..e1b0eb6b091ffa04814e41401d57e3c65d7e961a 100644 (file)
--- a/arch/arm/boot/dts/armada-370-mirabox.dts
+++ b/arch/arm/boot/dts/armada-370-mirabox.dts
@@ -54,18 +54,6 @@
                                status = "okay";
                        };
 
-                       pinctrl {
-                               pwr_led_pin: pwr-led-pin {
-                                       marvell,pins = "mpp63";
-                                       marvell,function = "gpo";
-                               };
-
-                               stat_led_pins: stat-led-pins {
-                                       marvell,pins = "mpp64", "mpp65";
-                                       marvell,function = "gpio";
-                               };
-                       };
-
                        gpio_leds {
                                compatible = "gpio-leds";
                                pinctrl-names = "default";
@@ -169,3 +157,16 @@
                };
        };
 };
+
+&pinctrl {
+       pwr_led_pin: pwr-led-pin {
+               marvell,pins = "mpp63";
+               marvell,function = "gpo";
+       };
+
+       stat_led_pins: stat-led-pins {
+               marvell,pins = "mpp64", "mpp65";
+               marvell,function = "gpio";
+       };
+};
+