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

Commit 12a5a262 authored by James Morris's avatar James Morris
Browse files

Merge branch 'master' into next 



Conflicts:
	include/linux/capability.h

Manually resolve merge conflict w/ thanks to Stephen Rothwell.

Signed-off-by: default avatarJames Morris <jmorris@namei.org>
parents e77dc346 61c4f2c8

Documentation/DocBook/media-entities.tmpl

+1 −0
Original line number Diff line number Diff line
@@ -294,6 +294,7 @@ 
<!ENTITY sub-srggb10 SYSTEM "v4l/pixfmt-srggb10.xml">

<!ENTITY sub-srggb8 SYSTEM "v4l/pixfmt-srggb8.xml">

<!ENTITY sub-y10 SYSTEM "v4l/pixfmt-y10.xml">

<!ENTITY sub-y12 SYSTEM "v4l/pixfmt-y12.xml">

<!ENTITY sub-pixfmt SYSTEM "v4l/pixfmt.xml">

<!ENTITY sub-cropcap SYSTEM "v4l/vidioc-cropcap.xml">

<!ENTITY sub-dbg-g-register SYSTEM "v4l/vidioc-dbg-g-register.xml">

Documentation/DocBook/v4l/media-ioc-setup-link.xml

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
      <varlistentry>

	<term><parameter>request</parameter></term>

	<listitem>

	  <para>MEDIA_IOC_ENUM_LINKS</para>

	  <para>MEDIA_IOC_SETUP_LINK</para>

	</listitem>

      </varlistentry>

      <varlistentry>

Documentation/DocBook/v4l/pixfmt-y12.xml

0 → 100644
+79 −0
Original line number Diff line number Diff line 
<refentry id="V4L2-PIX-FMT-Y12">

  <refmeta>

    <refentrytitle>V4L2_PIX_FMT_Y12 ('Y12 ')</refentrytitle>

    &manvol;

  </refmeta>

  <refnamediv>

    <refname><constant>V4L2_PIX_FMT_Y12</constant></refname>

    <refpurpose>Grey-scale image</refpurpose>

  </refnamediv>

  <refsect1>

    <title>Description</title>



    <para>This is a grey-scale image with a depth of 12 bits per pixel. Pixels

are stored in 16-bit words with unused high bits padded with 0. The least

significant byte is stored at lower memory addresses (little-endian).</para>



    <example>

      <title><constant>V4L2_PIX_FMT_Y12</constant> 4 &times; 4

pixel image</title>



      <formalpara>

	<title>Byte Order.</title>

	<para>Each cell is one byte.

	  <informaltable frame="none">

	    <tgroup cols="9" align="center">

	      <colspec align="left" colwidth="2*" />

	      <tbody valign="top">

		<row>

		  <entry>start&nbsp;+&nbsp;0:</entry>

		  <entry>Y'<subscript>00low</subscript></entry>

		  <entry>Y'<subscript>00high</subscript></entry>

		  <entry>Y'<subscript>01low</subscript></entry>

		  <entry>Y'<subscript>01high</subscript></entry>

		  <entry>Y'<subscript>02low</subscript></entry>

		  <entry>Y'<subscript>02high</subscript></entry>

		  <entry>Y'<subscript>03low</subscript></entry>

		  <entry>Y'<subscript>03high</subscript></entry>

		</row>

		<row>

		  <entry>start&nbsp;+&nbsp;8:</entry>

		  <entry>Y'<subscript>10low</subscript></entry>

		  <entry>Y'<subscript>10high</subscript></entry>

		  <entry>Y'<subscript>11low</subscript></entry>

		  <entry>Y'<subscript>11high</subscript></entry>

		  <entry>Y'<subscript>12low</subscript></entry>

		  <entry>Y'<subscript>12high</subscript></entry>

		  <entry>Y'<subscript>13low</subscript></entry>

		  <entry>Y'<subscript>13high</subscript></entry>

		</row>

		<row>

		  <entry>start&nbsp;+&nbsp;16:</entry>

		  <entry>Y'<subscript>20low</subscript></entry>

		  <entry>Y'<subscript>20high</subscript></entry>

		  <entry>Y'<subscript>21low</subscript></entry>

		  <entry>Y'<subscript>21high</subscript></entry>

		  <entry>Y'<subscript>22low</subscript></entry>

		  <entry>Y'<subscript>22high</subscript></entry>

		  <entry>Y'<subscript>23low</subscript></entry>

		  <entry>Y'<subscript>23high</subscript></entry>

		</row>

		<row>

		  <entry>start&nbsp;+&nbsp;24:</entry>

		  <entry>Y'<subscript>30low</subscript></entry>

		  <entry>Y'<subscript>30high</subscript></entry>

		  <entry>Y'<subscript>31low</subscript></entry>

		  <entry>Y'<subscript>31high</subscript></entry>

		  <entry>Y'<subscript>32low</subscript></entry>

		  <entry>Y'<subscript>32high</subscript></entry>

		  <entry>Y'<subscript>33low</subscript></entry>

		  <entry>Y'<subscript>33high</subscript></entry>

		</row>

	      </tbody>

	    </tgroup>

	  </informaltable>

	</para>

      </formalpara>

    </example>

  </refsect1>

