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

Commit a66d05d5 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

Merge branch 'patchwork' into v4l_for_linus 

* patchwork: (544 commits)
  [media] ir-hix5hd2: fix build on c6x arch
  [media] pt3: fix DTV FE I2C driver load error paths
  Revert "[media] media: em28xx - remove reset_resume interface"
  [media] exynos4-is: fix some warnings when compiling on arm64
  [media] usb drivers: use %zu instead of %zd
  [media] pci drivers: use %zu instead of %zd
  [media] dvb-frontends: use %zu instead of %zd
  [media] s5p-mfc: Fix several printk warnings
  [media] s5p_mfc_opr: Fix warnings
  [media] ti-vpe: Fix typecast
  [media] s3c-camif: fix dma_addr_t printks
  [media] s5p_mfc_opr_v6: get rid of warnings when compiled with 64 bits
  [media] s5p_mfc_opr_v5: Fix lots of warnings on x86_64
  [media] em28xx: Fix identation
  [media] drxd: remove a dead code
  [media] saa7146: remove return after BUG()
  [media] cx88: remove return after BUG()
  [media] cx88: fix cards table CodingStyle
  [media] radio-sf16fmr2: declare some structs as static
  [media] radio-sf16fmi: declare pnp_attached as static
  ...

Conflicts:
	Documentation/DocBook/media/v4l/compat.xml
parents bfe01a5b 5563caaf

Documentation/DocBook/media/v4l/compat.xml

+6 −0
Original line number Diff line number Diff line
@@ -2566,6 +2566,12 @@ fields changed from _s32 to _u32. 
	  <para>Added compound control types and &VIDIOC-QUERY-EXT-CTRL;.

	  </para>

        </listitem>

      <title>V4L2 in Linux 3.18</title>

      <orderedlist>

	<listitem>

	  <para>Added <constant>V4L2_CID_PAN_SPEED</constant> and

 <constant>V4L2_CID_TILT_SPEED</constant> camera controls.</para>

	</listitem>

      </orderedlist>

    </section>

Documentation/DocBook/media/v4l/controls.xml

+55 −0
Original line number Diff line number Diff line
@@ -3965,6 +3965,27 @@ by exposure, white balance or focus controls.</entry> 
	  </row>

	  <row><entry></entry></row>



	  <row>

	    <entry spanname="id"><constant>V4L2_CID_PAN_SPEED</constant>&nbsp;</entry>

	    <entry>integer</entry>

	  </row><row><entry spanname="descr">This control turns the

camera horizontally at the specific speed. The unit is undefined. A

positive value moves the camera to the right (clockwise when viewed

from above), a negative value to the left. A value of zero stops the motion

if one is in progress and has no effect otherwise.</entry>

	  </row>

	  <row><entry></entry></row>



	  <row>

	    <entry spanname="id"><constant>V4L2_CID_TILT_SPEED</constant>&nbsp;</entry>

	    <entry>integer</entry>

	  </row><row><entry spanname="descr">This control turns the

camera vertically at the specified speed. The unit is undefined. A

positive value moves the camera up, a negative value down. A value of zero

stops the motion if one is in progress and has no effect otherwise.</entry>

	  </row>

	  <row><entry></entry></row>



	</tbody>

      </tgroup>

    </table>
@@ -4790,6 +4811,40 @@ interface and may change in the future.</para> 
	    conversion.

	    </entry>

	  </row>

	  <row>

	    <entry spanname="id"><constant>V4L2_CID_TEST_PATTERN_RED</constant></entry>

	    <entry>integer</entry>

	  </row>

	  <row>

	    <entry spanname="descr">Test pattern red colour component.

	    </entry>

	  </row>

	  <row>

	    <entry spanname="id"><constant>V4L2_CID_TEST_PATTERN_GREENR</constant></entry>

	    <entry>integer</entry>

	  </row>

	  <row>

	    <entry spanname="descr">Test pattern green (next to red)

	    colour component.

	    </entry>

	  </row>

	  <row>

	    <entry spanname="id"><constant>V4L2_CID_TEST_PATTERN_BLUE</constant></entry>

	    <entry>integer</entry>

	  </row>

	  <row>

	    <entry spanname="descr">Test pattern blue colour component.

	    </entry>

	  </row>

	  <row>

	    <entry spanname="id"><constant>V4L2_CID_TEST_PATTERN_GREENB</constant></entry>

	    <entry>integer</entry>

	  </row>

	  <row>

	    <entry spanname="descr">Test pattern green (next to blue)

	    colour component.

	    </entry>

	  </row>

	  <row><entry></entry></row>

	</tbody>

      </tgroup>

