summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/kirkwood-cloudbox.dts
diff options
context:
space:
mode:
authorThomas Petazzoni2013-05-24 11:44:38 +0200
committerJason Cooper2013-05-27 17:30:54 +0200
commit2dd432e4333b28aa4a08c8bd6c2eeb88d2dd71a0 (patch)
treebc44f1c5b9e1c98ccb4ab2b67000acdfc17ba6b1 /arch/arm/boot/dts/kirkwood-cloudbox.dts
parentarm: mvebu: enable two USB interfaces on the Armada XP GP board (diff)
downloadkernel-qcow2-linux-2dd432e4333b28aa4a08c8bd6c2eeb88d2dd71a0.tar.gz
kernel-qcow2-linux-2dd432e4333b28aa4a08c8bd6c2eeb88d2dd71a0.tar.xz
kernel-qcow2-linux-2dd432e4333b28aa4a08c8bd6c2eeb88d2dd71a0.zip
arm: kirkwood: cloudbox: 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>
Diffstat (limited to 'arch/arm/boot/dts/kirkwood-cloudbox.dts')
-rw-r--r--arch/arm/boot/dts/kirkwood-cloudbox.dts10
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/kirkwood-cloudbox.dts b/arch/arm/boot/dts/kirkwood-cloudbox.dts
index 5f21d4e427b0..00c48d26de68 100644
--- a/arch/arm/boot/dts/kirkwood-cloudbox.dts
+++ b/arch/arm/boot/dts/kirkwood-cloudbox.dts
@@ -18,10 +18,6 @@
ocp@f1000000 {
pinctrl: pinctrl@10000 {
- pinctrl-0 = < &pmx_spi &pmx_uart0
- &pmx_cloudbox_sata0 >;
- pinctrl-names = "default";
-
pmx_cloudbox_sata0: pmx-cloudbox-sata0 {
marvell,pins = "mpp15";
marvell,function = "sata0";
@@ -29,16 +25,22 @@
};
serial@12000 {
+ pinctrl-0 = <&pmx_uart0>;
+ pinctrl-names = "default";
clock-frequency = <166666667>;
status = "okay";
};
sata@80000 {
+ pinctrl-0 = <&pmx_cloudbox_sata0>;
+ pinctrl-names = "default";
status = "okay";
nr-ports = <1>;
};
spi@10600 {
+ pinctrl-0 = <&pmx_spi>;
+ pinctrl-names = "default";
status = "okay";
flash@0 {