Skip to content

Commit b399c46

Browse files
torvaldstorvalds
committed
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
Pull media updates from Mauro Carvalho Chehab: - a new jpeg codec driver for Samsung Exynos (jpeg-hw-exynos4) - a new dvb frontend for ds2103 chipset (m88ds2103) - a new sensor driver for Samsung S5K5BAF UXGA (s5k5baf) - new drivers for R-Car VSP1 - a new radio driver: radio-raremono - a new tuner driver for ts2022 chipset (m88ts2022) - the analog part of em28xx is now a separate module that only load/runs if the device is not a pure digital TV device - added a staging driver for bcm2048 radio devices - the omap 2 video driver (omap24xx) was moved to staging. This driver is for an old hardware and uses a deprecated Kernel internal API. If nobody cares enough to fix it, it would be removed on a couple Kernel releases - the sn9c102 driver was moved to staging. This driver was replaced by gspca, and disabled on some distros, as almost all devices are known to work properly with gspca. It should be removed from kernel on a couple Kernel releases - lots of driver fixes, improvements and cleanups * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (421 commits) [media] media: v4l2-dev: fix video device index assignment [media] rc-core: reuse device numbers [media] em28xx-cards: properly initialize the device bitmap [media] Staging: media: Fix line length exceeding 80 characters in as102_drv.c [media] Staging: media: Fix line length exceeding 80 characters in as102_fe.c [media] Staging: media: Fix quoted string split across line in as102_fe.c [media] media: st-rc: Add reset support [media] m2m-deinterlace: fix allocated struct type [media] radio-usb-si4713: fix sparse non static symbol warnings [media] em28xx-audio: remove needless check before usb_free_coherent() [media] au0828: Fix sparse non static symbol warning Revert "[media] go7007-usb: only use go->dev after allocated" [media] em28xx-audio: provide an error code when URB submit fails [media] em28xx: fix check for audio only usb interfaces when changing the usb alternate setting [media] em28xx: fix usb alternate setting for analog and digital video endpoints > 0 [media] em28xx: make 'em28xx_ctrl_ops' static em28xx-alsa: Fix error patch for init/fini [media] em28xx-audio: flush work at .fini [media] drxk: remove the option to load firmware asynchronously [media] em28xx: adjust period size at runtime ...
2 parents b890eb4 + 6c3df5d commit b399c46

File tree

298 files changed

+29135
-5098
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

298 files changed

+29135
-5098
lines changed

‎Documentation/DocBook/media/v4l/compat.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2523,6 +2523,18 @@ that used it. It was originally scheduled for removal in 2.6.35.
25232523
</orderedlist>
25242524
</section>
25252525

2526+
<section>
2527+
<title>V4L2 in Linux 3.14</title>
2528+
<orderedlist>
2529+
<listitem>
2530+
<para> In struct <structname>v4l2_rect</structname>, the type
2531+
of <structfield>width</structfield> and <structfield>height</structfield>
2532+
fields changed from _s32 to _u32.
2533+
</para>
2534+
</listitem>
2535+
</orderedlist>
2536+
</section>
2537+
25262538
<section id="other">
25272539
<title>Relation of V4L2 to other Linux multimedia APIs</title>
25282540

‎Documentation/DocBook/media/v4l/controls.xml

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3161,6 +3161,47 @@ V4L2_CID_MPEG_VIDEO_VPX_GOLDEN_FRAME_REF_PERIOD as a golden frame.</entry>
31613161
</entrytbl>
31623162
</row>
31633163

