tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

authored by

Michael Jones and committed by
Mauro Carvalho Chehab cbbc69a4 d924de09

+64 -2
+59
Documentation/DocBook/v4l/subdev-formats.xml
··· 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> ··· 489 472 <entry>g<subscript>2</subscript></entry> 490 473 <entry>g<subscript>1</subscript></entry> 491 474 <entry>g<subscript>0</subscript></entry> 475 + </row> 476 + <row id="V4L2-MBUS-FMT-SRGGB8-1X8"> 477 + <entry>V4L2_MBUS_FMT_SRGGB8_1X8</entry> 478 + <entry>0x3014</entry> 479 + <entry></entry> 480 + <entry>-</entry> 481 + <entry>-</entry> 482 + <entry>-</entry> 483 + <entry>-</entry> 484 + <entry>r<subscript>7</subscript></entry> 485 + <entry>r<subscript>6</subscript></entry> 486 + <entry>r<subscript>5</subscript></entry> 487 + <entry>r<subscript>4</subscript></entry> 488 + <entry>r<subscript>3</subscript></entry> 489 + <entry>r<subscript>2</subscript></entry> 490 + <entry>r<subscript>1</subscript></entry> 491 + <entry>r<subscript>0</subscript></entry> 492 492 </row> 493 493 <row id="V4L2-MBUS-FMT-SBGGR10-DPCM8-1X8"> 494 494 <entry>V4L2_MBUS_FMT_SBGGR10_DPCM8_1X8</entry> ··· 2192 2158 <entry>u<subscript>2</subscript></entry> 2193 2159 <entry>u<subscript>1</subscript></entry> 2194 2160 <entry>u<subscript>0</subscript></entry> 2161 + </row> 2162 + <row id="V4L2-MBUS-FMT-Y12-1X12"> 2163 + <entry>V4L2_MBUS_FMT_Y12_1X12</entry> 2164 + <entry>0x2013</entry> 2165 + <entry></entry> 2166 + <entry>-</entry> 2167 + <entry>-</entry> 2168 + <entry>-</entry> 2169 + <entry>-</entry> 2170 + <entry>-</entry> 2171 + <entry>-</entry> 2172 + <entry>-</entry> 2173 + <entry>-</entry> 2174 + <entry>y<subscript>11</subscript></entry> 2175 + <entry>y<subscript>10</subscript></entry> 2176 + <entry>y<subscript>9</subscript></entry> 2177 + <entry>y<subscript>8</subscript></entry> 2178 + <entry>y<subscript>7</subscript></entry> 2179 + <entry>y<subscript>6</subscript></entry> 2180 + <entry>y<subscript>5</subscript></entry> 2181 + <entry>y<subscript>4</subscript></entry> 2182 + <entry>y<subscript>3</subscript></entry> 2183 + <entry>y<subscript>2</subscript></entry> 2184 + <entry>y<subscript>1</subscript></entry> 2185 + <entry>y<subscript>0</subscript></entry> 2195 2186 </row> 2196 2187 <row id="V4L2-MBUS-FMT-UYVY8-1X16"> 2197 2188 <entry>V4L2_MBUS_FMT_UYVY8_1X16</entry>
+5 -2
include/linux/v4l2-mediabus.h
··· 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 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, ··· 68 67 V4L2_MBUS_FMT_YUYV10_1X20 = 0x200d, 69 68 V4L2_MBUS_FMT_YVYU10_1X20 = 0x200e, 70 69 71 - /* Bayer - next is 0x3013 */ 70 + /* Bayer - next is 0x3015 */ 72 71 V4L2_MBUS_FMT_SBGGR8_1X8 = 0x3001, 72 + V4L2_MBUS_FMT_SGBRG8_1X8 = 0x3013, 73 73 V4L2_MBUS_FMT_SGRBG8_1X8 = 0x3002, 74 + V4L2_MBUS_FMT_SRGGB8_1X8 = 0x3014, 74 75 V4L2_MBUS_FMT_SBGGR10_DPCM8_1X8 = 0x300b, 75 76 V4L2_MBUS_FMT_SGBRG10_DPCM8_1X8 = 0x300c, 76 77 V4L2_MBUS_FMT_SGRBG10_DPCM8_1X8 = 0x3009,