Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a597fa78 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

[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: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: default avatarSakari Ailus <sakari.ailus@maxwell.research.nokia.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent fa5034c6

Documentation/DocBook/media/v4l/controls.xml

+10 −0
Original line number Original line Diff line number Diff line
@@ -3329,6 +3329,16 @@ interface and may change in the future.</para> 
		  <entry>The short circuit protection of the flash

		  <entry>The short circuit protection of the flash

		  controller has been triggered.</entry>

		  controller has been triggered.</entry>

		</row>

		</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>

	      </tbody>

	    </entrytbl>

	    </entrytbl>

	  </row>

	  </row>

include/linux/videodev2.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -1682,6 +1682,8 @@ enum v4l2_flash_strobe_source { 
#define V4L2_FLASH_FAULT_TIMEOUT		(1 << 1)

#define V4L2_FLASH_FAULT_TIMEOUT		(1 << 1)

#define V4L2_FLASH_FAULT_OVER_TEMPERATURE	(1 << 2)

#define V4L2_FLASH_FAULT_OVER_TEMPERATURE	(1 << 2)

#define V4L2_FLASH_FAULT_SHORT_CIRCUIT		(1 << 3)

#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_CHARGE			(V4L2_CID_FLASH_CLASS_BASE + 11)

#define V4L2_CID_FLASH_READY			(V4L2_CID_FLASH_CLASS_BASE + 12)

#define V4L2_CID_FLASH_READY			(V4L2_CID_FLASH_CLASS_BASE + 12)