diff options
| author | Richard Purdie <rpurdie@rpsys.net> | 2006-03-31 05:31:04 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-31 15:18:56 -0500 |
| commit | c72a1d608dd0eb3d553a08bfdf1c0041bebaa8a0 (patch) | |
| tree | 56715f0e0af8a9c33725f3db2f14cf7f870ad46d | |
| parent | 75c1d31d9ea71025b73430c696b727e8aa15872d (diff) | |
[PATCH] LED: add LED class
Add the foundations of a new LEDs subsystem. This patch adds a class which
presents LED devices within sysfs and allows their brightness to be
controlled.
Signed-off-by: Richard Purdie <rpurdie@rpsys.net>
Cc: Russell King <rmk@arm.linux.org.uk>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | arch/arm/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/Makefile | 1 | ||||
| -rw-r--r-- | drivers/leds/Kconfig | 18 | ||||
| -rw-r--r-- | drivers/leds/Makefile | 4 | ||||
| -rw-r--r-- | drivers/leds/led-class.c | 147 | ||||
| -rw-r--r-- | drivers/leds/led-core.c | 25 | ||||
| -rw-r--r-- | drivers/leds/leds.h | 31 | ||||
| -rw-r--r-- | include/linux/leds.h | 51 |
9 files changed, 281 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index ba46d779ede7..e91db542eb01 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -839,6 +839,8 @@ source "drivers/misc/Kconfig" | |||
| 839 | 839 | ||
| 840 | source "drivers/mfd/Kconfig" | 840 | source "drivers/mfd/Kconfig" |
| 841 | 841 | ||
| 842 | source "drivers/leds/Kconfig" | ||
| 843 | |||
| 842 | source "drivers/media/Kconfig" | 844 | source "drivers/media/Kconfig" |
| 843 | 845 | ||
| 844 | source "drivers/video/Kconfig" | 846 | source "drivers/video/Kconfig" |
diff --git a/drivers/Kconfig b/drivers/Kconfig index 9f5c0da57c90..5c91d6afb117 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig | |||
| @@ -64,6 +64,8 @@ source "drivers/usb/Kconfig" | |||
| 64 | 64 | ||
| 65 | source "drivers/mmc/Kconfig" | 65 | source "drivers/mmc/Kconfig" |
| 66 | 66 | ||
| 67 | source "drivers/leds/Kconfig" | ||
| 68 | |||
| 67 | source "drivers/infiniband/Kconfig" | 69 | source "drivers/infiniband/Kconfig" |
| 68 | 70 | ||
| 69 | source "drivers/sn/Kconfig" | 71 | source "drivers/sn/Kconfig" |
diff --git a/drivers/Makefile b/drivers/Makefile index 424955274e60..d6e8ffbd8132 100644 --- a/drivers/Makefile +++ b/drivers/Makefile | |||
| @@ -69,6 +69,7 @@ obj-$(CONFIG_MCA) += mca/ | |||
| 69 | obj-$(CONFIG_EISA) += eisa/ | 69 | obj-$(CONFIG_EISA) += eisa/ |
| 70 | obj-$(CONFIG_CPU_FREQ) += cpufreq/ | 70 | obj-$(CONFIG_CPU_FREQ) += cpufreq/ |
| 71 | obj-$(CONFIG_MMC) += mmc/ | 71 | obj-$(CONFIG_MMC) += mmc/ |
| 72 | obj-$(CONFIG_NEW_LEDS) += leds/ | ||
| 72 | obj-$(CONFIG_INFINIBAND) += infiniband/ | 73 | obj-$(CONFIG_INFINIBAND) += infiniband/ |
| 73 | obj-$(CONFIG_SGI_SN) += sn/ | 74 | obj-$(CONFIG_SGI_SN) += sn/ |
| 74 | obj-y += firmware/ | 75 | obj-y += firmware/ |
diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig new file mode 100644 index 000000000000..106f9aeca04f --- /dev/null +++ b/drivers/leds/Kconfig | |||
| @@ -0,0 +1,18 @@ | |||
| 1 | |||
| 2 | menu "LED devices" | ||
| 3 | |||
| 4 | config NEW_LEDS | ||
| 5 | bool "LED Support" | ||
| 6 | help | ||
| 7 | Say Y to enable Linux LED support. This is not related to standard | ||
| 8 | keyboard LEDs which are controlled via the input system. | ||
| 9 | |||
| 10 | config LEDS_CLASS | ||
| 11 | tristate "LED Class Support" | ||
| 12 | depends NEW_LEDS | ||
| 13 | help | ||
| 14 | This option enables the led sysfs class in /sys/class/leds. You'll | ||
| 15 | need this to do anything useful with LEDs. If unsure, say N. | ||
| 16 | |||
| 17 | endmenu | ||
| 18 | |||
diff --git a/drivers/leds/Makefile b/drivers/leds/Makefile new file mode 100644 index 000000000000..8a62871437fa --- /dev/null +++ b/drivers/leds/Makefile | |||
| @@ -0,0 +1,4 @@ | |||
| 1 | |||
| 2 | # LED Core | ||
| 3 | obj-$(CONFIG_NEW_LEDS) += led-core.o | ||
| 4 | obj-$(CONFIG_LEDS_CLASS) += led-class.o | ||
diff --git a/drivers/leds/led-class.c b/drivers/leds/led-class.c new file mode 100644 index 000000000000..0292df4101ba --- /dev/null +++ b/drivers/leds/led-class.c | |||
| @@ -0,0 +1,147 @@ | |||
| 1 | /* | ||
| 2 | * LED Class Core | ||
| 3 | * | ||
| 4 | * Copyright (C) 2005 John Lenz <lenz@cs.wisc.edu> | ||
| 5 | * Copyright (C) 2005-2006 Richard Purdie <rpurdie@openedhand.com> | ||
| 6 | * | ||
| 7 | * This program is free software; you can redistribute it and/or modify | ||
| 8 | * it under the terms of the GNU General Public License version 2 as | ||
| 9 | * published by the Free Software Foundation. | ||
| 10 | */ | ||
| 11 | |||
| 12 | #include <linux/config.h> | ||
| 13 | #include <linux/module.h> | ||
| 14 | #include <linux/kernel.h> | ||
| 15 | #include <linux/init.h> | ||
| 16 | #include <linux/list.h> | ||
| 17 | #include <linux/spinlock.h> | ||
| 18 | #include <linux/device.h> | ||
| 19 | #include <linux/sysdev.h> | ||
| 20 | #include <linux/timer.h> | ||
| 21 | #include <linux/err.h> | ||
| 22 | #include <linux/leds.h> | ||
| 23 | #include "leds.h" | ||
| 24 | |||
| 25 | static struct class *leds_class; | ||
| 26 | |||
| 27 | static ssize_t led_brightness_show(struct class_device *dev, char *buf) | ||
| 28 | { | ||
| 29 | struct led_classdev *led_cdev = class_get_devdata(dev); | ||
| 30 | ssize_t ret = 0; | ||
| 31 | |||
| 32 | /* no lock needed for this */ | ||
| 33 | sprintf(buf, "%u\n", led_cdev->brightness); | ||
| 34 | ret = strlen(buf) + 1; | ||
| 35 | |||
| 36 | return ret; | ||
| 37 | } | ||
| 38 | |||
| 39 | static ssize_t led_brightness_store(struct class_device *dev, | ||
| 40 | const char *buf, size_t size) | ||
| 41 | { | ||
| 42 | struct led_classdev *led_cdev = class_get_devdata(dev); | ||
| 43 | ssize_t ret = -EINVAL; | ||
| 44 | char *after; | ||
| 45 | unsigned long state = simple_strtoul(buf, &after, 10); | ||
| 46 | |||
| 47 | if (after - buf > 0) { | ||
| 48 | ret = after - buf; | ||
| 49 | led_set_brightness(led_cdev, state); | ||
| 50 | } | ||
| 51 | |||
| 52 | return ret; | ||
| 53 | } | ||
| 54 | |||
| 55 | static CLASS_DEVICE_ATTR(brightness, 0644, led_brightness_show, | ||
| 56 | led_brightness_store); | ||
| 57 | |||
| 58 | /** | ||
| 59 | * led_classdev_suspend - suspend an led_classdev. | ||
| 60 | * @led_cdev: the led_classdev to suspend. | ||
| 61 | */ | ||
| 62 | void led_classdev_suspend(struct led_classdev *led_cdev) | ||
| 63 | { | ||
| 64 | led_cdev->flags |= LED_SUSPENDED; | ||
| 65 | led_cdev->brightness_set(led_cdev, 0); | ||
| 66 | } | ||
| 67 | EXPORT_SYMBOL_GPL(led_classdev_suspend); | ||
| 68 | |||
| 69 | /** | ||
| 70 | * led_classdev_resume - resume an led_classdev. | ||
| 71 | * @led_cdev: the led_classdev to resume. | ||
| 72 | */ | ||
| 73 | void led_classdev_resume(struct led_classdev *led_cdev) | ||
| 74 | { | ||
| 75 | led_cdev->brightness_set(led_cdev, led_cdev->brightness); | ||
| 76 | led_cdev->flags &= ~LED_SUSPENDED; | ||
| 77 | } | ||
| 78 | EXPORT_SYMBOL_GPL(led_classdev_resume); | ||
| 79 | |||
| 80 | /** | ||
| 81 | * led_classdev_register - register a new object of led_classdev class. | ||
| 82 | * @dev: The device to register. | ||
| 83 | * @led_cdev: the led_classdev structure for this device. | ||
| 84 | */ | ||
| 85 | int led_classdev_register(struct device *parent, struct led_classdev *led_cdev) | ||
| 86 | { | ||
| 87 | led_cdev->class_dev = class_device_create(leds_class, NULL, 0, | ||
| 88 | parent, "%s", led_cdev->name); | ||
| 89 | if (unlikely(IS_ERR(led_cdev->class_dev))) | ||
| 90 | return PTR_ERR(led_cdev->class_dev); | ||
| 91 | |||
| 92 | class_set_devdata(led_cdev->class_dev, led_cdev); | ||
| 93 | |||
| 94 | /* register the attributes */ | ||
| 95 | class_device_create_file(led_cdev->class_dev, | ||
| 96 | &class_device_attr_brightness); | ||
| 97 | |||
| 98 | /* add to the list of leds */ | ||
| 99 | write_lock(&leds_list_lock); | ||
| 100 | list_add_tail(&led_cdev->node, &leds_list); | ||
| 101 | write_unlock(&leds_list_lock); | ||
| 102 | |||
| 103 | printk(KERN_INFO "Registered led device: %s\n", | ||
| 104 | led_cdev->class_dev->class_id); | ||
| 105 | |||
| 106 | return 0; | ||
| 107 | } | ||
| 108 | EXPORT_SYMBOL_GPL(led_classdev_register); | ||
| 109 | |||
| 110 | /** | ||
| 111 | * led_classdev_unregister - unregisters a object of led_properties class. | ||
| 112 | * @led_cdev: the led device to unreigister | ||
| 113 | * | ||
| 114 | * Unregisters a previously registered via led_classdev_register object. | ||
| 115 | */ | ||
| 116 | void led_classdev_unregister(struct led_classdev *led_cdev) | ||
| 117 | { | ||
| 118 | class_device_remove_file(led_cdev->class_dev, | ||
| 119 | &class_device_attr_brightness); | ||
| 120 | |||
| 121 | class_device_unregister(led_cdev->class_dev); | ||
| 122 | |||
| 123 | write_lock(&leds_list_lock); | ||
| 124 | list_del(&led_cdev->node); | ||
| 125 | write_unlock(&leds_list_lock); | ||
| 126 | } | ||
| 127 | EXPORT_SYMBOL_GPL(led_classdev_unregister); | ||
| 128 | |||
| 129 | static int __init leds_init(void) | ||
| 130 | { | ||
| 131 | leds_class = class_create(THIS_MODULE, "leds"); | ||
| 132 | if (IS_ERR(leds_class)) | ||
| 133 | return PTR_ERR(leds_class); | ||
| 134 | return 0; | ||
| 135 | } | ||
| 136 | |||
| 137 | static void __exit leds_exit(void) | ||
| 138 | { | ||
| 139 | class_destroy(leds_class); | ||
| 140 | } | ||
| 141 | |||
| 142 | subsys_initcall(leds_init); | ||
| 143 | module_exit(leds_exit); | ||
| 144 | |||
| 145 | MODULE_AUTHOR("John Lenz, Richard Purdie"); | ||
| 146 | MODULE_LICENSE("GPL"); | ||
| 147 | MODULE_DESCRIPTION("LED Class Interface"); | ||
diff --git a/drivers/leds/led-core.c b/drivers/leds/led-core.c new file mode 100644 index 000000000000..fe6541326c71 --- /dev/null +++ b/drivers/leds/led-core.c | |||
| @@ -0,0 +1,25 @@ | |||
| 1 | /* | ||
| 2 | * LED Class Core | ||
| 3 | * | ||
| 4 | * Copyright 2005-2006 Openedhand Ltd. | ||
| 5 | * | ||
| 6 | * Author: Richard Purdie <rpurdie@openedhand.com> | ||
| 7 | * | ||
| 8 | * This program is free software; you can redistribute it and/or modify | ||
| 9 | * it under the terms of the GNU General Public License version 2 as | ||
| 10 | * published by the Free Software Foundation. | ||
| 11 | * | ||
| 12 | */ | ||
| 13 | |||
| 14 | #include <linux/kernel.h> | ||
| 15 | #include <linux/list.h> | ||
| 16 | #include <linux/module.h> | ||
| 17 | #include <linux/spinlock.h> | ||
| 18 | #include <linux/leds.h> | ||
| 19 | #include "leds.h" | ||
| 20 | |||
| 21 | rwlock_t leds_list_lock = RW_LOCK_UNLOCKED; | ||
| 22 | LIST_HEAD(leds_list); | ||
| 23 | |||
| 24 | EXPORT_SYMBOL_GPL(leds_list); | ||
| 25 | EXPORT_SYMBOL_GPL(leds_list_lock); | ||
diff --git a/drivers/leds/leds.h b/drivers/leds/leds.h new file mode 100644 index 000000000000..d26ca2f7e722 --- /dev/null +++ b/drivers/leds/leds.h | |||
| @@ -0,0 +1,31 @@ | |||
| 1 | /* | ||
| 2 | * LED Core | ||
| 3 | * | ||
| 4 | * Copyright 2005 Openedhand Ltd. | ||
| 5 | * | ||
| 6 | * Author: Richard Purdie <rpurdie@openedhand.com> | ||
| 7 | * | ||
| 8 | * This program is free software; you can redistribute it and/or modify | ||
| 9 | * it under the terms of the GNU General Public License version 2 as | ||
| 10 | * published by the Free Software Foundation. | ||
| 11 | * | ||
| 12 | */ | ||
| 13 | #ifndef __LEDS_H_INCLUDED | ||
| 14 | #define __LEDS_H_INCLUDED | ||
| 15 | |||
| 16 | #include <linux/leds.h> | ||
| 17 | |||
| 18 | static inline void led_set_brightness(struct led_classdev *led_cdev, | ||
| 19 | enum led_brightness value) | ||
| 20 | { | ||
| 21 | if (value > LED_FULL) | ||
| 22 | value = LED_FULL; | ||
| 23 | led_cdev->brightness = value; | ||
| 24 | if (!(led_cdev->flags & LED_SUSPENDED)) | ||
| 25 | led_cdev->brightness_set(led_cdev, value); | ||
| 26 | } | ||
| 27 | |||
| 28 | extern rwlock_t leds_list_lock; | ||
| 29 | extern struct list_head leds_list; | ||
| 30 | |||
| 31 | #endif /* __LEDS_H_INCLUDED */ | ||
diff --git a/include/linux/leds.h b/include/linux/leds.h new file mode 100644 index 000000000000..6812640b39cc --- /dev/null +++ b/include/linux/leds.h | |||
| @@ -0,0 +1,51 @@ | |||
| 1 | /* | ||
| 2 | * Driver model for leds and led triggers | ||
| 3 | * | ||
| 4 | * Copyright (C) 2005 John Lenz <lenz@cs.wisc.edu> | ||
| 5 | * Copyright (C) 2005 Richard Purdie <rpurdie@openedhand.com> | ||
| 6 | * | ||
| 7 | * This program is free software; you can redistribute it and/or modify | ||
| 8 | * it under the terms of the GNU General Public License version 2 as | ||
| 9 | * published by the Free Software Foundation. | ||
| 10 | * | ||
| 11 | */ | ||
| 12 | #ifndef __LINUX_LEDS_H_INCLUDED | ||
| 13 | #define __LINUX_LEDS_H_INCLUDED | ||
| 14 | |||
| 15 | struct device; | ||
| 16 | struct class_device; | ||
| 17 | /* | ||
| 18 | * LED Core | ||
| 19 | */ | ||
| 20 | |||
| 21 | enum led_brightness { | ||
| 22 | LED_OFF = 0, | ||
| 23 | LED_HALF = 127, | ||
| 24 | LED_FULL = 255, | ||
| 25 | }; | ||
| 26 | |||
| 27 | struct led_classdev { | ||
| 28 | const char *name; | ||
| 29 | int brightness; | ||
| 30 | int flags; | ||
| 31 | #define LED_SUSPENDED (1 << 0) | ||
| 32 | |||
| 33 | /* A function to set the brightness of the led */ | ||
| 34 | void (*brightness_set)(struct led_classdev *led_cdev, | ||
| 35 | enum led_brightness brightness); | ||
| 36 | |||
| 37 | struct class_device *class_dev; | ||
| 38 | /* LED Device linked list */ | ||
| 39 | struct list_head node; | ||
| 40 | |||
| 41 | /* Trigger data */ | ||
| 42 | char *default_trigger; | ||
| 43 | }; | ||
| 44 | |||
| 45 | extern int led_classdev_register(struct device *parent, | ||
| 46 | struct led_classdev *led_cdev); | ||
| 47 | extern void led_classdev_unregister(struct led_classdev *led_cdev); | ||
| 48 | extern void led_classdev_suspend(struct led_classdev *led_cdev); | ||
| 49 | extern void led_classdev_resume(struct led_classdev *led_cdev); | ||
| 50 | |||
| 51 | #endif /* __LINUX_LEDS_H_INCLUDED */ | ||
