arm: kirkwood: topkick: 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>
Tested-By: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>

1 files changed, 26 insertions, 25 deletions

diff --git a/arch/arm/boot/dts/kirkwood-topkick.dts b/arch/arm/boot/dts/kirkwood-topkick.dts
index 7dc14f4f5270..f2052d7bc10f 100644
--- a/arch/arm/boot/dts/kirkwood-topkick.dts
+++ b/arch/arm/boot/dts/kirkwood-topkick.dts
@@ -19,18 +19,6 @@
         ocp@f1000000 {
                 pinctrl: pinctrl@10000 {
                         /*
-                         * GPIO LED layout
-                         *
-                         *       /-SYS_LED(2)
-                         *       |
-                         *       |   /-DISK_LED
-                         *       |   |
-                         *       |   |   /-WLAN_LED(2)
-                         *       |   |   |
-                         * [SW] [*] [*] [*]
-                         */
-
-                        /*
                          * Switch positions
                          *
                          *     /-SW_LEFT(2)
@@ -41,19 +29,8 @@
                          *     |   |   |
                          * PS [L] [I] [R] LEDS
                          */
-                        pinctrl-0 = < &pmx_led_disk_yellow
-                                      &pmx_sata0_pwr_enable
-                                      &pmx_led_sys_red
-                                      &pmx_led_sys_blue
-                                      &pmx_led_wifi_green
-                                      &pmx_sw_left
-                                      &pmx_sw_right
-                                      &pmx_sw_idle
-                                      &pmx_sw_left2
-                                      &pmx_led_wifi_yellow
-                                      &pmx_uart0
-                                      &pmx_nand
-                                      &pmx_twsi0 >;
+                        pinctrl-0 = <&pmx_sw_left &pmx_sw_right
+                                     &pmx_sw_idle &pmx_sw_left2>;
                         pinctrl-names = "default";
 
                         pmx_led_disk_yellow: pmx-led-disk-yellow {
@@ -109,10 +86,14 @@
 
                 serial@12000 {
                         status = "ok";
+                        pinctrl-0 = <&pmx_uart0>;
+                        pinctrl-names = "default";
                 };
 
                 nand@3000000 {
                         status = "okay";
+                        pinctrl-0 = <&pmx_nand>;
+                        pinctrl-names = "default";
 
                         partition@0 {
                                 label = "u-boot";
@@ -147,6 +128,8 @@
 
                 i2c@11000 {
                         status = "ok";
+                        pinctrl-0 = <&pmx_twsi0>;
+                        pinctrl-names = "default";
                 };
 
                 mvsdio@90000 {
@@ -159,7 +142,23 @@
         };
 
         gpio-leds {
+                /*
+                 * GPIO LED layout
+                 *
+                 *       /-SYS_LED(2)
+                 *       |
+                 *       |   /-DISK_LED
+                 *       |   |
+                 *       |   |   /-WLAN_LED(2)
+                 *       |   |   |
+                 * [SW] [*] [*] [*]
+                 */
+
                 compatible = "gpio-leds";
+                pinctrl-0 = <&pmx_led_disk_yellow &pmx_led_sys_red
+                             &pmx_led_sys_blue &pmx_led_wifi_green
+                             &pmx_led_wifi_yellow>;
+                pinctrl-names = "default";
 
                 disk {
                         label = "topkick:yellow:disk";
@@ -188,6 +187,8 @@
                 compatible = "simple-bus";
                 #address-cells = <1>;
                 #size-cells = <0>;
+                pinctrl-0 = <&pmx_sata0_pwr_enable>;
+                pinctrl-names = "default";
 
                 sata0_power: regulator@1 {
                         compatible = "regulator-fixed";