diff options
author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2011-06-10 11:23:30 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-12-20 06:32:48 -0500 |
commit | a597fa78d374c57dcf9a9bac02472a530cd7e60a (patch) | |
tree | 35c9a7794e3473fc33f4e4eaf7f9a6afef0d678e | |
parent | fa5034c667c224be48db31a0d043dba305e8e7a8 (diff) |
[media] v4l: Add over-current and indicator flash fault bits
Flash controllers can report over-current and indicator fault
conditions. Define flash fault control bits for them.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Sakari Ailus <sakari.ailus@maxwell.research.nokia.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r-- | Documentation/DocBook/media/v4l/controls.xml | 10 | ||||
-rw-r--r-- | include/linux/videodev2.h | 2 |
2 files changed, 12 insertions, 0 deletions
diff --git a/Documentation/DocBook/media/v4l/controls.xml b/Documentation/DocBook/media/v4l/controls.xml index 9e72f077329a..c0422c622337 100644 --- a/Documentation/DocBook/media/v4l/controls.xml +++ b/Documentation/DocBook/media/v4l/controls.xml | |||
@@ -3329,6 +3329,16 @@ interface and may change in the future.</para> | |||
3329 | <entry>The short circuit protection of the flash | 3329 | <entry>The short circuit protection of the flash |
3330 | controller has been triggered.</entry> | 3330 | controller has been triggered.</entry> |
3331 | </row> | 3331 | </row> |
3332 | <row> | ||
3333 | <entry><constant>V4L2_FLASH_FAULT_OVER_CURRENT</constant></entry> | ||
3334 | <entry>Current in the LED power supply has exceeded the limit | ||
3335 | specific to the flash controller.</entry> | ||
3336 | </row> | ||
3337 | <row> | ||
3338 | <entry><constant>V4L2_FLASH_FAULT_INDICATOR</constant></entry> | ||
3339 | <entry>The flash controller has detected a short or open | ||
3340 | circuit condition on the indicator LED.</entry> | ||
3341 | </row> | ||
3332 | </tbody> | 3342 | </tbody> |
3333 | </entrytbl> | 3343 | </entrytbl> |
3334 | </row> | 3344 | </row> |
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h index 4b752d5ee80e..3d62631839bc 100644 --- a/include/linux/videodev2.h +++ b/include/linux/videodev2.h | |||
@@ -1682,6 +1682,8 @@ enum v4l2_flash_strobe_source { | |||
1682 | #define V4L2_FLASH_FAULT_TIMEOUT (1 << 1) | 1682 | #define V4L2_FLASH_FAULT_TIMEOUT (1 << 1) |
1683 | #define V4L2_FLASH_FAULT_OVER_TEMPERATURE (1 << 2) | 1683 | #define V4L2_FLASH_FAULT_OVER_TEMPERATURE (1 << 2) |
1684 | #define V4L2_FLASH_FAULT_SHORT_CIRCUIT (1 << 3) | 1684 | #define V4L2_FLASH_FAULT_SHORT_CIRCUIT (1 << 3) |
1685 | #define V4L2_FLASH_FAULT_OVER_CURRENT (1 << 4) | ||
1686 | #define V4L2_FLASH_FAULT_INDICATOR (1 << 5) | ||
1685 | 1687 | ||
1686 | #define V4L2_CID_FLASH_CHARGE (V4L2_CID_FLASH_CLASS_BASE + 11) | 1688 | #define V4L2_CID_FLASH_CHARGE (V4L2_CID_FLASH_CLASS_BASE + 11) |
1687 | #define V4L2_CID_FLASH_READY (V4L2_CID_FLASH_CLASS_BASE + 12) | 1689 | #define V4L2_CID_FLASH_READY (V4L2_CID_FLASH_CLASS_BASE + 12) |