summaryrefslogtreecommitdiff
path: root/include/uapi
diff options
context:
space:
mode:
authorDaniel Jeong <gshark.jeong@gmail.com>2014-03-03 06:52:08 -0300
committerChanho Park <chanho61.park@samsung.com>2014-11-18 11:54:56 +0900
commitb20892e42c5426ba7b7934dd89e5ade875be8b86 (patch)
treeb5b901898313a5fca82cd4862b96804627c86201 /include/uapi
parentc0a41289f7645dc5e39e3a7d4186bd96944254f1 (diff)
downloadlinux-3.10-b20892e42c5426ba7b7934dd89e5ade875be8b86.tar.gz
linux-3.10-b20892e42c5426ba7b7934dd89e5ade875be8b86.tar.bz2
linux-3.10-b20892e42c5426ba7b7934dd89e5ade875be8b86.zip
upstream: [media] v4l2-controls.h: Add addtional Flash fault bits
Three Flash fault are added. V4L2_FLASH_FAULT_UNDER_VOLTAGE for the case low voltage below the min. limit. V4L2_FLASH_FAULT_INPUT_VOLTAGE for the case falling input voltage and chip adjust flash current not occur under voltage event. V4L2_FLASH_FAULT_LED_OVER_TEMPERATURE for the case the temperature exceed the maximun limit Signed-off-by: Daniel Jeong <gshark.jeong@gmail.com> Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'include/uapi')
-rw-r--r--include/uapi/linux/v4l2-controls.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h
index 5934241b590..58a8a348062 100644
--- a/include/uapi/linux/v4l2-controls.h
+++ b/include/uapi/linux/v4l2-controls.h
@@ -806,6 +806,9 @@ enum v4l2_flash_strobe_source {
#define V4L2_FLASH_FAULT_SHORT_CIRCUIT (1 << 3)
#define V4L2_FLASH_FAULT_OVER_CURRENT (1 << 4)
#define V4L2_FLASH_FAULT_INDICATOR (1 << 5)
+#define V4L2_FLASH_FAULT_UNDER_VOLTAGE (1 << 6)
+#define V4L2_FLASH_FAULT_INPUT_VOLTAGE (1 << 7)
+#define V4L2_FLASH_FAULT_LED_OVER_TEMPERATURE (1 << 8)
#define V4L2_CID_FLASH_CHARGE (V4L2_CID_FLASH_CLASS_BASE + 11)
#define V4L2_CID_FLASH_READY (V4L2_CID_FLASH_CLASS_BASE + 12)