3164+
<row><entry></entry></row>
3165+
<row>
3166+
<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_VPX_MIN_QP</constant></entry>
3167+
<entry>integer</entry>
3168+
</row>
3169+
<row><entry spanname="descr">Minimum quantization parameter for VP8.</entry>
3170+
</row>
3171+
3172+
<row><entry></entry></row>
3173+
<row>
3174+
<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_VPX_MAX_QP</constant></entry>
3175+
<entry>integer</entry>
3176+
</row>
3177+
<row><entry spanname="descr">Maximum quantization parameter for VP8.</entry>
3178+
</row>
3179+
3180+
<row><entry></entry></row>
3181+
<row>
3182+
<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_VPX_I_FRAME_QP</constant>&nbsp;</entry>
3183+
<entry>integer</entry>
3184+
</row>
3185+
<row><entry spanname="descr">Quantization parameter for an I frame for VP8.</entry>
3186+
</row>
3187+
3188+
<row><entry></entry></row>
3189+
<row>
3190+
<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_VPX_P_FRAME_QP</constant>&nbsp;</entry>
3191+
<entry>integer</entry>
3192+
</row>
3193+
<row><entry spanname="descr">Quantization parameter for a P frame for VP8.</entry>
3194+
</row>
3195+
3196+
<row><entry></entry></row>
3197+
<row>
3198+
<entry spanname="id"><constant>V4L2_CID_MPEG_VIDEO_VPX_PROFILE</constant>&nbsp;</entry>
3199+
<entry>integer</entry>
3200+
</row>
3201+
<row><entry spanname="descr">Select the desired profile for VPx encoder.
3202+
Acceptable values are 0, 1, 2 and 3 corresponding to encoder profiles 0, 1, 2 and 3.</entry>
3203+
</row>
3204+
31643205
<row><entry></entry></row>
31653206
</tbody>
31663207
</tgroup>

‎Documentation/DocBook/media/v4l/dev-overlay.xml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -346,17 +346,14 @@ rectangle, in pixels.</entry>
346346
rectangle, in pixels. Offsets increase to the right and down.</entry>
347347
</row>
348348
<row>
349-
<entry>__s32</entry>
349+
<entry>__u32</entry>
350350
<entry><structfield>width</structfield></entry>
351351
<entry>Width of the rectangle, in pixels.</entry>
352352
</row>
353353
<row>
354-
<entry>__s32</entry>
354+
<entry>__u32</entry>
355355
<entry><structfield>height</structfield></entry>
356-
<entry>Height of the rectangle, in pixels. Width and
357-
height cannot be negative, the fields are signed for hysterical
358-
reasons. <!-- video4linux-list@redhat.com on 22 Oct 2002 subject
359-
"Re:[V4L][patches!] Re:v4l2/kernel-2.5" --></entry>
356+
<entry>Height of the rectangle, in pixels.</entry>
360357
</row>
361358
</tbody>
362359
</tgroup>

‎Documentation/DocBook/media/v4l/media-ioc-enum-links.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,15 @@
134134
<entry>Output pad, relative to the entity. Output pads source data
135135
and are origins of links.</entry>
136136
</row>
137+
<row>
138+
<entry><constant>MEDIA_PAD_FL_MUST_CONNECT</constant></entry>
139+
<entry>If this flag is set and the pad is linked to any other
140+
pad, then at least one of those links must be enabled for the
141+
entity to be able to stream. There could be temporary reasons
142+
(e.g. device configuration dependent) for the pad to need
143+
enabled links even when this flag isn't set; the absence of the
144+
flag doesn't imply there is none.</entry>
145+
</row>
137146
</tbody>
138147
</tgroup>
139148
</table>

‎Documentation/DocBook/media/v4l/subdev-formats.xml

Lines changed: 160 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
<constant>V4L2_MBUS_FMT_RGB555_2X8_PADHI_BE</constant>.
9090
</para>
9191

92-
<para>The following tables list existing packet RGB formats.</para>
92+
<para>The following tables list existing packed RGB formats.</para>
9393

9494
<table pgwide="0" frame="none" id="v4l2-mbus-pixelcode-rgb">
9595
<title>RGB formats</title>
@@ -615,7 +615,7 @@
615615
</mediaobject>
616616
</figure>
617617

618-
<para>The following table lists existing packet Bayer formats. The data
618+
<para>The following table lists existing packed Bayer formats. The data
619619
organization is given as an example for the first pixel only.</para>
620620

621621
<table pgwide="0" frame="none" id="v4l2-mbus-pixelcode-bayer">
@@ -1178,7 +1178,7 @@
11781178
U, Y, V, Y order will be named <constant>V4L2_MBUS_FMT_UYVY8_2X8</constant>.
11791179
</para>
11801180

