aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2013-05-24 05:44:53 -0400
committerJason Cooper <jason@lakedaemon.net>2013-05-27 11:33:22 -0400
commit7a2c9bb57dc7298d3e545a8ca487b77d8ef3cc24 (patch)
treef44effb44169300b4d41e28a6c0bb10b00157782
parent3d98a7884bff06fd34079461771f4630188e57a3 (diff)
arm: kirkwood: nsa310: move pinmux configs to the right devices
When the pinmux mechanism was added in Kirkwood, the device driver core was not yet providing the possibility of attaching pinmux configurations to all devices, drivers had to do it explicitly, and not all drivers were doing this. Now that the driver core does that in a generic way, it makes sense to attach the pinmux configuration to their corresponding devices. This allows the pinctrl subsystem to show in debugfs to which device is related which pins, for example: pin 41 (PIN41): gpio-leds.1 mvebu-gpio:41 function gpio group mpp41 pin 42 (PIN42): gpio-leds.1 mvebu-gpio:42 function gpio group mpp42 pin 43 (PIN43): gpio-leds.1 mvebu-gpio:43 function gpio group mpp43 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
-rw-r--r--arch/arm/boot/dts/kirkwood-nsa310.dts29
1 files changed, 13 insertions, 16 deletions
diff --git a/arch/arm/boot/dts/kirkwood-nsa310.dts b/arch/arm/boot/dts/kirkwood-nsa310.dts
index a7412b937a8a..79391ca5d1c3 100644
--- a/arch/arm/boot/dts/kirkwood-nsa310.dts
+++ b/arch/arm/boot/dts/kirkwood-nsa310.dts
@@ -17,22 +17,7 @@
17 17
18 ocp@f1000000 { 18 ocp@f1000000 {
19 pinctrl: pinctrl@10000 { 19 pinctrl: pinctrl@10000 {
20 pinctrl-0 = < &pmx_led_esata_green 20 pinctrl-0 = <&pmx_unknown>;
21 &pmx_led_esata_red
22 &pmx_led_usb_green
23 &pmx_led_usb_red
24 &pmx_usb_power_off
25 &pmx_led_sys_green
26 &pmx_led_sys_red
27 &pmx_btn_reset
28 &pmx_btn_copy
29 &pmx_led_copy_green
30 &pmx_led_copy_red
31 &pmx_led_hdd_green
32 &pmx_led_hdd_red
33 &pmx_unknown
34 &pmx_btn_power
35 &pmx_pwr_off >;
36 pinctrl-names = "default"; 21 pinctrl-names = "default";
37 22
38 pmx_led_esata_green: pmx-led-esata-green { 23 pmx_led_esata_green: pmx-led-esata-green {
@@ -182,6 +167,8 @@
182 compatible = "gpio-keys"; 167 compatible = "gpio-keys";
183 #address-cells = <1>; 168 #address-cells = <1>;
184 #size-cells = <0>; 169 #size-cells = <0>;
170 pinctrl-0 = <&pmx_btn_reset &pmx_btn_copy &pmx_btn_power>;
171 pinctrl-names = "default";
185 172
186 button@1 { 173 button@1 {
187 label = "Power Button"; 174 label = "Power Button";
@@ -202,6 +189,12 @@
202 189
203 gpio-leds { 190 gpio-leds {
204 compatible = "gpio-leds"; 191 compatible = "gpio-leds";
192 pinctrl-0 = <&pmx_led_esata_green &pmx_led_esata_red
193 &pmx_led_usb_green &pmx_led_usb_red
194 &pmx_led_sys_green &pmx_led_sys_red
195 &pmx_led_copy_green &pmx_led_copy_red
196 &pmx_led_hdd_green &pmx_led_hdd_red>;
197 pinctrl-names = "default";
205 198
206 green-sys { 199 green-sys {
207 label = "nsa310:green:sys"; 200 label = "nsa310:green:sys";
@@ -247,6 +240,8 @@
247 240
248 gpio_poweroff { 241 gpio_poweroff {
249 compatible = "gpio-poweroff"; 242 compatible = "gpio-poweroff";
243 pinctrl-0 = <&pmx_pwr_off>;
244 pinctrl-names = "default";
250 gpios = <&gpio1 16 0>; 245 gpios = <&gpio1 16 0>;
251 }; 246 };
252 247
@@ -254,6 +249,8 @@
254 compatible = "simple-bus"; 249 compatible = "simple-bus";
255 #address-cells = <1>; 250 #address-cells = <1>;
256 #size-cells = <0>; 251 #size-cells = <0>;
252 pinctrl-0 = <&pmx_usb_power_off>;
253 pinctrl-names = "default";
257 254
258 usb0_power_off: regulator@1 { 255 usb0_power_off: regulator@1 {
259 compatible = "regulator-fixed"; 256 compatible = "regulator-fixed";