aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilipp Zabel <p.zabel@pengutronix.de>2014-12-02 09:45:25 -0500
committerPhilipp Zabel <p.zabel@pengutronix.de>2015-03-31 05:59:33 -0400
commit08c38458be7efa36a1d2dffd40500448e46d29c5 (patch)
treefa3d44bae3d694fb5ead3f9c26b8876a9e342b6c
parentb295c22978b86fc62019d12f4108b68b7e795610 (diff)
Add BGR888_1X24 and GBR888_1X24 media bus formats
This patch adds two more 24-bit RGB formats. BGR888 is more or less common, GBR888 is used on the internal connection between the IPU display interface and the TVE (VGA DAC) on i.MX53 SoCs. Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
-rw-r--r--Documentation/DocBook/media/v4l/subdev-formats.xml60
-rw-r--r--include/uapi/linux/media-bus-format.h4
2 files changed, 63 insertions, 1 deletions
diff --git a/Documentation/DocBook/media/v4l/subdev-formats.xml b/Documentation/DocBook/media/v4l/subdev-formats.xml
index 18449b32f240..805cbe1acab7 100644
--- a/Documentation/DocBook/media/v4l/subdev-formats.xml
+++ b/Documentation/DocBook/media/v4l/subdev-formats.xml
@@ -480,6 +480,66 @@ see <xref linkend="colorspaces" />.</entry>
480 <entry>b<subscript>1</subscript></entry> 480 <entry>b<subscript>1</subscript></entry>
481 <entry>b<subscript>0</subscript></entry> 481 <entry>b<subscript>0</subscript></entry>
482 </row> 482 </row>
483 <row id="MEDIA-BUS-FMT-BGR888-1X24">
484 <entry>MEDIA_BUS_FMT_BGR888_1X24</entry>
485 <entry>0x1013</entry>
486 <entry></entry>
487 &dash-ent-8;
488 <entry>b<subscript>7</subscript></entry>
489 <entry>b<subscript>6</subscript></entry>
490 <entry>b<subscript>5</subscript></entry>
491 <entry>b<subscript>4</subscript></entry>
492 <entry>b<subscript>3</subscript></entry>
493 <entry>b<subscript>2</subscript></entry>
494 <entry>b<subscript>1</subscript></entry>
495 <entry>b<subscript>0</subscript></entry>
496 <entry>g<subscript>7</subscript></entry>
497 <entry>g<subscript>6</subscript></entry>
498 <entry>g<subscript>5</subscript></entry>
499 <entry>g<subscript>4</subscript></entry>
500 <entry>g<subscript>3</subscript></entry>
501 <entry>g<subscript>2</subscript></entry>
502 <entry>g<subscript>1</subscript></entry>
503 <entry>g<subscript>0</subscript></entry>
504 <entry>r<subscript>7</subscript></entry>
505 <entry>r<subscript>6</subscript></entry>
506 <entry>r<subscript>5</subscript></entry>
507 <entry>r<subscript>4</subscript></entry>
508 <entry>r<subscript>3</subscript></entry>
509 <entry>r<subscript>2</subscript></entry>
510 <entry>r<subscript>1</subscript></entry>
511 <entry>r<subscript>0</subscript></entry>
512 </row>
513 <row id="MEDIA-BUS-FMT-GBR888-1X24">
514 <entry>MEDIA_BUS_FMT_GBR888_1X24</entry>
515 <entry>0x1014</entry>
516 <entry></entry>
517 &dash-ent-8;
518 <entry>g<subscript>7</subscript></entry>
519 <entry>g<subscript>6</subscript></entry>
520 <entry>g<subscript>5</subscript></entry>
521 <entry>g<subscript>4</subscript></entry>
522 <entry>g<subscript>3</subscript></entry>
523 <entry>g<subscript>2</subscript></entry>
524 <entry>g<subscript>1</subscript></entry>
525 <entry>g<subscript>0</subscript></entry>
526 <entry>b<subscript>7</subscript></entry>
527 <entry>b<subscript>6</subscript></entry>
528 <entry>b<subscript>5</subscript></entry>
529 <entry>b<subscript>4</subscript></entry>
530 <entry>b<subscript>3</subscript></entry>
531 <entry>b<subscript>2</subscript></entry>
532 <entry>b<subscript>1</subscript></entry>
533 <entry>b<subscript>0</subscript></entry>
534 <entry>r<subscript>7</subscript></entry>
535 <entry>r<subscript>6</subscript></entry>
536 <entry>r<subscript>5</subscript></entry>
537 <entry>r<subscript>4</subscript></entry>
538 <entry>r<subscript>3</subscript></entry>
539 <entry>r<subscript>2</subscript></entry>
540 <entry>r<subscript>1</subscript></entry>
541 <entry>r<subscript>0</subscript></entry>
542 </row>
483 <row id="MEDIA-BUS-FMT-RGB888-1X24"> 543 <row id="MEDIA-BUS-FMT-RGB888-1X24">
484 <entry>MEDIA_BUS_FMT_RGB888_1X24</entry> 544 <entry>MEDIA_BUS_FMT_RGB888_1X24</entry>
485 <entry>0x100a</entry> 545 <entry>0x100a</entry>
diff --git a/include/uapi/linux/media-bus-format.h b/include/uapi/linux/media-bus-format.h
index 3fb9cbbb603f..6f6942e8dae6 100644
--- a/include/uapi/linux/media-bus-format.h
+++ b/include/uapi/linux/media-bus-format.h
@@ -33,7 +33,7 @@
33 33
34#define MEDIA_BUS_FMT_FIXED 0x0001 34#define MEDIA_BUS_FMT_FIXED 0x0001
35 35
36/* RGB - next is 0x1013 */ 36/* RGB - next is 0x1015 */
37#define MEDIA_BUS_FMT_RGB444_1X12 0x100e 37#define MEDIA_BUS_FMT_RGB444_1X12 0x100e
38#define MEDIA_BUS_FMT_RGB444_2X8_PADHI_BE 0x1001 38#define MEDIA_BUS_FMT_RGB444_2X8_PADHI_BE 0x1001
39#define MEDIA_BUS_FMT_RGB444_2X8_PADHI_LE 0x1002 39#define MEDIA_BUS_FMT_RGB444_2X8_PADHI_LE 0x1002
@@ -46,6 +46,8 @@
46#define MEDIA_BUS_FMT_RGB565_2X8_LE 0x1008 46#define MEDIA_BUS_FMT_RGB565_2X8_LE 0x1008
47#define MEDIA_BUS_FMT_RGB666_1X18 0x1009 47#define MEDIA_BUS_FMT_RGB666_1X18 0x1009
48#define MEDIA_BUS_FMT_RGB666_1X7X3_SPWG 0x1010 48#define MEDIA_BUS_FMT_RGB666_1X7X3_SPWG 0x1010
49#define MEDIA_BUS_FMT_BGR888_1X24 0x1013
50#define MEDIA_BUS_FMT_GBR888_1X24 0x1014
49#define MEDIA_BUS_FMT_RGB888_1X24 0x100a 51#define MEDIA_BUS_FMT_RGB888_1X24 0x100a
50#define MEDIA_BUS_FMT_RGB888_2X12_BE 0x100b 52#define MEDIA_BUS_FMT_RGB888_2X12_BE 0x100b
51#define MEDIA_BUS_FMT_RGB888_2X12_LE 0x100c 53#define MEDIA_BUS_FMT_RGB888_2X12_LE 0x100c