Index: linux-2.6.15-rc2/drivers/leds/Kconfig =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ linux-2.6.15-rc2/drivers/leds/Kconfig 2005-11-28 12:31:02.000000000 +0000 @@ -0,0 +1,54 @@ + +menu "LED devices" + +config NEW_LEDS + bool "LED Support" + help + Say Y to enable Linux LED support. This is not related to standard + keyboard LEDs which are controlled via the input system. + +config LEDS_CLASS + tristate "LED Class Support" + depends NEW_LEDS + help + This option enables the led sysfs class in /sys/class/leds. You'll + need this to do anything useful with LEDs. If unsure, say N. + +config LEDS_TRIGGERS + bool "LED Trigger support" + depends NEW_LEDS + help + This option enables trigger support for the leds class. + These triggers allow kernel events to drive the LEDs and can + be configured via sysfs. If unsure, say Y. + +config LEDS_CORGI + tristate "LED Support for the Sharp SL-C7x0 series" + depends LEDS_CLASS && PXA_SHARP_C7xx + help + This option enables support for the LEDs on Sharp Zaurus + SL-C7x0 series (C700, C750, C760, C860). + +config LEDS_LOCOMO + tristate "LED Support for Locomo device" + depends LEDS_CLASS && SHARP_LOCOMO + help + This option enables support for the LEDs on Sharp Locomo. + Zaurus models SL-5500 and SL-5600. + +config LEDS_SPITZ + tristate "LED Support for the Sharp SL-Cxx00 series" + depends LEDS_CLASS && PXA_SHARP_Cxx00 + help + This option enables support for the LEDs on Sharp Zaurus + SL-Cxx00 series (C1000, C3000, C3100). + +config LEDS_TRIGGER_TIMER + tristate "LED Timer Trigger" + depends LEDS_TRIGGERS + help + This allows LEDs to be controlled by a programmable timer + via sysfs. If unsure, say Y. + +endmenu + Index: linux-2.6.15-rc2/drivers/leds/Makefile =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ linux-2.6.15-rc2/drivers/leds/Makefile 2005-11-28 12:31:02.000000000 +0000 @@ -0,0 +1,13 @@ + +# LED Core +obj-$(CONFIG_NEW_LEDS) += led-core.o +obj-$(CONFIG_LEDS_CLASS) += led-class.o +obj-$(CONFIG_LEDS_TRIGGERS) += led-triggers.o + +# LED Platform Drivers +obj-$(CONFIG_LEDS_CORGI) += corgi.o +obj-$(CONFIG_LEDS_LOCOMO) += locomo.o +obj-$(CONFIG_LEDS_SPITZ) += spitz.o + +# LED Triggers +obj-$(CONFIG_LEDS_TRIGGER_TIMER) += trig-timer.o Index: linux-2.6.15-rc2/include/linux/leds.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ linux-2.6.15-rc2/include/linux/leds.h 2005-11-28 15:52:46.000000000 +0000 @@ -0,0 +1,84 @@ +/* + * Driver model for leds and led triggers + * + * Copyright (C) 2005 John Lenz + * Copyright (C) 2005 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. + * + */ + +struct device; +struct class_device; +/* + * LED Core + */ +struct led_device { + /* Read-only name for this led */ + char *name; + + /* This protects the props field.*/ + rwlock_t lock; + + /* These functions manipulate the brightness of the led. + * Values are between 0-100 */ + int (*brightness_get)(struct led_device *led_dev); + void (*brightness_set)(struct led_device *led_dev, int value); + + struct class_device *class_dev; + struct list_head node; + + char *default_trigger; + struct led_trigger *trigger; + struct list_head trig_list; + void *trigger_data; +}; + +int leds_device_register(struct device *dev, struct led_device *led_dev); +void leds_device_unregister(struct led_device *led_dev); + + +/* + * LED Triggers + */ +#ifdef CONFIG_LEDS_TRIGGERS + +#define TRIG_NAME_MAX 50 + +struct led_trigger { + /* Trigger Properties */ + char *name; + void (*activate)(struct led_device *led_dev); + void (*deactivate)(struct led_device *led_dev); + + /* LEDs under control by this trigger (for simple triggers) */ + rwlock_t leddev_list_lock; + struct list_head led_devs; + + /* Link to next registered trigger */ + struct list_head next_trig; +}; + +/* Registration functions for complex triggers */ +int led_trigger_register(struct led_trigger *trigger); +void led_trigger_unregister(struct led_trigger *trigger); + +/* Registration functions for simple triggers */ +#define INIT_LED_TRIGGER(x) static struct led_trigger *x; +#define INIT_LED_TRIGGER_GLOBAL(x) struct led_trigger *x; +void led_trigger_register_simple(char *name, struct led_trigger **trigger); +void led_trigger_unregister_simple(struct led_trigger *trigger); +void led_trigger_event(struct led_trigger *trigger, int event); + +#else + +/* Triggers aren't active - null macros */ +#define INIT_LED_TRIGGER(x) +#define INIT_LED_TRIGGER_GLOBAL(x) +#define led_trigger_register_simple(x, y) +#define led_trigger_unregister_simple(x) +#define led_trigger_event(x, y) + +#endif Index: linux-2.6.15-rc2/arch/arm/Kconfig =================================================================== --- linux-2.6.15-rc2.orig/arch/arm/Kconfig 2005-11-20 03:25:03.000000000 +0000 +++ linux-2.6.15-rc2/arch/arm/Kconfig 2005-11-28 16:21:10.000000000 +0000 @@ -738,6 +738,8 @@ source "drivers/mfd/Kconfig" +source "drivers/leds/Kconfig" + source "drivers/media/Kconfig" source "drivers/video/Kconfig" Index: linux-2.6.15-rc2/drivers/Makefile =================================================================== --- linux-2.6.15-rc2.orig/drivers/Makefile 2005-11-20 03:25:03.000000000 +0000 +++ linux-2.6.15-rc2/drivers/Makefile 2005-11-28 12:31:02.000000000 +0000 @@ -64,6 +64,7 @@ obj-$(CONFIG_EISA) += eisa/ obj-$(CONFIG_CPU_FREQ) += cpufreq/ obj-$(CONFIG_MMC) += mmc/ +obj-$(CONFIG_NEW_LEDS) += leds/ obj-$(CONFIG_INFINIBAND) += infiniband/ obj-$(CONFIG_SGI_IOC4) += sn/ obj-y += firmware/ Index: linux-2.6.15-rc2/drivers/Kconfig =================================================================== --- linux-2.6.15-rc2.orig/drivers/Kconfig 2005-11-20 03:25:03.000000000 +0000 +++ linux-2.6.15-rc2/drivers/Kconfig 2005-11-28 12:31:02.000000000 +0000 @@ -62,6 +62,8 @@ source "drivers/mmc/Kconfig" +source "drivers/leds/Kconfig" + source "drivers/infiniband/Kconfig" source "drivers/sn/Kconfig" Index: linux-2.6.15-rc2/drivers/leds/leds.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ linux-2.6.15-rc2/drivers/leds/leds.h 2005-11-28 12:31:02.000000000 +0000 @@ -0,0 +1,20 @@ +/* + * LED 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. + * + */ + +extern rwlock_t leds_list_lock; +extern struct list_head leds_list; + +void led_trigger_set_default(struct led_device *led_dev); +void led_trigger_set(struct led_device *led_dev, struct led_trigger *trigger); +ssize_t led_trigger_store(struct class_device *dev, const char *buf, size_t count); +ssize_t led_trigger_show(struct class_device *dev, char *buf); Index: linux-2.6.15-rc2/drivers/leds/led-class.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ linux-2.6.15-rc2/drivers/leds/led-class.c 2005-11-28 12:31:02.000000000 +0000 @@ -0,0 +1,152 @@ +/* + * LED Class Core + * + * Copyright (C) 2005 John Lenz + * Copyright (C) 2005 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 +#include "leds.h" + +static void leds_class_release(struct class_device *dev) +{ + kfree(dev); +} + +static struct class leds_class = { + .name = "leds", + .release = leds_class_release, +}; + +static ssize_t leds_show_brightness(struct class_device *dev, char *buf) +{ + struct led_device *led_dev = dev->class_data; + ssize_t ret = 0; + + read_lock(&led_dev->lock); + sprintf(buf, "%u\n", led_dev->brightness_get(led_dev)); + ret = strlen(buf) + 1; + read_unlock(&led_dev->lock); + + return ret; +} + +static ssize_t leds_store_brightness(struct class_device *dev, const char *buf, size_t size) +{ + struct led_device *led_dev = dev->class_data; + ssize_t ret = -EINVAL; + char *after; + + unsigned long state = simple_strtoul(buf, &after, 10); + if (after - buf > 0) { + ret = after - buf; + write_lock(&led_dev->lock); + if (state > 100) state = 100; + led_dev->brightness_set(led_dev, state); + write_unlock(&led_dev->lock); + } + + return ret; +} + +static CLASS_DEVICE_ATTR(brightness, 0644, leds_show_brightness, leds_store_brightness); +static CLASS_DEVICE_ATTR(trigger, 0644, led_trigger_show, led_trigger_store); + +/** + * leds_device_register - register a new object of led_device class. + * @dev: The device to register. + * @led_dev: the led_device structure for this device. + */ +int leds_device_register(struct device *dev, struct led_device *led_dev) +{ + int rc; + + led_dev->class_dev = kzalloc (sizeof (struct class_device), GFP_KERNEL); + if (unlikely (!led_dev->class_dev)) + return -ENOMEM; + + rwlock_init(&led_dev->lock); + + led_dev->class_dev->class = &leds_class; + led_dev->class_dev->dev = dev; + led_dev->class_dev->class_data = led_dev; + + /* assign this led its name */ + strncpy(led_dev->class_dev->class_id, led_dev->name, sizeof(led_dev->class_dev->class_id)); + + rc = class_device_register (led_dev->class_dev); + if (unlikely (rc)) { + kfree (led_dev->class_dev); + return rc; + } + + /* register the attributes */ + class_device_create_file(led_dev->class_dev, &class_device_attr_brightness); + class_device_create_file(led_dev->class_dev, &class_device_attr_trigger); + + /* add to the list of leds */ + write_lock(&leds_list_lock); + list_add_tail(&led_dev->node, &leds_list); + write_unlock(&leds_list_lock); + + led_trigger_set_default(led_dev); + + printk(KERN_INFO "Registered led device: %s\n", led_dev->class_dev->class_id); + + return 0; +} + +/** + * leds_device_unregister - unregisters a object of led_properties class. + * @led_dev: the led device to unreigister + * + * Unregisters a previously registered via leds_device_register object. + */ +void leds_device_unregister(struct led_device *led_dev) +{ + class_device_remove_file (led_dev->class_dev, &class_device_attr_trigger); + class_device_remove_file (led_dev->class_dev, &class_device_attr_brightness); + + if (led_dev->trigger) + led_trigger_set(led_dev, NULL); + + class_device_unregister(led_dev->class_dev); + + write_lock(&leds_list_lock); + list_del(&led_dev->node); + write_unlock(&leds_list_lock); +} + +EXPORT_SYMBOL(leds_device_register); +EXPORT_SYMBOL(leds_device_unregister); + +static int __init leds_init(void) +{ + return class_register(&leds_class); +} + +static void __exit leds_exit(void) +{ + class_unregister(&leds_class); +} + +subsys_initcall(leds_init); +module_exit(leds_exit); + +MODULE_AUTHOR("John Lenz"); +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("LED Class Interface"); + Index: linux-2.6.15-rc2/drivers/leds/led-core.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ linux-2.6.15-rc2/drivers/leds/led-core.c 2005-11-28 16:12:00.000000000 +0000 @@ -0,0 +1,24 @@ +/* + * LED Class 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 "leds.h" + +rwlock_t leds_list_lock = RW_LOCK_UNLOCKED; +LIST_HEAD(leds_list); + +EXPORT_SYMBOL_GPL(leds_list);