Index: linux-2.6.15-rc2/arch/arm/mach-pxa/corgi.c =================================================================== --- linux-2.6.15-rc2.orig/arch/arm/mach-pxa/corgi.c 2005-11-20 03:25:03.000000000 +0000 +++ linux-2.6.15-rc2/arch/arm/mach-pxa/corgi.c 2005-11-28 12:31:03.000000000 +0000 @@ -165,6 +165,15 @@ /* + * Corgi LEDs + */ +static struct platform_device corgiled_device = { + .name = "corgi-led", + .id = -1, +}; + + +/* * Corgi Touch Screen Device */ static struct resource corgits_resources[] = { @@ -299,6 +308,7 @@ &corgikbd_device, &corgibl_device, &corgits_device, + &corgiled_device, }; static void __init corgi_init(void) Index: linux-2.6.15-rc2/drivers/leds/corgi.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ linux-2.6.15-rc2/drivers/leds/corgi.c 2005-11-28 12:31:03.000000000 +0000 @@ -0,0 +1,118 @@ +/* + * LED Triggers Core + * + * Copyright 2005 Openedhand Ltd. + * + * Author: Richard Purdie + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +struct corgiled_data { + int registered; + struct led_device device; +}; + +int corgiled_amber_get(struct led_device *led_dev) +{ + return (GPLR0 & GPIO_bit(CORGI_GPIO_LED_ORANGE)) ? 1 : 0; +} + +void corgiled_amber_set(struct led_device *led_dev, int value) +{ + if (value) + GPSR0 = GPIO_bit(CORGI_GPIO_LED_ORANGE); + else + GPCR0 = GPIO_bit(CORGI_GPIO_LED_ORANGE); +} + +int corgiled_green_get(struct led_device *led_dev) +{ + return (read_scoop_reg(&corgiscoop_device.dev,SCOOP_GPWR) & CORGI_SCP_LED_GREEN) ? 1 : 0; +} + +void corgiled_green_set(struct led_device *led_dev, int value) +{ + if (value) + set_scoop_gpio(&corgiscoop_device.dev, CORGI_SCP_LED_GREEN); + else + reset_scoop_gpio(&corgiscoop_device.dev, CORGI_SCP_LED_GREEN); +} + +static struct corgiled_data corgi_amber_led = { + .device = { + .name = "corgi:amber", + .default_trigger = "charge", + .brightness_get = corgiled_amber_get, + .brightness_set = corgiled_amber_set, + } +}; + +static struct corgiled_data corgi_green_led = { + .device = { + .name = "corgi:green", + .default_trigger = "nand-disk", + .brightness_get = corgiled_green_get, + .brightness_set = corgiled_green_set, + } +}; + +static int corgiled_probe(struct platform_device *pdev) +{ + if (!leds_device_register(&pdev->dev, &corgi_amber_led.device)) + corgi_amber_led.registered = 1; + if (!leds_device_register(&pdev->dev, &corgi_green_led.device)) + corgi_green_led.registered = 1; + + return 0; +} + +static int corgiled_remove(struct platform_device *pdev) +{ + if (corgi_amber_led.registered) + leds_device_unregister(&corgi_amber_led.device); + if (corgi_green_led.registered) + leds_device_unregister(&corgi_green_led.device); + + return 0; +} + +static struct platform_driver corgiled_driver = { + .probe = corgiled_probe, + .remove = corgiled_remove, +// .suspend = corgiled_suspend, +// .resume = corgiled_resume, + .driver = { + .name = "corgi-led", + }, +}; + +static int __devinit corgiled_init(void) +{ + return platform_driver_register(&corgiled_driver); +} + +static void corgiled_exit(void) +{ + platform_driver_unregister(&corgiled_driver); +} + +module_init(corgiled_init); +module_exit(corgiled_exit); + +MODULE_AUTHOR("Richard Purdie "); +MODULE_DESCRIPTION("Corgi LED driver"); +MODULE_LICENSE("GPL"); Index: linux-2.6.15-rc2/arch/arm/mach-pxa/corgi_pm.c =================================================================== --- linux-2.6.15-rc2.orig/arch/arm/mach-pxa/corgi_pm.c 2005-11-20 03:25:03.000000000 +0000 +++ linux-2.6.15-rc2/arch/arm/mach-pxa/corgi_pm.c 2005-11-28 12:31:03.000000000 +0000 @@ -35,19 +35,6 @@ pxa_gpio_mode(CORGI_GPIO_KEY_INT | GPIO_IN); } -static void corgi_charge_led(int val) -{ - if (val == SHARPSL_LED_ERROR) { - dev_dbg(sharpsl_pm.dev, "Charge LED Error\n"); - } else if (val == SHARPSL_LED_ON) { - dev_dbg(sharpsl_pm.dev, "Charge LED On\n"); - GPSR0 = GPIO_bit(CORGI_GPIO_LED_ORANGE); - } else { - dev_dbg(sharpsl_pm.dev, "Charge LED Off\n"); - GPCR0 = GPIO_bit(CORGI_GPIO_LED_ORANGE); - } -} - static void corgi_measure_temp(int on) { if (on) @@ -185,7 +172,6 @@ .status_acin = corgi_acin_status, .discharge = corgi_discharge, .charge = corgi_charge, - .chargeled = corgi_charge_led, .measure_temp = corgi_measure_temp, .presuspend = corgi_presuspend, .postsuspend = corgi_postsuspend, Index: linux-2.6.15-rc2/arch/arm/mach-pxa/spitz_pm.c =================================================================== --- linux-2.6.15-rc2.orig/arch/arm/mach-pxa/spitz_pm.c 2005-11-20 03:25:03.000000000 +0000 +++ linux-2.6.15-rc2/arch/arm/mach-pxa/spitz_pm.c 2005-11-28 12:31:03.000000000 +0000 @@ -35,19 +35,6 @@ pxa_gpio_mode(SPITZ_GPIO_SYNC | GPIO_IN); } -static void spitz_charge_led(int val) -{ - if (val == SHARPSL_LED_ERROR) { - dev_dbg(sharpsl_pm.dev, "Charge LED Error\n"); - } else if (val == SHARPSL_LED_ON) { - dev_dbg(sharpsl_pm.dev, "Charge LED On\n"); - set_scoop_gpio(&spitzscoop_device.dev, SPITZ_SCP_LED_ORANGE); - } else { - dev_dbg(sharpsl_pm.dev, "Charge LED Off\n"); - reset_scoop_gpio(&spitzscoop_device.dev, SPITZ_SCP_LED_ORANGE); - } -} - static void spitz_measure_temp(int on) { if (on) @@ -190,7 +177,6 @@ .discharge = spitz_discharge, .discharge1 = spitz_discharge1, .charge = spitz_charge, - .chargeled = spitz_charge_led, .measure_temp = spitz_measure_temp, .presuspend = spitz_presuspend, .postsuspend = spitz_postsuspend, Index: linux-2.6.15-rc2/arch/arm/mach-pxa/sharpsl.h =================================================================== --- linux-2.6.15-rc2.orig/arch/arm/mach-pxa/sharpsl.h 2005-11-20 03:25:03.000000000 +0000 +++ linux-2.6.15-rc2/arch/arm/mach-pxa/sharpsl.h 2005-11-28 12:31:03.000000000 +0000 @@ -47,7 +47,6 @@ void (*discharge)(int); void (*discharge1)(int); void (*charge)(int); - void (*chargeled)(int); void (*measure_temp)(int); void (*presuspend)(void); void (*postsuspend)(void); @@ -104,15 +103,16 @@ #define READ_GPIO_BIT(x) (GPLR(x) & GPIO_bit(x)) +void sharpsl_pm_led(int val); #define SHARPSL_LED_ERROR 2 #define SHARPSL_LED_ON 1 #define SHARPSL_LED_OFF 0 #define CHARGE_ON() sharpsl_pm.machinfo->charge(1) #define CHARGE_OFF() sharpsl_pm.machinfo->charge(0) -#define CHARGE_LED_ON() sharpsl_pm.machinfo->chargeled(SHARPSL_LED_ON) -#define CHARGE_LED_OFF() sharpsl_pm.machinfo->chargeled(SHARPSL_LED_OFF) -#define CHARGE_LED_ERR() sharpsl_pm.machinfo->chargeled(SHARPSL_LED_ERROR) +#define CHARGE_LED_ON() sharpsl_pm_led(SHARPSL_LED_ON) +#define CHARGE_LED_OFF() sharpsl_pm_led(SHARPSL_LED_OFF) +#define CHARGE_LED_ERR() sharpsl_pm_led(SHARPSL_LED_ERROR) #define DISCHARGE_ON() sharpsl_pm.machinfo->discharge(1) #define DISCHARGE_OFF() sharpsl_pm.machinfo->discharge(0) #define STATUS_AC_IN() sharpsl_pm.machinfo->status_acin() Index: linux-2.6.15-rc2/drivers/leds/spitz.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ linux-2.6.15-rc2/drivers/leds/spitz.c 2005-11-28 12:31:03.000000000 +0000 @@ -0,0 +1,123 @@ +/* + * LED Triggers Core + * + * Copyright 2005 Openedhand Ltd. + * + * Author: Richard Purdie + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +struct spitzled_data { + int registered; + struct led_device device; +}; + +int spitzled_amber_get(struct led_device *led_dev) +{ + return (read_scoop_reg(&spitzscoop_device.dev,SCOOP_GPWR) & SPITZ_SCP_LED_ORANGE) ? 1 : 0; +} + +void spitzled_amber_set(struct led_device *led_dev, int value) +{ + if (value) + set_scoop_gpio(&spitzscoop_device.dev, SPITZ_SCP_LED_ORANGE); + else + reset_scoop_gpio(&spitzscoop_device.dev, SPITZ_SCP_LED_ORANGE); +} + +int spitzled_green_get(struct led_device *led_dev) +{ + return (read_scoop_reg(&spitzscoop_device.dev,SCOOP_GPWR) & SPITZ_SCP_LED_GREEN) ? 1 : 0; +} + +void spitzled_green_set(struct led_device *led_dev, int value) +{ + if (value) + set_scoop_gpio(&spitzscoop_device.dev, SPITZ_SCP_LED_GREEN); + else + reset_scoop_gpio(&spitzscoop_device.dev, SPITZ_SCP_LED_GREEN); +} + +static struct spitzled_data spitz_amber_led = { + .device = { + .name = "spitz:amber", + .default_trigger = "charge", + .brightness_get = spitzled_amber_get, + .brightness_set = spitzled_amber_set, + } +}; + +static struct spitzled_data spitz_green_led = { + .device = { + .name = "spitz:green", + .default_trigger = "ide-disk", + .brightness_get = spitzled_green_get, + .brightness_set = spitzled_green_set, + } +}; + +static int spitzled_probe(struct platform_device *pdev) +{ + if (machine_is_akita()) + spitz_green_led.device.default_trigger = "nand-disk"; + + if (!leds_device_register(&pdev->dev, &spitz_amber_led.device)) + spitz_amber_led.registered = 1; + + if (!leds_device_register(&pdev->dev, &spitz_green_led.device)) + spitz_green_led.registered = 1; + + return 0; +} + +static int spitzled_remove(struct platform_device *pdev) +{ + if (spitz_amber_led.registered) + leds_device_unregister(&spitz_amber_led.device); + if (spitz_green_led.registered) + leds_device_unregister(&spitz_green_led.device); + + return 0; +} + +static struct platform_driver spitzled_driver = { + .probe = spitzled_probe, + .remove = spitzled_remove, +// .suspend = spitzled_suspend, +// .resume = spitzled_resume, + .driver = { + .name = "spitz-led", + }, +}; + +static int __devinit spitzled_init(void) +{ + return platform_driver_register(&spitzled_driver); +} + +static void spitzled_exit(void) +{ + platform_driver_unregister(&spitzled_driver); +} + +module_init(spitzled_init); +module_exit(spitzled_exit); + +MODULE_AUTHOR("Richard Purdie "); +MODULE_DESCRIPTION("Spitz LED driver"); +MODULE_LICENSE("GPL"); Index: linux-2.6.15-rc2/arch/arm/mach-pxa/sharpsl_pm.c =================================================================== --- linux-2.6.15-rc2.orig/arch/arm/mach-pxa/sharpsl_pm.c 2005-11-20 03:25:03.000000000 +0000 +++ linux-2.6.15-rc2/arch/arm/mach-pxa/sharpsl_pm.c 2005-11-28 15:54:33.000000000 +0000 @@ -22,6 +22,7 @@ #include #include #include +#include #include #include @@ -178,6 +179,7 @@ struct sharpsl_pm_status sharpsl_pm; DECLARE_WORK(toggle_charger, sharpsl_charge_toggle, NULL); DECLARE_WORK(sharpsl_bat, sharpsl_battery_thread, NULL); +INIT_LED_TRIGGER(sharpsl_charge_led_trigger); static int get_percentage(int voltage) @@ -286,6 +288,19 @@ schedule_delayed_work(&sharpsl_bat, SHARPSL_BATCHK_TIME); } +void sharpsl_pm_led(int val) +{ + if (val == SHARPSL_LED_ERROR) { + dev_err(sharpsl_pm.dev, "Charging Error!\n"); + } else if (val == SHARPSL_LED_ON) { + dev_dbg(sharpsl_pm.dev, "Charge LED On\n"); + led_trigger_event(sharpsl_charge_led_trigger, 1); + } else { + dev_dbg(sharpsl_pm.dev, "Charge LED Off\n"); + led_trigger_event(sharpsl_charge_led_trigger, 0); + } +} + static void sharpsl_charge_on(void) { dev_dbg(sharpsl_pm.dev, "Turning Charger On\n"); @@ -900,6 +915,8 @@ sharpsl_pm.charge_mode = CHRG_OFF; sharpsl_pm.flags = 0; + led_trigger_register_simple("charge", &sharpsl_charge_led_trigger); + sharpsl_pm.machinfo->init(); init_timer(&sharpsl_pm.ac_timer); @@ -958,6 +975,8 @@ device_remove_file(&pdev->dev, &dev_attr_battery_percentage); device_remove_file(&pdev->dev, &dev_attr_battery_voltage); + led_trigger_unregister_simple(sharpsl_charge_led_trigger); + free_irq(IRQ_GPIO(sharpsl_pm.machinfo->gpio_acin), sharpsl_ac_isr); free_irq(IRQ_GPIO(sharpsl_pm.machinfo->gpio_batlock), sharpsl_fatal_isr); Index: linux-2.6.15-rc2/arch/arm/mach-pxa/spitz.c =================================================================== --- linux-2.6.15-rc2.orig/arch/arm/mach-pxa/spitz.c 2005-11-28 12:31:00.000000000 +0000 +++ linux-2.6.15-rc2/arch/arm/mach-pxa/spitz.c 2005-11-28 12:31:03.000000000 +0000 @@ -241,6 +241,15 @@ /* + * Spitz LEDs + */ +static struct platform_device spitzled_device = { + .name = "spitz-led", + .id = -1, +}; + + +/* * Spitz Touch Screen Device */ static struct resource spitzts_resources[] = { @@ -418,6 +427,7 @@ &spitzkbd_device, &spitzts_device, &spitzbl_device, + &spitzled_device, }; static void __init common_init(void)