Now that the Amstrad Delta on-board latches have been converted to GPIO
devices, use the generic driver to control on-board LEDs which hang off
those latches.
Depends on patch 2/10 "ARM: OMAP1: Convert Amstrad E3 latches to
basic_mmio_gpio".
Signed-off-by: Janusz Krzysztofik <jkrzyszt@xxxxxxxxxxxx>
---
arch/arm/mach-omap1/Kconfig | 1 +
arch/arm/mach-omap1/board-ams-delta.c | 87 +++++++++++---------
arch/arm/plat-omap/include/plat/board-ams-delta.h | 19 -----
3 files changed, 49 insertions(+), 58 deletions(-)
diff --git a/arch/arm/mach-omap1/Kconfig b/arch/arm/mach-omap1/Kconfig
index 1b5f283..f362f83 100644
--- a/arch/arm/mach-omap1/Kconfig
+++ b/arch/arm/mach-omap1/Kconfig
@@ -155,6 +155,7 @@ config MACH_AMS_DELTA
bool "Amstrad E3 (Delta)"
depends on ARCH_OMAP1 && ARCH_OMAP15XX
select GPIO_GENERIC_PLATFORM
+ select LEDS_GPIO_REGISTER
select FIQ
help
Support for the Amstrad E3 (codename Delta) videophone. Say Y here
diff --git a/arch/arm/mach-omap1/board-ams-delta.c b/arch/arm/mach-omap1/board-ams-delta.c
index d88419e..bdf7399 100644
--- a/arch/arm/mach-omap1/board-ams-delta.c
+++ b/arch/arm/mach-omap1/board-ams-delta.c
@@ -164,18 +164,21 @@ static struct omap_board_config_kernel ams_delta_config[] __initdata = {
{ OMAP_TAG_LCD, &ams_delta_lcd_config },
};
+#define _LATCH1_GPIO_BASE 232
+#define _LATCH1_NGPIO 8
+
static struct resource _latch1_resources[] __initconst = {
[0] = {
.name = "dat",
.start = _LATCH1_PHYS,
- .end = _LATCH1_PHYS + ((AMS_DELTA_LATCH1_NGPIO - 1) / 8),
+ .end = _LATCH1_PHYS + ((_LATCH1_NGPIO - 1) / 8),
.flags = IORESOURCE_MEM,
},
};
static struct bgpio_pdata _latch1_pdata __initconst = {
- .base = AMS_DELTA_LATCH1_GPIO_BASE,
- .ngpio = AMS_DELTA_LATCH1_NGPIO,
+ .base = _LATCH1_GPIO_BASE,
+ .ngpio = _LATCH1_NGPIO,
};
static struct platform_device _latch1_device = {
@@ -219,42 +222,12 @@ static struct platform_device *_latch_devices[] __initconst = {
static struct gpio _latch_gpios[] __initconst = {
{
- .gpio = AMS_DELTA_GPIO_PIN_LED_CAMERA,
- .flags = GPIOF_OUT_INIT_LOW,
- .label = "led_camera",
- },
- {
- .gpio = AMS_DELTA_GPIO_PIN_LED_ADVERT,
- .flags = GPIOF_OUT_INIT_LOW,
- .label = "led_advert",
- },
- {
- .gpio = AMS_DELTA_GPIO_PIN_LED_EMAIL,
- .flags = GPIOF_OUT_INIT_LOW,
- .label = "led_email",
- },
- {
- .gpio = AMS_DELTA_GPIO_PIN_LED_HANDSFREE,
- .flags = GPIOF_OUT_INIT_LOW,
- .label = "led_handsfree",
- },
- {
- .gpio = AMS_DELTA_GPIO_PIN_LED_VOICEMAIL,
- .flags = GPIOF_OUT_INIT_LOW,
- .label = "led_voicemail",
- },
- {
- .gpio = AMS_DELTA_GPIO_PIN_LED_VOICE,
- .flags = GPIOF_OUT_INIT_LOW,
- .label = "led_voice",
- },
- {
- .gpio = AMS_DELTA_LATCH1_GPIO_BASE + 6,
+ .gpio = _LATCH1_GPIO_BASE + 6,
.flags = GPIOF_OUT_INIT_LOW,
.label = "dockit1",
},
{
- .gpio = AMS_DELTA_LATCH1_GPIO_BASE + 7,
+ .gpio = _LATCH1_GPIO_BASE + 7,
.flags = GPIOF_OUT_INIT_LOW,
.label = "dockit2",
},
@@ -404,9 +377,45 @@ static struct platform_device ams_delta_lcd_device = {
.id = -1,
};
-static struct platform_device ams_delta_led_device = {
- .name = "ams-delta-led",
- .id = -1
+static struct gpio_led _gpio_leds[] __initconst = {
+ {
+ .name = "camera",
+ .gpio = _LATCH1_GPIO_BASE + 0,
+ .default_state = LEDS_GPIO_DEFSTATE_OFF,
+#ifdef CONFIG_LEDS_TRIGGERS
+ .default_trigger = "ams_delta_camera",
+#endif
+ },
+ {
+ .name = "advert",
+ .gpio = _LATCH1_GPIO_BASE + 1,
+ .default_state = LEDS_GPIO_DEFSTATE_OFF,
+ },
+ {
+ .name = "email",
+ .gpio = _LATCH1_GPIO_BASE + 2,
+ .default_state = LEDS_GPIO_DEFSTATE_OFF,
+ },
+ {
+ .name = "handsfree",
+ .gpio = _LATCH1_GPIO_BASE + 3,
+ .default_state = LEDS_GPIO_DEFSTATE_OFF,
+ },
+ {
+ .name = "voicemail",
+ .gpio = _LATCH1_GPIO_BASE + 4,
+ .default_state = LEDS_GPIO_DEFSTATE_OFF,
+ },
+ {
+ .name = "voice",
+ .gpio = _LATCH1_GPIO_BASE + 5,
+ .default_state = LEDS_GPIO_DEFSTATE_OFF,
+ },
+};
+
+static struct gpio_led_platform_data _leds_pdata __initconst = {
+ .leds = _gpio_leds,
+ .num_leds = ARRAY_SIZE(_gpio_leds),
};
static struct i2c_board_info ams_delta_camera_board_info[] = {
@@ -458,7 +467,6 @@ static struct platform_device *ams_delta_devices[] __initdata = {
&ams_delta_nand_device,
&ams_delta_kp_device,
&ams_delta_lcd_device,
- &ams_delta_led_device,
&ams_delta_camera_device,
};
@@ -496,6 +504,7 @@ static void __init ams_delta_init(void)
led_trigger_register_simple("ams_delta_camera",
&ams_delta_camera_led_trigger);
#endif
+ gpio_led_register_device(-1, &_leds_pdata);
platform_add_devices(ams_delta_devices, ARRAY_SIZE(ams_delta_devices));
ams_delta_init_fiq();
diff --git a/arch/arm/plat-omap/include/plat/board-ams-delta.h b/arch/arm/plat-omap/include/plat/board-ams-delta.h
index 1b8e759..c096e14 100644
--- a/arch/arm/plat-omap/include/plat/board-ams-delta.h
+++ b/arch/arm/plat-omap/include/plat/board-ams-delta.h
@@ -28,13 +28,6 @@
#if defined (CONFIG_MACH_AMS_DELTA)
-#define AMS_DELTA_LATCH1_LED_CAMERA 0x01
-#define AMS_DELTA_LATCH1_LED_ADVERT 0x02
-#define AMS_DELTA_LATCH1_LED_EMAIL 0x04
-#define AMS_DELTA_LATCH1_LED_HANDSFREE 0x08
-#define AMS_DELTA_LATCH1_LED_VOICEMAIL 0x10
-#define AMS_DELTA_LATCH1_LED_VOICE 0x20
-
#define AMS_DELTA_LATCH2_LCD_VBLEN 0x0001
#define AMS_DELTA_LATCH2_LCD_NDISP 0x0002
#define AMS_DELTA_LATCH2_NAND_NCE 0x0004
@@ -59,13 +52,6 @@
#define AMS_DELTA_GPIO_PIN_CONFIG 11
#define AMS_DELTA_GPIO_PIN_NAND_RB 12
-#define AMS_DELTA_GPIO_PIN_LED_CAMERA 232
-#define AMS_DELTA_GPIO_PIN_LED_ADVERT 233
-#define AMS_DELTA_GPIO_PIN_LED_EMAIL 234
-#define AMS_DELTA_GPIO_PIN_LED_HANDSFREE 235
-#define AMS_DELTA_GPIO_PIN_LED_VOICEMAIL 236
-#define AMS_DELTA_GPIO_PIN_LED_VOICE 237
-
#define AMS_DELTA_GPIO_PIN_LCD_VBLEN 240
#define AMS_DELTA_GPIO_PIN_LCD_NDISP 241
#define AMS_DELTA_GPIO_PIN_NAND_NCE 242
@@ -81,17 +67,12 @@
#define AMS_DELTA_GPIO_PIN_MODEM_NRESET 252
#define AMS_DELTA_GPIO_PIN_MODEM_CODEC 253
-#define AMS_DELTA_LATCH1_GPIO_BASE AMS_DELTA_GPIO_PIN_LED_CAMERA
-#define AMS_DELTA_LATCH1_NGPIO 8
#define AMS_DELTA_LATCH2_GPIO_BASE AMS_DELTA_GPIO_PIN_LCD_VBLEN
#define AMS_DELTA_LATCH2_NGPIO 16
#ifndef __ASSEMBLY__
void ams_delta_latch_write(int base, int ngpio, u16 mask, u16 value);
#endif
-#define ams_delta_latch1_write(mask, value) \
- ams_delta_latch_write(AMS_DELTA_LATCH1_GPIO_BASE, \
- AMS_DELTA_LATCH1_NGPIO, (mask), (value))
#define ams_delta_latch2_write(mask, value) \
ams_delta_latch_write(AMS_DELTA_LATCH2_GPIO_BASE, \
AMS_DELTA_LATCH2_NGPIO, (mask), (value))
--
1.7.3.4
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
