Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

[pandora-kernel.git] / arch / arm / mach-pxa / palmtc.c

diff --git a/arch/arm/mach-pxa/palmtc.c b/arch/arm/mach-pxa/palmtc.c
index 73de8c5..a09a237 100644 (file)
--- a/arch/arm/mach-pxa/palmtc.c
+++ b/arch/arm/mach-pxa/palmtc.c
@@ -381,6 +381,46 @@ static void __init palmtc_ts_init(void)
 static inline void palmtc_ts_init(void) {}
 #endif
 
+/******************************************************************************
+ * LEDs
+ ******************************************************************************/
+#if defined(CONFIG_LEDS_GPIO) || defined(CONFIG_LEDS_GPIO_MODULE)
+struct gpio_led palmtc_gpio_leds[] = {
+{
+       .name                   = "palmtc:green:user",
+       .default_trigger        = "none",
+       .gpio                   = GPIO_NR_PALMTC_LED_POWER,
+       .active_low             = 1,
+}, {
+       .name                   = "palmtc:vibra:vibra",
+       .default_trigger        = "none",
+       .gpio                   = GPIO_NR_PALMTC_VIBRA_POWER,
+       .active_low             = 1,
+}
+
+};
+
+static struct gpio_led_platform_data palmtc_gpio_led_info = {
+       .leds           = palmtc_gpio_leds,
+       .num_leds       = ARRAY_SIZE(palmtc_gpio_leds),
+};
+
+static struct platform_device palmtc_leds = {
+       .name   = "leds-gpio",
+       .id     = -1,
+       .dev    = {
+               .platform_data  = &palmtc_gpio_led_info,
+       }
+};
+
+static void __init palmtc_leds_init(void)
+{
+       platform_device_register(&palmtc_leds);
+}
+#else
+static inline void palmtc_leds_init(void) {}
+#endif
+
 /******************************************************************************
  * NOR Flash
  ******************************************************************************/
@@ -494,6 +534,7 @@ static void __init palmtc_init(void)
        palmtc_ts_init();
        palmtc_nor_init();
        palmtc_lcd_init();
+       palmtc_leds_init();
 };
 
 MACHINE_START(PALMTC, "Palm Tungsten|C")