</refentry>

Documentation/DocBook/v4l/pixfmt.xml

+1 −0
Original line number Diff line number Diff line
@@ -696,6 +696,7 @@ information.</para> 
    &sub-packed-yuv;

    &sub-grey;

    &sub-y10;

    &sub-y12;

    &sub-y16;

    &sub-yuyv;

    &sub-uyvy;

Documentation/DocBook/v4l/subdev-formats.xml

+59 −0
Original line number Diff line number Diff line
@@ -456,6 +456,23 @@ 
	      <entry>b<subscript>1</subscript></entry>

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

	    </row>

	    <row id="V4L2-MBUS-FMT-SGBRG8-1X8">

	      <entry>V4L2_MBUS_FMT_SGBRG8_1X8</entry>

	      <entry>0x3013</entry>

	      <entry></entry>

	      <entry>-</entry>

	      <entry>-</entry>

	      <entry>-</entry>

	      <entry>-</entry>

	      <entry>g<subscript>7</subscript></entry>

	      <entry>g<subscript>6</subscript></entry>

	      <entry>g<subscript>5</subscript></entry>

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

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

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

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

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

	    </row>

	    <row id="V4L2-MBUS-FMT-SGRBG8-1X8">

	      <entry>V4L2_MBUS_FMT_SGRBG8_1X8</entry>

	      <entry>0x3002</entry>
@@ -473,6 +490,23 @@ 
	      <entry>g<subscript>1</subscript></entry>

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

	    </row>

	    <row id="V4L2-MBUS-FMT-SRGGB8-1X8">

	      <entry>V4L2_MBUS_FMT_SRGGB8_1X8</entry>

	      <entry>0x3014</entry>

	      <entry></entry>

	      <entry>-</entry>

	      <entry>-</entry>

	      <entry>-</entry>

	      <entry>-</entry>

	      <entry>r<subscript>7</subscript></entry>

	      <entry>r<subscript>6</subscript></entry>

	      <entry>r<subscript>5</subscript></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>

	    </row>

	    <row id="V4L2-MBUS-FMT-SBGGR10-DPCM8-1X8">

	      <entry>V4L2_MBUS_FMT_SBGGR10_DPCM8_1X8</entry>

	      <entry>0x300b</entry>
@@ -2159,6 +2193,31 @@ 
	      <entry>u<subscript>1</subscript></entry>

	      <entry>u<subscript>0</subscript></entry>

	    </row>

	    <row id="V4L2-MBUS-FMT-Y12-1X12">

	      <entry>V4L2_MBUS_FMT_Y12_1X12</entry>

	      <entry>0x2013</entry>

	      <entry></entry>

	      <entry>-</entry>

	      <entry>-</entry>

	      <entry>-</entry>

	      <entry>-</entry>

	      <entry>-</entry>

	      <entry>-</entry>

	      <entry>-</entry>

	      <entry>-</entry>

	      <entry>y<subscript>11</subscript></entry>

	      <entry>y<subscript>10</subscript></entry>

	      <entry>y<subscript>9</subscript></entry>

	      <entry>y<subscript>8</subscript></entry>

	      <entry>y<subscript>7</subscript></entry>

	      <entry>y<subscript>6</subscript></entry>

	      <entry>y<subscript>5</subscript></entry>

	      <entry>y<subscript>4</subscript></entry>

	      <entry>y<subscript>3</subscript></entry>

	      <entry>y<subscript>2</subscript></entry>

	      <entry>y<subscript>1</subscript></entry>

	      <entry>y<subscript>0</subscript></entry>

	    </row>

	    <row id="V4L2-MBUS-FMT-UYVY8-1X16">

	      <entry>V4L2_MBUS_FMT_UYVY8_1X16</entry>

	      <entry>0x200f</entry>