diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-28 19:57:19 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-28 19:57:19 +0200 |
| commit | 255bae73b214f143a3c7cc74d4792eb166a10d46 (patch) | |
| tree | d1300649335dce44b038fc8d43f4510eb487405b /arch/arm/mach-kirkwood | |
| parent | ARM: 6835/1: perf: ensure overflows aren't missed due to IRQ latency (diff) | |
| parent | Fix the broken build for Marvell Dove platform. (diff) | |
| download | linux-255bae73b214f143a3c7cc74d4792eb166a10d46.tar.xz linux-255bae73b214f143a3c7cc74d4792eb166a10d46.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion into fixes
Diffstat (limited to 'arch/arm/mach-kirkwood')
| -rw-r--r-- | arch/arm/mach-kirkwood/sheevaplug-setup.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-kirkwood/sheevaplug-setup.c b/arch/arm/mach-kirkwood/sheevaplug-setup.c index 0a95063f6d32..17de0bf53c08 100644 --- a/arch/arm/mach-kirkwood/sheevaplug-setup.c +++ b/arch/arm/mach-kirkwood/sheevaplug-setup.c @@ -58,6 +58,12 @@ static struct mvsdio_platform_data sheeva_esata_mvsdio_data = { static struct gpio_led sheevaplug_led_pins[] = { { + .name = "plug:red:misc", + .default_trigger = "none", + .gpio = 46, + .active_low = 1, + }, + { .name = "plug:green:health", .default_trigger = "default-on", .gpio = 49, @@ -80,6 +86,7 @@ static struct platform_device sheevaplug_leds = { static unsigned int sheevaplug_mpp_config[] __initdata = { MPP29_GPIO, /* USB Power Enable */ + MPP46_GPIO, /* LED Red */ MPP49_GPIO, /* LED */ 0 }; |