Merge tag 'openrisc-for-linus' of git://github.com/openrisc/linux

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / gemini-wbd111.dts

diff --git a/arch/arm/boot/dts/gemini-wbd111.dts b/arch/arm/boot/dts/gemini-wbd111.dts
index 63b756e3bf5a2fcdd42eb8a3fe6760e36878be85..38a49e7504785077bd809a078d082fd51a2f4dbf 100644 (file)
--- a/arch/arm/boot/dts/gemini-wbd111.dts
+++ b/arch/arm/boot/dts/gemini-wbd111.dts
@@ -33,6 +33,7 @@
                        wakeup-source;
                        linux,code = <KEY_SETUP>;
                        label = "reset";
+                       /* Conflict with ICE */
                        gpios = <&gpio0 5 GPIO_ACTIVE_LOW>;
                };
        };
@@ -42,21 +43,25 @@
 
                led@1 {
                        label = "wbd111:red:L3";
+                       /* Conflict with TVC and extended parallel flash */
                        gpios = <&gpio0 1 GPIO_ACTIVE_HIGH>;
                        default-state = "off";
                };
                led@2 {
                        label = "wbd111:green:L4";
+                       /* Conflict with TVC and extended parallel flash */
                        gpios = <&gpio0 2 GPIO_ACTIVE_HIGH>;
                        default-state = "off";
                };
                led@3 {
                        label = "wbd111:red:L4";
+                       /* Conflict with TVC and extended parallel flash */
                        gpios = <&gpio0 3 GPIO_ACTIVE_HIGH>;
                        default-state = "off";
                };
                led@5 {
                        label = "wbd111:green:L3";
+                       /* Conflict with TVC and extended parallel flash */
                        gpios = <&gpio0 5 GPIO_ACTIVE_HIGH>;
                        default-state = "on";
                        linux,default-trigger = "heartbeat";
@@ -98,5 +103,26 @@
                                read-only;
                        };
                };
+
+               syscon: syscon@40000000 {
+                       pinctrl {
+                               /*
+                                * gpio0agrp cover line 0-4
+                                * gpio0bgrp cover line 5
+                                */
+                               gpio0_default_pins: pinctrl-gpio0 {
+                                       mux {
+                                               function = "gpio0";
+                                               groups = "gpio0agrp",
+                                               "gpio0bgrp";
+                                       };
+                               };
+                       };
+               };
+
+               gpio0: gpio@4d000000 {
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&gpio0_default_pins>;
+               };
        };
 };