diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2010-12-23 09:14:49 -0500 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-03-22 03:53:37 -0400 |
| commit | 7140c55738561907a1f66abf533d6358bf69ed9f (patch) | |
| tree | 3ac4f4b9dfa2be89252f77f55fcf3b5e931572fd | |
| parent | b1fd18cd9b8719f7668bb00e14f02a8e227e42e9 (diff) | |
[media] v4l: Add missing 12 bits bayer media bus formats
Add codes and documentation for the following media bus formats:
- V4L2_MBUS_FMT_SGBRG12_1X12
- V4L2_MBUS_FMT_SGRBG12_1X12
- V4L2_MBUS_FMT_SRGGB12_1X12
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| -rw-r--r-- | Documentation/DocBook/v4l/subdev-formats.xml | 51 | ||||
| -rw-r--r-- | include/linux/v4l2-mediabus.h | 5 |
2 files changed, 55 insertions, 1 deletions
diff --git a/Documentation/DocBook/v4l/subdev-formats.xml b/Documentation/DocBook/v4l/subdev-formats.xml index 0cae57207006..b5376e263d10 100644 --- a/Documentation/DocBook/v4l/subdev-formats.xml +++ b/Documentation/DocBook/v4l/subdev-formats.xml | |||
| @@ -762,6 +762,57 @@ | |||
| 762 | <entry>b<subscript>1</subscript></entry> | 762 | <entry>b<subscript>1</subscript></entry> |
| 763 | <entry>b<subscript>0</subscript></entry> | 763 | <entry>b<subscript>0</subscript></entry> |
| 764 | </row> | 764 | </row> |
| 765 | <row id="V4L2-MBUS-FMT-SGBRG12-1X12"> | ||
| 766 | <entry>V4L2_MBUS_FMT_SGBRG12_1X12</entry> | ||
| 767 | <entry>0x3010</entry> | ||
| 768 | <entry></entry> | ||
| 769 | <entry>g<subscript>11</subscript></entry> | ||
| 770 | <entry>g<subscript>10</subscript></entry> | ||
| 771 | <entry>g<subscript>9</subscript></entry> | ||
| 772 | <entry>g<subscript>8</subscript></entry> | ||
| 773 | <entry>g<subscript>7</subscript></entry> | ||
| 774 | <entry>g<subscript>6</subscript></entry> | ||
| 775 | <entry>g<subscript>5</subscript></entry> | ||
| 776 | <entry>g<subscript>4</subscript></entry> | ||
| 777 | <entry>g<subscript>3</subscript></entry> | ||
| 778 | <entry>g<subscript>2</subscript></entry> | ||
| 779 | <entry>g<subscript>1</subscript></entry> | ||
| 780 | <entry>g<subscript>0</subscript></entry> | ||
| 781 | </row> | ||
| 782 | <row id="V4L2-MBUS-FMT-SGRBG12-1X12"> | ||
| 783 | <entry>V4L2_MBUS_FMT_SGRBG12_1X12</entry> | ||
| 784 | <entry>0x3011</entry> | ||
| 785 | <entry></entry> | ||
| 786 | <entry>g<subscript>11</subscript></entry> | ||
| 787 | <entry>g<subscript>10</subscript></entry> | ||
| 788 | <entry>g<subscript>9</subscript></entry> | ||
| 789 | <entry>g<subscript>8</subscript></entry> | ||
| 790 | <entry>g<subscript>7</subscript></entry> | ||
| 791 | <entry>g<subscript>6</subscript></entry> | ||
| 792 | <entry>g<subscript>5</subscript></entry> | ||
| 793 | <entry>g<subscript>4</subscript></entry> | ||
| 794 | <entry>g<subscript>3</subscript></entry> | ||
| 795 | <entry>g<subscript>2</subscript></entry> | ||
| 796 | <entry>g<subscript>1</subscript></entry> | ||
| 797 | <entry>g<subscript>0</subscript></entry> | ||
| 798 | </row> | ||
| 799 | <row id="V4L2-MBUS-FMT-SRGGB12-1X12"> | ||
| 800 | <entry>V4L2_MBUS_FMT_SRGGB12_1X12</entry> | ||
| 801 | <entry>0x3012</entry> | ||
| 802 | <entry></entry> | ||
| 803 | <entry>r<subscript>11</subscript></entry> | ||
| 804 | <entry>r<subscript>10</subscript></entry> | ||
| 805 | <entry>r<subscript>9</subscript></entry> | ||
| 806 | <entry>r<subscript>8</subscript></entry> | ||
| 807 | <entry>r<subscript>7</subscript></entry> | ||
| 808 | <entry>r<subscript>6</subscript></entry> | ||
| 809 | <entry>r<subscript>5</subscript></entry> | ||
| 810 | <entry>r<subscript>4</subscript></entry> | ||
| 811 | <entry>r<subscript>3</subscript></entry> | ||
| 812 | <entry>r<subscript>2</subscript></entry> | ||
| 813 | <entry>r<subscript>1</subscript></entry> | ||
| 814 | <entry>r<subscript>0</subscript></entry> | ||
| 815 | </row> | ||
| 765 | </tbody> | 816 | </tbody> |
| 766 | </tgroup> | 817 | </tgroup> |
| 767 | </table> | 818 | </table> |
diff --git a/include/linux/v4l2-mediabus.h b/include/linux/v4l2-mediabus.h index 5c64924371df..7054a7a8065e 100644 --- a/include/linux/v4l2-mediabus.h +++ b/include/linux/v4l2-mediabus.h | |||
| @@ -67,7 +67,7 @@ enum v4l2_mbus_pixelcode { | |||
| 67 | V4L2_MBUS_FMT_YUYV10_1X20 = 0x200d, | 67 | V4L2_MBUS_FMT_YUYV10_1X20 = 0x200d, |
| 68 | V4L2_MBUS_FMT_YVYU10_1X20 = 0x200e, | 68 | V4L2_MBUS_FMT_YVYU10_1X20 = 0x200e, |
| 69 | 69 | ||
| 70 | /* Bayer - next is 0x3010 */ | 70 | /* Bayer - next is 0x3013 */ |
| 71 | V4L2_MBUS_FMT_SBGGR8_1X8 = 0x3001, | 71 | V4L2_MBUS_FMT_SBGGR8_1X8 = 0x3001, |
| 72 | V4L2_MBUS_FMT_SGRBG8_1X8 = 0x3002, | 72 | V4L2_MBUS_FMT_SGRBG8_1X8 = 0x3002, |
| 73 | V4L2_MBUS_FMT_SBGGR10_DPCM8_1X8 = 0x300b, | 73 | V4L2_MBUS_FMT_SBGGR10_DPCM8_1X8 = 0x300b, |
| @@ -83,6 +83,9 @@ enum v4l2_mbus_pixelcode { | |||
| 83 | V4L2_MBUS_FMT_SGRBG10_1X10 = 0x300a, | 83 | V4L2_MBUS_FMT_SGRBG10_1X10 = 0x300a, |
| 84 | V4L2_MBUS_FMT_SRGGB10_1X10 = 0x300f, | 84 | V4L2_MBUS_FMT_SRGGB10_1X10 = 0x300f, |
| 85 | V4L2_MBUS_FMT_SBGGR12_1X12 = 0x3008, | 85 | V4L2_MBUS_FMT_SBGGR12_1X12 = 0x3008, |
| 86 | V4L2_MBUS_FMT_SGBRG12_1X12 = 0x3010, | ||
| 87 | V4L2_MBUS_FMT_SGRBG12_1X12 = 0x3011, | ||
| 88 | V4L2_MBUS_FMT_SRGGB12_1X12 = 0x3012, | ||
| 86 | }; | 89 | }; |
| 87 | 90 | ||
| 88 | /** | 91 | /** |