1181-
<para><xref linkend="v4l2-mbus-pixelcode-yuv8"/> list existing packet YUV
1181+
<para><xref linkend="v4l2-mbus-pixelcode-yuv8"/> lists existing packed YUV
11821182
formats and describes the organization of each pixel data in each sample.
11831183
When a format pattern is split across multiple samples each of the samples
11841184
in the pattern is described.</para>
@@ -2491,6 +2491,163 @@
24912491
</table>
24922492
</section>
24932493

2494+
<section>
2495+
<title>HSV/HSL Formats</title>
2496+
2497+
<para>Those formats transfer pixel data as RGB values in a cylindrical-coordinate
2498+
system using Hue-Saturation-Value or Hue-Saturation-Lightness components. The
2499+
format code is made of the following information.
2500+
<itemizedlist>
2501+
<listitem><para>The hue, saturation, value or lightness and optional alpha
2502+
components order code, as encoded in a pixel sample. The only currently
2503+
supported value is AHSV.
2504+
</para></listitem>
2505+
<listitem><para>The number of bits per component, for each component. The values
2506+
can be different for all components. The only currently supported value is 8888.
2507+
</para></listitem>
2508+
<listitem><para>The number of bus samples per pixel. Pixels that are wider than
2509+
the bus width must be transferred in multiple samples. The only currently
2510+
supported value is 1.</para></listitem>
2511+
<listitem><para>The bus width.</para></listitem>
2512+
<listitem><para>For formats where the total number of bits per pixel is smaller
2513+
than the number of bus samples per pixel times the bus width, a padding
2514+
value stating if the bytes are padded in their most high order bits
2515+
(PADHI) or low order bits (PADLO).</para></listitem>
2516+
<listitem><para>For formats where the number of bus samples per pixel is larger
2517+
than 1, an endianness value stating if the pixel is transferred MSB first
2518+
(BE) or LSB first (LE).</para></listitem>
2519+
</itemizedlist>
2520+
</para>
2521+
2522+
<para>The following table lists existing HSV/HSL formats.</para>
2523+
2524+
<table pgwide="0" frame="none" id="v4l2-mbus-pixelcode-hsv">
2525+
<title>HSV/HSL formats</title>
2526+
<tgroup cols="27">
2527+
<colspec colname="id" align="left" />
2528+
<colspec colname="code" align="center"/>
2529+
<colspec colname="bit" />
2530+
<colspec colnum="4" colname="b31" align="center" />
2531+
<colspec colnum="5" colname="b20" align="center" />
2532+
<colspec colnum="6" colname="b29" align="center" />
2533+
<colspec colnum="7" colname="b28" align="center" />
2534+
<colspec colnum="8" colname="b27" align="center" />
2535+
<colspec colnum="9" colname="b26" align="center" />
2536+
<colspec colnum="10" colname="b25" align="center" />
2537+
<colspec colnum="11" colname="b24" align="center" />
2538+
<colspec colnum="12" colname="b23" align="center" />
2539+
<colspec colnum="13" colname="b22" align="center" />
2540+
<colspec colnum="14" colname="b21" align="center" />
2541+
<colspec colnum="15" colname="b20" align="center" />
2542+
<colspec colnum="16" colname="b19" align="center" />
2543+
<colspec colnum="17" colname="b18" align="center" />
2544+
<colspec colnum="18" colname="b17" align="center" />
2545+
<colspec colnum="19" colname="b16" align="center" />
2546+
<colspec colnum="20" colname="b15" align="center" />
2547+
<colspec colnum="21" colname="b14" align="center" />
2548+
<colspec colnum="22" colname="b13" align="center" />
2549+
<colspec colnum="23" colname="b12" align="center" />
2550+
<colspec colnum="24" colname="b11" align="center" />
2551+
<colspec colnum="25" colname="b10" align="center" />
2552+
<colspec colnum="26" colname="b09" align="center" />
2553+
<colspec colnum="27" colname="b08" align="center" />
2554+
<colspec colnum="28" colname="b07" align="center" />
2555+
<colspec colnum="29" colname="b06" align="center" />
2556+
<colspec colnum="30" colname="b05" align="center" />
2557+
<colspec colnum="31" colname="b04" align="center" />
2558+
<colspec colnum="32" colname="b03" align="center" />
2559+
<colspec colnum="33" colname="b02" align="center" />
2560+
<colspec colnum="34" colname="b01" align="center" />
2561+
<colspec colnum="35" colname="b00" align="center" />
2562+
<spanspec namest="b31" nameend="b00" spanname="b0" />
2563+
<thead>
2564+
<row>
2565+
<entry>Identifier</entry>
2566+
<entry>Code</entry>
2567+
<entry></entry>
2568+
<entry spanname="b0">Data organization</entry>
2569+
</row>
2570+
<row>
2571+
<entry></entry>
2572+
<entry></entry>
2573+
<entry>Bit</entry>
2574+
<entry>31</entry>
2575+
<entry>30</entry>
2576+
<entry>29</entry>
2577+
<entry>28</entry>
2578+
<entry>27</entry>
2579+
<entry>26</entry>
2580+
<entry>25</entry>
2581+
<entry>24</entry>
2582+
<entry>23</entry>
2583+
<entry>22</entry>
2584+
<entry>21</entry>
2585+
<entry>20</entry>
2586+
<entry>19</entry>
2587+
<entry>18</entry>
2588+
<entry>17</entry>
2589+
<entry>16</entry>
2590+
<entry>15</entry>
2591+
<entry>14</entry>
2592+
<entry>13</entry>
2593+
<entry>12</entry>
2594+
<entry>11</entry>
2595+
<entry>10</entry>
2596+
<entry>9</entry>
2597+
<entry>8</entry>
2598+
<entry>7</entry>
2599+
<entry>6</entry>
2600+
<entry>5</entry>
2601+
<entry>4</entry>
2602+
<entry>3</entry>
2603+
<entry>2</entry>
2604+
<entry>1</entry>
2605+
<entry>0</entry>
2606+
</row>
2607+
</thead>
2608+
<tbody valign="top">
2609+
<row id="V4L2-MBUS-FMT-AHSV8888-1X32">
2610+
<entry>V4L2_MBUS_FMT_AHSV8888_1X32</entry>
2611+
<entry>0x6001</entry>
2612+
<entry></entry>
2613+
<entry>a<subscript>7</subscript></entry>
2614+
<entry>a<subscript>6</subscript></entry>
2615+
<entry>a<subscript>5</subscript></entry>
2616+
<entry>a<subscript>4</subscript></entry>
2617+
<entry>a<subscript>3</subscript></entry>
2618+
<entry>a<subscript>2</subscript></entry>
2619+
<entry>a<subscript>1</subscript></entry>
2620+
<entry>a<subscript>0</subscript></entry>
2621+
<entry>h<subscript>7</subscript></entry>
2622+
<entry>h<subscript>6</subscript></entry>
2623+
<entry>h<subscript>5</subscript></entry>
2624+
<entry>h<subscript>4</subscript></entry>
2625+
<entry>h<subscript>3</subscript></entry>
2626+
<entry>h<subscript>2</subscript></entry>
2627+
<entry>h<subscript>1</subscript></entry>
2628+
<entry>h<subscript>0</subscript></entry>
2629+
<entry>s<subscript>7</subscript></entry>
2630+
<entry>s<subscript>6</subscript></entry>
2631+
<entry>s<subscript>5</subscript></entry>
2632+
<entry>s<subscript>4</subscript></entry>
2633+
<entry>s<subscript>3</subscript></entry>
2634+
<entry>s<subscript>2</subscript></entry>
2635+
<entry>s<subscript>1</subscript></entry>
2636+
<entry>s<subscript>0</subscript></entry>
2637+
<entry>v<subscript>7</subscript></entry>
2638+
<entry>v<subscript>6</subscript></entry>
2639+
<entry>v<subscript>5</subscript></entry>
2640+
<entry>v<subscript>4</subscript></entry>
2641+
<entry>v<subscript>3</subscript></entry>
2642+
<entry>v<subscript>2</subscript></entry>
2643+
<entry>v<subscript>1</subscript></entry>
2644+
<entry>v<subscript>0</subscript></entry>
2645+
</row>
2646+
</tbody>
2647+
</tgroup>
2648+
</table>
2649+
</section>
2650+
24942651
<section>
24952652
<title>JPEG Compressed Formats</title>
24962653

