Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit cbbc69a4a98081740f0e3d7717fbfa0b584b983d

Authored by Michael Jones
Committed by Mauro Carvalho Chehab
1 parent d924de09ca
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

[media] media: add missing 8-bit bayer formats and Y12 

8-bit SGBRG and SRGGB media bus formats are missing, as well as the
12-bit grey format. Add them.

Signed-off-by: Michael Jones <michael.jones@matrix-vision.de>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

Showing 2 changed files with 64 additions and 2 deletions Side-by-side Diff

Documentation/DocBook/v4l/subdev-formats.xml
Diff comments   View file @ cbbc69a
... ... @@ -456,6 +456,23 @@
456 456 <entry>b<subscript>1</subscript></entry>
457 457 <entry>b<subscript>0</subscript></entry>
458 458 </row>
  459 + <row id="V4L2-MBUS-FMT-SGBRG8-1X8">
  460 + <entry>V4L2_MBUS_FMT_SGBRG8_1X8</entry>
  461 + <entry>0x3013</entry>
  462 + <entry></entry>
  463 + <entry>-</entry>
  464 + <entry>-</entry>
  465 + <entry>-</entry>
  466 + <entry>-</entry>
  467 + <entry>g<subscript>7</subscript></entry>
  468 + <entry>g<subscript>6</subscript></entry>
  469 + <entry>g<subscript>5</subscript></entry>
  470 + <entry>g<subscript>4</subscript></entry>
  471 + <entry>g<subscript>3</subscript></entry>
  472 + <entry>g<subscript>2</subscript></entry>
  473 + <entry>g<subscript>1</subscript></entry>
  474 + <entry>g<subscript>0</subscript></entry>
  475 + </row>
459 476 <row id="V4L2-MBUS-FMT-SGRBG8-1X8">
460 477 <entry>V4L2_MBUS_FMT_SGRBG8_1X8</entry>
461 478 <entry>0x3002</entry>
... ... @@ -473,6 +490,23 @@
473 490 <entry>g<subscript>1</subscript></entry>
474 491 <entry>g<subscript>0</subscript></entry>
475 492 </row>
  493 + <row id="V4L2-MBUS-FMT-SRGGB8-1X8">
  494 + <entry>V4L2_MBUS_FMT_SRGGB8_1X8</entry>
  495 + <entry>0x3014</entry>
  496 + <entry></entry>
  497 + <entry>-</entry>
  498 + <entry>-</entry>
  499 + <entry>-</entry>
  500 + <entry>-</entry>
  501 + <entry>r<subscript>7</subscript></entry>
  502 + <entry>r<subscript>6</subscript></entry>
  503 + <entry>r<subscript>5</subscript></entry>
  504 + <entry>r<subscript>4</subscript></entry>
  505 + <entry>r<subscript>3</subscript></entry>
  506 + <entry>r<subscript>2</subscript></entry>
  507 + <entry>r<subscript>1</subscript></entry>
  508 + <entry>r<subscript>0</subscript></entry>
  509 + </row>
476 510 <row id="V4L2-MBUS-FMT-SBGGR10-DPCM8-1X8">
477 511 <entry>V4L2_MBUS_FMT_SBGGR10_DPCM8_1X8</entry>
478 512 <entry>0x300b</entry>
... ... @@ -2158,6 +2192,31 @@
2158 2192 <entry>u<subscript>2</subscript></entry>
2159 2193 <entry>u<subscript>1</subscript></entry>
2160 2194 <entry>u<subscript>0</subscript></entry>
  2195 + </row>
  2196 + <row id="V4L2-MBUS-FMT-Y12-1X12">
  2197 + <entry>V4L2_MBUS_FMT_Y12_1X12</entry>
  2198 + <entry>0x2013</entry>
  2199 + <entry></entry>
  2200 + <entry>-</entry>
  2201 + <entry>-</entry>
  2202 + <entry>-</entry>
  2203 + <entry>-</entry>
  2204 + <entry>-</entry>
  2205 + <entry>-</entry>
  2206 + <entry>-</entry>
  2207 + <entry>-</entry>
  2208 + <entry>y<subscript>11</subscript></entry>
  2209 + <entry>y<subscript>10</subscript></entry>
  2210 + <entry>y<subscript>9</subscript></entry>
  2211 + <entry>y<subscript>8</subscript></entry>
  2212 + <entry>y<subscript>7</subscript></entry>
  2213 + <entry>y<subscript>6</subscript></entry>
  2214 + <entry>y<subscript>5</subscript></entry>
  2215 + <entry>y<subscript>4</subscript></entry>
  2216 + <entry>y<subscript>3</subscript></entry>
  2217 + <entry>y<subscript>2</subscript></entry>
  2218 + <entry>y<subscript>1</subscript></entry>
  2219 + <entry>y<subscript>0</subscript></entry>
2161 2220 </row>
2162 2221 <row id="V4L2-MBUS-FMT-UYVY8-1X16">
2163 2222 <entry>V4L2_MBUS_FMT_UYVY8_1X16</entry>
include/linux/v4l2-mediabus.h
Diff comments   View file @ cbbc69a
... ... @@ -47,7 +47,7 @@
47 47 V4L2_MBUS_FMT_RGB565_2X8_BE = 0x1007,
48 48 V4L2_MBUS_FMT_RGB565_2X8_LE = 0x1008,
49 49  
50   - /* YUV (including grey) - next is 0x2013 */
  50 + /* YUV (including grey) - next is 0x2014 */
51 51 V4L2_MBUS_FMT_Y8_1X8 = 0x2001,
52 52 V4L2_MBUS_FMT_UYVY8_1_5X8 = 0x2002,
53 53 V4L2_MBUS_FMT_VYUY8_1_5X8 = 0x2003,
... ... @@ -60,6 +60,7 @@
60 60 V4L2_MBUS_FMT_Y10_1X10 = 0x200a,
61 61 V4L2_MBUS_FMT_YUYV10_2X10 = 0x200b,
62 62 V4L2_MBUS_FMT_YVYU10_2X10 = 0x200c,
  63 + V4L2_MBUS_FMT_Y12_1X12 = 0x2013,
63 64 V4L2_MBUS_FMT_UYVY8_1X16 = 0x200f,
64 65 V4L2_MBUS_FMT_VYUY8_1X16 = 0x2010,
65 66 V4L2_MBUS_FMT_YUYV8_1X16 = 0x2011,
66 67  
67 68  
... ... @@ -67,9 +68,11 @@
67 68 V4L2_MBUS_FMT_YUYV10_1X20 = 0x200d,
68 69 V4L2_MBUS_FMT_YVYU10_1X20 = 0x200e,
69 70  
70   - /* Bayer - next is 0x3013 */
  71 + /* Bayer - next is 0x3015 */
71 72 V4L2_MBUS_FMT_SBGGR8_1X8 = 0x3001,
  73 + V4L2_MBUS_FMT_SGBRG8_1X8 = 0x3013,
72 74 V4L2_MBUS_FMT_SGRBG8_1X8 = 0x3002,
  75 + V4L2_MBUS_FMT_SRGGB8_1X8 = 0x3014,
73 76 V4L2_MBUS_FMT_SBGGR10_DPCM8_1X8 = 0x300b,
74 77 V4L2_MBUS_FMT_SGBRG10_DPCM8_1X8 = 0x300c,
75 78 V4L2_MBUS_FMT_SGRBG10_DPCM8_1X8 = 0x3009,