From 2ca1c9f1424ad81c20461184be9fcab4cb97b4d6 Mon Sep 17 00:00:00 2001
From: "Kim, Milo" <Milo.Kim@ti.com>
Date: Thu, 14 Mar 2013 04:29:24 -0700
Subject: [PATCH] --- yaml --- r: 373663 b: refs/heads/master c:
 48a1d032c954b9b06c3adbf35ef4735dd70ab757 h: refs/heads/master i:   373661:
 97025713199941855461b88f5c46d88f511c6702   373659:
 e99cdf365d02636fe0bf0ac66bc1383ba53be905   373655:
 6d4bececa7736b52de46c61df171acab59c18616   373647:
 c7d4f4fdfffe86853511e77f2263aeed828c9126   373631:
 997ec41a31e2a195ccc2ee32daf98c287b2d3da7 v: v3

---
 [refs]                                      |  2 +-
 trunk/drivers/leds/trigger/Kconfig          |  8 +++
 trunk/drivers/leds/trigger/Makefile         |  1 +
 trunk/drivers/leds/trigger/ledtrig-camera.c | 57 +++++++++++++++++++++
 trunk/include/linux/leds.h                  |  8 +++
 5 files changed, 75 insertions(+), 1 deletion(-)
 create mode 100644 trunk/drivers/leds/trigger/ledtrig-camera.c

diff --git a/[refs] b/[refs]
index 0e478d5aa606..7b2a774834af 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 39f7e08af3fd9ca1cb94a8270354afb2ea5cfcd3
+refs/heads/master: 48a1d032c954b9b06c3adbf35ef4735dd70ab757
diff --git a/trunk/drivers/leds/trigger/Kconfig b/trunk/drivers/leds/trigger/Kconfig
index eaa286dc494e..49794b47b51c 100644
--- a/trunk/drivers/leds/trigger/Kconfig
+++ b/trunk/drivers/leds/trigger/Kconfig
@@ -100,4 +100,12 @@ config LEDS_TRIGGER_TRANSIENT
 	  GPIO/PWM based hardware.
 	  If unsure, say Y.
 
+config LEDS_TRIGGER_CAMERA
+	tristate "LED Camera Flash/Torch Trigger"
+	depends on LEDS_TRIGGERS
+	help
+	  This allows LEDs to be controlled as a camera flash/torch device.
+	  This enables direct flash/torch on/off by the driver, kernel space.
+	  If unsure, say Y.
+
 endif # LEDS_TRIGGERS
diff --git a/trunk/drivers/leds/trigger/Makefile b/trunk/drivers/leds/trigger/Makefile
index 554e46ee4c24..1abf48dacf7e 100644
--- a/trunk/drivers/leds/trigger/Makefile
+++ b/trunk/drivers/leds/trigger/Makefile
@@ -7,3 +7,4 @@ obj-$(CONFIG_LEDS_TRIGGER_GPIO)		+= ledtrig-gpio.o
 obj-$(CONFIG_LEDS_TRIGGER_CPU)		+= ledtrig-cpu.o
 obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON)	+= ledtrig-default-on.o
 obj-$(CONFIG_LEDS_TRIGGER_TRANSIENT)	+= ledtrig-transient.o
+obj-$(CONFIG_LEDS_TRIGGER_CAMERA)	+= ledtrig-camera.o
diff --git a/trunk/drivers/leds/trigger/ledtrig-camera.c b/trunk/drivers/leds/trigger/ledtrig-camera.c
new file mode 100644
index 000000000000..9bd73a8bad5c
--- /dev/null
+++ b/trunk/drivers/leds/trigger/ledtrig-camera.c
@@ -0,0 +1,57 @@
+/*
+ * Camera Flash and Torch On/Off Trigger
+ *
+ * based on ledtrig-ide-disk.c
+ *
+ * Copyright 2013 Texas Instruments
+ *
+ * Author: Milo(Woogyom) Kim <milo.kim@ti.com>
+ *
+ * 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 <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/leds.h>
+
+DEFINE_LED_TRIGGER(ledtrig_flash);
+DEFINE_LED_TRIGGER(ledtrig_torch);
+
+void ledtrig_flash_ctrl(bool on)
+{
+	enum led_brightness brt = on ? LED_FULL : LED_OFF;
+
+	led_trigger_event(ledtrig_flash, brt);
+}
+EXPORT_SYMBOL_GPL(ledtrig_flash_ctrl);
+
+void ledtrig_torch_ctrl(bool on)
+{
+	enum led_brightness brt = on ? LED_FULL : LED_OFF;
+
+	led_trigger_event(ledtrig_torch, brt);
+}
+EXPORT_SYMBOL_GPL(ledtrig_torch_ctrl);
+
+static int __init ledtrig_camera_init(void)
+{
+	led_trigger_register_simple("flash", &ledtrig_flash);
+	led_trigger_register_simple("torch", &ledtrig_torch);
+	return 0;
+}
+module_init(ledtrig_camera_init);
+
+static void __exit ledtrig_camera_exit(void)
+{
+	led_trigger_unregister_simple(ledtrig_torch);
+	led_trigger_unregister_simple(ledtrig_flash);
+}
+module_exit(ledtrig_camera_exit);
+
+MODULE_DESCRIPTION("LED Trigger for Camera Flash/Torch Control");
+MODULE_AUTHOR("Milo Kim");
+MODULE_LICENSE("GPL");
diff --git a/trunk/include/linux/leds.h b/trunk/include/linux/leds.h
index 2d8c0b4f2f76..0287ab296689 100644
--- a/trunk/include/linux/leds.h
+++ b/trunk/include/linux/leds.h
@@ -218,6 +218,14 @@ extern void ledtrig_ide_activity(void);
 static inline void ledtrig_ide_activity(void) {}
 #endif
 
+#if defined(CONFIG_LEDS_TRIGGER_CAMERA) || defined(CONFIG_LEDS_TRIGGER_CAMERA_MODULE)
+extern void ledtrig_flash_ctrl(bool on);
+extern void ledtrig_torch_ctrl(bool on);
+#else
+static inline void ledtrig_flash_ctrl(bool on) {}
+static inline void ledtrig_torch_ctrl(bool on) {}
+#endif
+
 /*
  * Generic LED platform data for describing LED names and default triggers.
  */