‎Documentation/DocBook/media/v4l/v4l2.xml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,14 @@ structs, ioctls) must be noted in more detail in the history chapter
140140
(compat.xml), along with the possible impact on existing drivers and
141141
applications. -->
142142

143+
<revision>
144+
<revnumber>3.14</revnumber>
145+
<date>2013-11-25</date>
146+
<authorinitials>rr</authorinitials>
147+
<revremark>Set width and height as unsigned on v4l2_rect.
148+
</revremark>
149+
</revision>
150+
143151
<revision>
144152
<revnumber>3.11</revnumber>
145153
<date>2013-05-26</date>
@@ -501,7 +509,7 @@ and discussions on the V4L mailing list.</revremark>
501509
</partinfo>
502510

503511
<title>Video for Linux Two API Specification</title>
504-
<subtitle>Revision 3.11</subtitle>
512+
<subtitle>Revision 3.14</subtitle>
505513

506514
<chapter id="common">
507515
&sub-common;

‎Documentation/DocBook/media/v4l/vidioc-cropcap.xml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -133,18 +133,14 @@ rectangle, in pixels.</entry>
133133
rectangle, in pixels.</entry>
134134
</row>
135135
<row>
136-
<entry>__s32</entry>
136+
<entry>__u32</entry>
137137
<entry><structfield>width</structfield></entry>
138138
<entry>Width of the rectangle, in pixels.</entry>
139139
</row>
140140
<row>
141-
<entry>__s32</entry>
141+
<entry>__u32</entry>
142142
<entry><structfield>height</structfield></entry>
143-
<entry>Height of the rectangle, in pixels. Width
144-
and height cannot be negative, the fields are signed for
145-
hysterical reasons. <!-- video4linux-list@redhat.com
146-
on 22 Oct 2002 subject "Re:[V4L][patches!] Re:v4l2/kernel-2.5" -->
147-
</entry>
143+
<entry>Height of the rectangle, in pixels.</entry>
148144
</row>
149145
</tbody>
150146
</tgroup>

