diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2013-11-17 11:33:19 +0100 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2013-11-26 21:01:57 +0100 |
| commit | 2f4b84f8ecd2e4680a2e205e78d5ccdf56bd87d7 (patch) | |
| tree | c67efd6c950b3db8c27ade613176ac6f719e6abe /arch/arm | |
| parent | fd8f9eac9dca386f54dfeff94afd03c84ec72ca1 (diff) | |
| download | talos-obmc-linux-2f4b84f8ecd2e4680a2e205e78d5ccdf56bd87d7.tar.gz talos-obmc-linux-2f4b84f8ecd2e4680a2e205e78d5ccdf56bd87d7.zip | |
ARM: ux500: move snowball LED pin control to device tree
This moves the Snowball LED pin config to the device tree.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/boot/dts/ste-snowball.dts | 11 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/board-mop500-pins.c | 2 |
2 files changed, 11 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/ste-snowball.dts b/arch/arm/boot/dts/ste-snowball.dts index 744ab956059a..605188ba30cd 100644 --- a/arch/arm/boot/dts/ste-snowball.dts +++ b/arch/arm/boot/dts/ste-snowball.dts @@ -76,6 +76,8 @@ leds { compatible = "gpio-leds"; + pinctrl-names = "default"; + pinctrl-0 = <&gpioled_snowball_mode>; used-led { label = "user_led"; gpios = <&gpio4 14 0x4>; @@ -414,6 +416,15 @@ }; }; + gpio_led { + gpioled_snowball_mode: gpioled_default { + snowball_cfg1 { + ste,pins = "GPIO142_C11"; + ste,config = <&gpio_out_hi>; + }; + + }; + }; }; mcde@a0350000 { diff --git a/arch/arm/mach-ux500/board-mop500-pins.c b/arch/arm/mach-ux500/board-mop500-pins.c index 0e5d2684bc9a..aae9cfcfd56a 100644 --- a/arch/arm/mach-ux500/board-mop500-pins.c +++ b/arch/arm/mach-ux500/board-mop500-pins.c @@ -297,8 +297,6 @@ static struct pinctrl_map __initdata ab8505_pinmap[] = { }; static struct pinctrl_map __initdata snowball_pinmap[] = { - /* User LED */ - DB8500_PIN_HOG("GPIO142_C11", gpio_out_hi), /* Accelerometer/Magnetometer */ DB8500_PIN_HOG("GPIO163_C20", gpio_in_pu), /* ACCEL_IRQ1 */ DB8500_PIN_HOG("GPIO164_B21", gpio_in_pu), /* ACCEL_IRQ2 */ |
