git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion into fixes
[pandora-kernel.git]
/
arch
/
arm
/
mach-kirkwood
/
sheevaplug-setup.c
diff --git
a/arch/arm/mach-kirkwood/sheevaplug-setup.c
b/arch/arm/mach-kirkwood/sheevaplug-setup.c
index
d2eec35
..
17de0bf
100644
(file)
--- a/
arch/arm/mach-kirkwood/sheevaplug-setup.c
+++ b/
arch/arm/mach-kirkwood/sheevaplug-setup.c
@@
-57,6
+57,12
@@
static struct mvsdio_platform_data sheeva_esata_mvsdio_data = {
};
static struct gpio_led sheevaplug_led_pins[] = {
};
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",
{
.name = "plug:green:health",
.default_trigger = "default-on",
@@
-80,6
+86,7
@@
static struct platform_device sheevaplug_leds = {
static unsigned int sheevaplug_mpp_config[] __initdata = {
MPP29_GPIO, /* USB Power Enable */
static unsigned int sheevaplug_mpp_config[] __initdata = {
MPP29_GPIO, /* USB Power Enable */
+ MPP46_GPIO, /* LED Red */
MPP49_GPIO, /* LED */
0
};
MPP49_GPIO, /* LED */
0
};
@@
-134,6
+141,7
@@
MACHINE_START(SHEEVAPLUG, "Marvell SheevaPlug Reference Board")
.boot_params = 0x00000100,
.init_machine = sheevaplug_init,
.map_io = kirkwood_map_io,
.boot_params = 0x00000100,
.init_machine = sheevaplug_init,
.map_io = kirkwood_map_io,
+ .init_early = kirkwood_init_early,
.init_irq = kirkwood_init_irq,
.timer = &kirkwood_timer,
MACHINE_END
.init_irq = kirkwood_init_irq,
.timer = &kirkwood_timer,
MACHINE_END
@@
-144,6
+152,7
@@
MACHINE_START(ESATA_SHEEVAPLUG, "Marvell eSATA SheevaPlug Reference Board")
.boot_params = 0x00000100,
.init_machine = sheevaplug_init,
.map_io = kirkwood_map_io,
.boot_params = 0x00000100,
.init_machine = sheevaplug_init,
.map_io = kirkwood_map_io,
+ .init_early = kirkwood_init_early,
.init_irq = kirkwood_init_irq,
.timer = &kirkwood_timer,
MACHINE_END
.init_irq = kirkwood_init_irq,
.timer = &kirkwood_timer,
MACHINE_END