summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/kirkwood-sheevaplug.dts
diff options
context:
space:
mode:
authorSimon Baatz <gmbnomis@gmail.com>2013-06-05 01:32:32 +0400
committerJason Cooper <jason@lakedaemon.net>2013-06-05 19:01:54 +0400
commita649277e79a5c28a94d258b5579b62daaf5ffd6d (patch)
treed30c884055b81e7029e693ccb1127d2fa4ac0e81 /arch/arm/boot/dts/kirkwood-sheevaplug.dts
parentbe5a9389e82054ebd8c15b3d6354ec5c1568cb7c (diff)
downloadlinux-a649277e79a5c28a94d258b5579b62daaf5ffd6d.tar.xz
arm: kirkwood: sheevaplug: 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. Signed-off-by: Simon Baatz <gmbnomis@gmail.com> Reviewed-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'arch/arm/boot/dts/kirkwood-sheevaplug.dts')
-rw-r--r--arch/arm/boot/dts/kirkwood-sheevaplug.dts18
1 files changed, 8 insertions, 10 deletions
diff --git a/arch/arm/boot/dts/kirkwood-sheevaplug.dts b/arch/arm/boot/dts/kirkwood-sheevaplug.dts
index f7684066f0ce..bf1dff251432 100644
--- a/arch/arm/boot/dts/kirkwood-sheevaplug.dts
+++ b/arch/arm/boot/dts/kirkwood-sheevaplug.dts
@@ -15,16 +15,6 @@
compatible = "globalscale,sheevaplug", "marvell,kirkwood-88f6281", "marvell,kirkwood";
ocp@f1000000 {
- pinctrl: pinctrl@10000 {
-
- pinctrl-0 = < &pmx_nand &pmx_uart0
- &pmx_usb_power_enable
- &pmx_led_red
- &pmx_led_blue>;
- pinctrl-names = "default";
-
- };
-
mvsdio@90000 {
pinctrl-0 = <&pmx_sdio>;
pinctrl-names = "default";
@@ -36,6 +26,14 @@
gpio-leds {
compatible = "gpio-leds";
+ pinctrl-0 = <&pmx_led_blue &pmx_led_red>;
+ pinctrl-names = "default";
+
+ health {
+ label = "sheevaplug:blue:health";
+ gpios = <&gpio1 17 1>;
+ linux,default-trigger = "default-on";
+ };
misc {
label = "sheevaplug:red:misc";