Commit faf76128 authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Jason Cooper

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: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: default avatarAndrew Lunn <andrew@lunn.ch>
Tested-By: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent c5a36c96
...@@ -18,18 +18,6 @@ chosen { ...@@ -18,18 +18,6 @@ chosen {
ocp@f1000000 { ocp@f1000000 {
pinctrl: pinctrl@10000 { pinctrl: pinctrl@10000 {
/*
* GPIO LED layout
*
* /-SYS_LED(2)
* |
* | /-DISK_LED
* | |
* | | /-WLAN_LED(2)
* | | |
* [SW] [*] [*] [*]
*/
/* /*
* Switch positions * Switch positions
* *
...@@ -41,19 +29,8 @@ pinctrl: pinctrl@10000 { ...@@ -41,19 +29,8 @@ pinctrl: pinctrl@10000 {
* | | | * | | |
* PS [L] [I] [R] LEDS * PS [L] [I] [R] LEDS
*/ */
pinctrl-0 = < &pmx_led_disk_yellow pinctrl-0 = <&pmx_sw_left &pmx_sw_right
&pmx_sata0_pwr_enable &pmx_sw_idle &pmx_sw_left2>;
&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-names = "default"; pinctrl-names = "default";
pmx_led_disk_yellow: pmx-led-disk-yellow { pmx_led_disk_yellow: pmx-led-disk-yellow {
...@@ -109,10 +86,14 @@ pmx_led_wifi_yellow: pmx-led-wifi-yellow { ...@@ -109,10 +86,14 @@ pmx_led_wifi_yellow: pmx-led-wifi-yellow {
serial@12000 { serial@12000 {
status = "ok"; status = "ok";
pinctrl-0 = <&pmx_uart0>;
pinctrl-names = "default";
}; };
nand@3000000 { nand@3000000 {
status = "okay"; status = "okay";
pinctrl-0 = <&pmx_nand>;
pinctrl-names = "default";
partition@0 { partition@0 {
label = "u-boot"; label = "u-boot";
...@@ -147,6 +128,8 @@ sata@80000 { ...@@ -147,6 +128,8 @@ sata@80000 {
i2c@11000 { i2c@11000 {
status = "ok"; status = "ok";
pinctrl-0 = <&pmx_twsi0>;
pinctrl-names = "default";
}; };
mvsdio@90000 { mvsdio@90000 {
...@@ -159,7 +142,23 @@ mvsdio@90000 { ...@@ -159,7 +142,23 @@ mvsdio@90000 {
}; };
gpio-leds { gpio-leds {
/*
* GPIO LED layout
*
* /-SYS_LED(2)
* |
* | /-DISK_LED
* | |
* | | /-WLAN_LED(2)
* | | |
* [SW] [*] [*] [*]
*/
compatible = "gpio-leds"; 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 { disk {
label = "topkick:yellow:disk"; label = "topkick:yellow:disk";
...@@ -188,6 +187,8 @@ regulators { ...@@ -188,6 +187,8 @@ regulators {
compatible = "simple-bus"; compatible = "simple-bus";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
pinctrl-0 = <&pmx_sata0_pwr_enable>;
pinctrl-names = "default";
sata0_power: regulator@1 { sata0_power: regulator@1 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment