git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
NOMMU: Fallback for is_vmalloc_or_module_addr() should be inline
[safe/jmp/linux-2.6]
/
include
/
linux
/
leds.h
diff --git
a/include/linux/leds.h
b/include/linux/leds.h
index
3c1a8ce
..
d8bf966
100644
(file)
--- a/
include/linux/leds.h
+++ b/
include/linux/leds.h
@@
-30,9
+30,13
@@
enum led_brightness {
struct led_classdev {
const char *name;
int brightness;
struct led_classdev {
const char *name;
int brightness;
+ int max_brightness;
int flags;
int flags;
+ /* Lower 16 bits reflect status */
#define LED_SUSPENDED (1 << 0)
#define LED_SUSPENDED (1 << 0)
+ /* Upper 16 bits reflect control information */
+#define LED_CORE_SUSPENDRESUME (1 << 16)
/* Set LED brightness level */
/* Must not sleep, use a workqueue if needed */
/* Set LED brightness level */
/* Must not sleep, use a workqueue if needed */
@@
-41,7
+45,10
@@
struct led_classdev {
/* Get LED brightness level */
enum led_brightness (*brightness_get)(struct led_classdev *led_cdev);
/* Get LED brightness level */
enum led_brightness (*brightness_get)(struct led_classdev *led_cdev);
- /* Activate hardware accelerated blink */
+ /* Activate hardware accelerated blink, delays are in
+ * miliseconds and if none is provided then a sensible default
+ * should be chosen. The call can adjust the timings if it can't
+ * match the values specified exactly. */
int (*blink_set)(struct led_classdev *led_cdev,
unsigned long *delay_on,
unsigned long *delay_off);
int (*blink_set)(struct led_classdev *led_cdev,
unsigned long *delay_on,
unsigned long *delay_off);
@@
-137,8
+144,14
@@
struct gpio_led {
const char *name;
const char *default_trigger;
unsigned gpio;
const char *name;
const char *default_trigger;
unsigned gpio;
- u8 active_low;
+ unsigned active_low : 1;
+ unsigned retain_state_suspended : 1;
+ unsigned default_state : 2;
+ /* default_state should be one of LEDS_GPIO_DEFSTATE_(ON|OFF|KEEP) */
};
};
+#define LEDS_GPIO_DEFSTATE_OFF 0
+#define LEDS_GPIO_DEFSTATE_ON 1
+#define LEDS_GPIO_DEFSTATE_KEEP 2
struct gpio_led_platform_data {
int num_leds;
struct gpio_led_platform_data {
int num_leds;