diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2011-06-10 12:23:30 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-12-20 09:32:48 -0200 |
| commit | a597fa78d374c57dcf9a9bac02472a530cd7e60a (patch) | |
| tree | 35c9a7794e3473fc33f4e4eaf7f9a6afef0d678e | |
| parent | fa5034c667c224be48db31a0d043dba305e8e7a8 (diff) | |
| download | linux-3.10-a597fa78d374c57dcf9a9bac02472a530cd7e60a.tar.gz linux-3.10-a597fa78d374c57dcf9a9bac02472a530cd7e60a.tar.bz2 linux-3.10-a597fa78d374c57dcf9a9bac02472a530cd7e60a.zip | |
[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 9e72f077329..c0422c62233 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> <entry>The short circuit protection of the flash controller has been triggered.</entry> </row> + <row> + <entry><constant>V4L2_FLASH_FAULT_OVER_CURRENT</constant></entry> + <entry>Current in the LED power supply has exceeded the limit + specific to the flash controller.</entry> + </row> + <row> + <entry><constant>V4L2_FLASH_FAULT_INDICATOR</constant></entry> + <entry>The flash controller has detected a short or open + circuit condition on the indicator LED.</entry> + </row> </tbody> </entrytbl> </row> diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h index 4b752d5ee80..3d62631839b 100644 --- a/include/linux/videodev2.h +++ b/include/linux/videodev2.h @@ -1682,6 +1682,8 @@ enum v4l2_flash_strobe_source { #define V4L2_FLASH_FAULT_TIMEOUT (1 << 1) #define V4L2_FLASH_FAULT_OVER_TEMPERATURE (1 << 2) #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_CID_FLASH_CHARGE (V4L2_CID_FLASH_CLASS_BASE + 11) #define V4L2_CID_FLASH_READY (V4L2_CID_FLASH_CLASS_BASE + 12) |