diff options
-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 @@ | |||
76 | 76 | ||
77 | leds { | 77 | leds { |
78 | compatible = "gpio-leds"; | 78 | compatible = "gpio-leds"; |
79 | pinctrl-names = "default"; | ||
80 | pinctrl-0 = <&gpioled_snowball_mode>; | ||
79 | used-led { | 81 | used-led { |
80 | label = "user_led"; | 82 | label = "user_led"; |
81 | gpios = <&gpio4 14 0x4>; | 83 | gpios = <&gpio4 14 0x4>; |
@@ -414,6 +416,15 @@ | |||
414 | 416 | ||
415 | }; | 417 | }; |
416 | }; | 418 | }; |
419 | gpio_led { | ||
420 | gpioled_snowball_mode: gpioled_default { | ||
421 | snowball_cfg1 { | ||
422 | ste,pins = "GPIO142_C11"; | ||
423 | ste,config = <&gpio_out_hi>; | ||
424 | }; | ||
425 | |||
426 | }; | ||
427 | }; | ||
417 | }; | 428 | }; |
418 | 429 | ||
419 | mcde@a0350000 { | 430 | 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[] = { | |||
297 | }; | 297 | }; |
298 | 298 | ||
299 | static struct pinctrl_map __initdata snowball_pinmap[] = { | 299 | static struct pinctrl_map __initdata snowball_pinmap[] = { |
300 | /* User LED */ | ||
301 | DB8500_PIN_HOG("GPIO142_C11", gpio_out_hi), | ||
302 | /* Accelerometer/Magnetometer */ | 300 | /* Accelerometer/Magnetometer */ |
303 | DB8500_PIN_HOG("GPIO163_C20", gpio_in_pu), /* ACCEL_IRQ1 */ | 301 | DB8500_PIN_HOG("GPIO163_C20", gpio_in_pu), /* ACCEL_IRQ1 */ |
304 | DB8500_PIN_HOG("GPIO164_B21", gpio_in_pu), /* ACCEL_IRQ2 */ | 302 | DB8500_PIN_HOG("GPIO164_B21", gpio_in_pu), /* ACCEL_IRQ2 */ |