Merge tag 'exynos-dt-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux...

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / kirkwood-guruplug-server-plus.dts

diff --git a/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts b/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts
index 44fd97dfc1f36b58205e5976e33d1f160ddba95e..1e642f39b1541f9984495f8caa92e74e1c637786 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts
+++ b/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts
@@ -18,11 +18,6 @@
 
        ocp@f1000000 {
                pinctrl: pinctrl@10000 {
-
-                       pinctrl-0 = < &pmx_led_health_r &pmx_led_health_g
-                                     &pmx_led_wmode_r &pmx_led_wmode_g >;
-                       pinctrl-names = "default";
-
                        pmx_led_health_r: pmx-led-health-r {
                                marvell,pins = "mpp46";
                                marvell,function = "gpio";
@@ -72,11 +67,16 @@
 
                mvsdio@90000 {
                        status = "okay";
+                       /* No CD or WP GPIOs */
+                       broken-cd;
                };
        };
 
        gpio-leds {
                compatible = "gpio-leds";
+               pinctrl-0 = < &pmx_led_health_r &pmx_led_health_g
+                             &pmx_led_wmode_r &pmx_led_wmode_g >;
+               pinctrl-names = "default";
 
                health-r {
                        label = "guruplug:red:health";