aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorRicardo Salveti de Araujo <ricardo.salveti@linaro.org>2011-09-23 13:31:22 -0400
committerPaolo Pisati <paolo.pisati@canonical.com>2012-08-17 04:19:22 -0400
commit23229f1da45ffb4814360b2572800018350c2056 (patch)
tree2f54de35b39f36e1f963d195e21803d587ec5669 /arch/arm
parent5605a0a25b20990060f303858ad419d89277cc5f (diff)
OMAP4: Pandaboard: Fixing Leds for 4460
Signed-off-by: Ricardo Salveti de Araujo <ricardo.salveti@linaro.org>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-omap2/board-omap4panda.c17
1 files changed, 14 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c
index 6ec17a774d0..097b0d3a354 100644
--- a/arch/arm/mach-omap2/board-omap4panda.c
+++ b/arch/arm/mach-omap2/board-omap4panda.c
@@ -100,12 +100,10 @@ static struct gpio_led gpio_leds[] = {
100 { 100 {
101 .name = "pandaboard::status1", 101 .name = "pandaboard::status1",
102 .default_trigger = "heartbeat", 102 .default_trigger = "heartbeat",
103 .gpio = 7,
104 }, 103 },
105 { 104 {
106 .name = "pandaboard::status2", 105 .name = "pandaboard::status2",
107 .default_trigger = "mmc0", 106 .default_trigger = "mmc0",
108 .gpio = 8,
109 }, 107 },
110}; 108};
111 109
@@ -143,8 +141,20 @@ static struct platform_device omap4panda_hdmi_audio_device = {
143 .resource = omap4panda_hdmi_resources, 141 .resource = omap4panda_hdmi_resources,
144}; 142};
145 143
144static void __init panda_leds_init(void)
145{
146 if (cpu_is_omap443x()) {
147 gpio_leds[0].gpio = 7;
148 gpio_leds[1].gpio = 8;
149 } else {
150 gpio_leds[0].gpio = 110;
151 gpio_leds[1].gpio = 8;
152 }
153
154 platform_device_register(&leds_gpio);
155}
156
146static struct platform_device *panda_devices[] __initdata = { 157static struct platform_device *panda_devices[] __initdata = {
147 &leds_gpio,
148 &wl1271_device, 158 &wl1271_device,
149 &btwilink_device, 159 &btwilink_device,
150 &omap4panda_hdmi_audio_device, 160 &omap4panda_hdmi_audio_device,
@@ -727,6 +737,7 @@ static void __init omap4_panda_init(void)
727 omap4_panda_i2c_init(); 737 omap4_panda_i2c_init();
728 738
729 platform_add_devices(panda_devices, ARRAY_SIZE(panda_devices)); 739 platform_add_devices(panda_devices, ARRAY_SIZE(panda_devices));
740 panda_leds_init();
730 platform_device_register(&omap_vwlan_device); 741 platform_device_register(&omap_vwlan_device);
731 board_serial_init(); 742 board_serial_init();
732 omap4_twl6030_hsmmc_init(mmc); 743 omap4_twl6030_hsmmc_init(mmc);