2 files changed, 77 insertions, 2 deletions

diff --git a/include/linux/leds.h b/include/linux/leds.h
index 39eee41d8c6f..3aade1d8f410 100644
--- a/include/linux/leds.h
+++ b/include/linux/leds.h
@@ -38,6 +38,9 @@ struct led_classdev {
 #define LED_SUSPENDED           (1 << 0)
         /* Upper 16 bits reflect control information */
 #define LED_CORE_SUSPENDRESUME  (1 << 16)
+#define LED_BLINK_ONESHOT       (1 << 17)
+#define LED_BLINK_ONESHOT_STOP  (1 << 18)
+#define LED_BLINK_INVERT        (1 << 19)
 
         /* Set LED brightness level */
         /* Must not sleep, use a workqueue if needed */
@@ -103,7 +106,25 @@ extern void led_blink_set(struct led_classdev *led_cdev,
                           unsigned long *delay_on,
                           unsigned long *delay_off);
 /**
- * led_brightness_set - set LED brightness
+ * led_blink_set_oneshot - do a oneshot software blink
+ * @led_cdev: the LED to start blinking
+ * @delay_on: the time it should be on (in ms)
+ * @delay_off: the time it should ble off (in ms)
+ * @invert: blink off, then on, leaving the led on
+ *
+ * This function makes the LED blink one time for delay_on +
+ * delay_off time, ignoring the request if another one-shot
+ * blink is already in progress.
+ *
+ * If invert is set, led blinks for delay_off first, then for
+ * delay_on and leave the led on after the on-off cycle.
+ */
+extern void led_blink_set_oneshot(struct led_classdev *led_cdev,
+                                  unsigned long *delay_on,
+                                  unsigned long *delay_off,
+                                  int invert);
+/**
+ * led_set_brightness - set LED brightness
  * @led_cdev: the LED to set
  * @brightness: the brightness to set it to
  *
@@ -111,7 +132,7 @@ extern void led_blink_set(struct led_classdev *led_cdev,
  * software blink timer that implements blinking when the
  * hardware doesn't.
  */
-extern void led_brightness_set(struct led_classdev *led_cdev,
+extern void led_set_brightness(struct led_classdev *led_cdev,
                                enum led_brightness brightness);
 
 /*
@@ -150,6 +171,10 @@ extern void led_trigger_event(struct led_trigger *trigger,
 extern void led_trigger_blink(struct led_trigger *trigger,
                               unsigned long *delay_on,
                               unsigned long *delay_off);
+extern void led_trigger_blink_oneshot(struct led_trigger *trigger,
+                                      unsigned long *delay_on,
+                                      unsigned long *delay_off,
+                                      int invert);
 
 #else
 
diff --git a/include/linux/platform_data/leds-lm3556.h b/include/linux/platform_data/leds-lm3556.h
new file mode 100644
index 000000000000..4b4e7d6b0527
--- /dev/null
+++ b/include/linux/platform_data/leds-lm3556.h
@@ -0,0 +1,50 @@
+/*
+ * Simple driver for Texas Instruments LM3556 LED Flash driver chip (Rev0x03)
+ * Copyright (C) 2012 Texas Instruments
+ *
+ * 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.
+ *
+ */
+
+#ifndef __LINUX_LM3556_H
+#define __LINUX_LM3556_H
+
+#define LM3556_NAME "leds-lm3556"
+
+enum lm3556_pin_polarity {
+        PIN_LOW_ACTIVE = 0,
+        PIN_HIGH_ACTIVE,
+};
+
+enum lm3556_pin_enable {
+        PIN_DISABLED = 0,
+        PIN_ENABLED,
+};
+
+enum lm3556_strobe_usuage {
+        STROBE_EDGE_DETECT = 0,
+        STROBE_LEVEL_DETECT,
+};
+
+enum lm3556_indic_mode {
+        INDIC_MODE_INTERNAL = 0,
+        INDIC_MODE_EXTERNAL,
+};
+
+struct lm3556_platform_data {
+        enum lm3556_pin_enable torch_pin_en;
+        enum lm3556_pin_polarity torch_pin_polarity;
+
+        enum lm3556_strobe_usuage strobe_usuage;
+        enum lm3556_pin_enable strobe_pin_en;
+        enum lm3556_pin_polarity strobe_pin_polarity;
+
+        enum lm3556_pin_enable tx_pin_en;
+        enum lm3556_pin_polarity tx_pin_polarity;
+
+        enum lm3556_indic_mode indicator_mode;
+};
+
+#endif /* __LINUX_LM3556_H */