‎Documentation/DocBook/media/v4l/vidioc-streamon.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ buffers are filled (if there are any empty buffers in the incoming
5959
queue) until <constant>VIDIOC_STREAMON</constant> has been called.
6060
Accordingly the output hardware is disabled, no video signal is
6161
produced until <constant>VIDIOC_STREAMON</constant> has been called.
62-
The ioctl will succeed only when at least one output buffer is in the
62+
The ioctl will succeed when at least one output buffer is in the
6363
incoming queue.</para>
6464

6565
<para>The <constant>VIDIOC_STREAMOFF</constant> ioctl, apart of

‎Documentation/cgroups/resource_counter.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ to work with it.
9595

9696
f. u64 res_counter_uncharge_until
9797
(struct res_counter *rc, struct res_counter *top,
98-
unsinged long val)
98+
unsigned long val)
9999

100100
Almost same as res_counter_uncharge() but propagation of uncharge
101101
stops when rc == top. This is useful when kill a res_counter in

‎Documentation/devicetree/bindings/media/exynos-jpeg-codec.txt

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
Samsung S5P/EXYNOS SoC series JPEG codec
2+
3+
Required properties:
4+
5+
- compatible : should be one of:
6+
"samsung,s5pv210-jpeg", "samsung,exynos4210-jpeg";
7+
- reg : address and length of the JPEG codec IP register set;
8+
- interrupts : specifies the JPEG codec IP interrupt;
9+
- clocks : should contain the JPEG codec IP gate clock specifier, from the
10+
common clock bindings;
11+
- clock-names : should contain "jpeg" entry.

0 commit comments

Comments
 (0)