Documentation/DocBook/media/v4l/pixfmt-packed-rgb.xml

+48 −4
Original line number Diff line number Diff line
@@ -237,9 +237,9 @@ for a pixel lie next to each other in memory.</para> 
	    <entry>g<subscript>4</subscript></entry>

	    <entry>g<subscript>3</subscript></entry>

	  </row>

	  <row id="V4L2-PIX-FMT-RGB555X">

	    <entry><constant>V4L2_PIX_FMT_RGB555X</constant></entry>

	    <entry>'RGBQ'</entry>

	  <row id="V4L2-PIX-FMT-ARGB555X">

	    <entry><constant>V4L2_PIX_FMT_ARGB555X</constant></entry>

	    <entry>'AR15' | (1 &lt;&lt; 31)</entry>

	    <entry></entry>

	    <entry>a</entry>

	    <entry>r<subscript>4</subscript></entry>
@@ -259,6 +259,28 @@ for a pixel lie next to each other in memory.</para> 
	    <entry>b<subscript>1</subscript></entry>

	    <entry>b<subscript>0</subscript></entry>

	  </row>

	  <row id="V4L2-PIX-FMT-XRGB555X">

	    <entry><constant>V4L2_PIX_FMT_XRGB555X</constant></entry>

	    <entry>'XR15' | (1 &lt;&lt; 31)</entry>

	    <entry></entry>

	    <entry>-</entry>

	    <entry>r<subscript>4</subscript></entry>

	    <entry>r<subscript>3</subscript></entry>

	    <entry>r<subscript>2</subscript></entry>

	    <entry>r<subscript>1</subscript></entry>

	    <entry>r<subscript>0</subscript></entry>

	    <entry>g<subscript>4</subscript></entry>

	    <entry>g<subscript>3</subscript></entry>

	    <entry></entry>

	    <entry>g<subscript>2</subscript></entry>

	    <entry>g<subscript>1</subscript></entry>

	    <entry>g<subscript>0</subscript></entry>

	    <entry>b<subscript>4</subscript></entry>

	    <entry>b<subscript>3</subscript></entry>

	    <entry>b<subscript>2</subscript></entry>

	    <entry>b<subscript>1</subscript></entry>

	    <entry>b<subscript>0</subscript></entry>

	  </row>

	  <row id="V4L2-PIX-FMT-RGB565X">

	    <entry><constant>V4L2_PIX_FMT_RGB565X</constant></entry>

	    <entry>'RGBR'</entry>
@@ -464,7 +486,7 @@ for a pixel lie next to each other in memory.</para> 
	  </row>

	  <row id="V4L2-PIX-FMT-ARGB32">

	    <entry><constant>V4L2_PIX_FMT_ARGB32</constant></entry>

	    <entry>'AX24'</entry>

	    <entry>'BA24'</entry>

	    <entry></entry>

	    <entry>a<subscript>7</subscript></entry>

	    <entry>a<subscript>6</subscript></entry>
@@ -800,6 +822,28 @@ image</title> 
	    <entry>g<subscript>4</subscript></entry>

	    <entry>g<subscript>3</subscript></entry>

	  </row>

	  <row id="V4L2-PIX-FMT-RGB555X">

	    <entry><constant>V4L2_PIX_FMT_RGB555X</constant></entry>

	    <entry>'RGBQ'</entry>

	    <entry></entry>

	    <entry>a</entry>

	    <entry>r<subscript>4</subscript></entry>

	    <entry>r<subscript>3</subscript></entry>

	    <entry>r<subscript>2</subscript></entry>

	    <entry>r<subscript>1</subscript></entry>

	    <entry>r<subscript>0</subscript></entry>

	    <entry>g<subscript>4</subscript></entry>

	    <entry>g<subscript>3</subscript></entry>

	    <entry></entry>

	    <entry>g<subscript>2</subscript></entry>

	    <entry>g<subscript>1</subscript></entry>

	    <entry>g<subscript>0</subscript></entry>

	    <entry>b<subscript>4</subscript></entry>

	    <entry>b<subscript>3</subscript></entry>

	    <entry>b<subscript>2</subscript></entry>

	    <entry>b<subscript>1</subscript></entry>

	    <entry>b<subscript>0</subscript></entry>

	  </row>

	  <row id="V4L2-PIX-FMT-BGR32">

	    <entry><constant>V4L2_PIX_FMT_BGR32</constant></entry>

	    <entry>'BGR4'</entry>

Documentation/DocBook/media/v4l/vidioc-dqevent.xml

+4 −3
Original line number Diff line number Diff line
@@ -76,21 +76,22 @@ 
	    <entry></entry>

	    <entry>&v4l2-event-vsync;</entry>

            <entry><structfield>vsync</structfield></entry>

	    <entry>Event data for event V4L2_EVENT_VSYNC.

	    <entry>Event data for event <constant>V4L2_EVENT_VSYNC</constant>.

            </entry>

	  </row>

	  <row>

	    <entry></entry>

	    <entry>&v4l2-event-ctrl;</entry>

            <entry><structfield>ctrl</structfield></entry>

	    <entry>Event data for event V4L2_EVENT_CTRL.

	    <entry>Event data for event <constant>V4L2_EVENT_CTRL</constant>.

            </entry>

	  </row>

	  <row>

	    <entry></entry>

	    <entry>&v4l2-event-frame-sync;</entry>

            <entry><structfield>frame_sync</structfield></entry>

	    <entry>Event data for event V4L2_EVENT_FRAME_SYNC.</entry>

	    <entry>Event data for event

	    <constant>V4L2_EVENT_FRAME_SYNC</constant>.</entry>

	  </row>

	  <row>

	    <entry></entry>

Documentation/DocBook/media/v4l/vidioc-g-edid.xml

+7 −7
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
	<funcdef>int <function>ioctl</function></funcdef>

	<paramdef>int <parameter>fd</parameter></paramdef>

	<paramdef>int <parameter>request</parameter></paramdef>

	<paramdef>const struct v4l2_edid *<parameter>argp</parameter></paramdef>

	<paramdef>struct v4l2_edid *<parameter>argp</parameter></paramdef>

      </funcprototype>

    </funcsynopsis>

  </refsynopsisdiv>
@@ -124,18 +124,18 @@ 
	    maximum number of blocks as defined by the standard). When you set the EDID and

	    <structfield>blocks</structfield> is 0, then the EDID is disabled or erased.</entry>

	  </row>

	  <row>

	    <entry>__u8&nbsp;*</entry>

	    <entry><structfield>edid</structfield></entry>

	    <entry>Pointer to memory that contains the EDID. The minimum size is

	    <structfield>blocks</structfield>&nbsp;*&nbsp;128.</entry>

	  </row>

	  <row>

	    <entry>__u32</entry>

	    <entry><structfield>reserved</structfield>[5]</entry>

	    <entry>Reserved for future extensions. Applications and drivers must

	    set the array to zero.</entry>

	  </row>

	  <row>

	    <entry>__u8&nbsp;*</entry>

	    <entry><structfield>edid</structfield></entry>

	    <entry>Pointer to memory that contains the EDID. The minimum size is

	    <structfield>blocks</structfield>&nbsp;*&nbsp;128.</entry>

	  </row>

	</tbody>

      </tgroup>

    </table>