diff --git a/[refs] b/[refs]
index c0b0f90b3da4..7a27a67b03b1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
---
-refs/heads/master: b1fd18cd9b8719f7668bb00e14f02a8e227e42e9
+refs/heads/master: 7140c55738561907a1f66abf533d6358bf69ed9f
diff --git a/trunk/Documentation/DocBook/v4l/subdev-formats.xml b/trunk/Documentation/DocBook/v4l/subdev-formats.xml
index 0cae57207006..b5376e263d10 100644
--- a/trunk/Documentation/DocBook/v4l/subdev-formats.xml
+++ b/trunk/Documentation/DocBook/v4l/subdev-formats.xml
@@ -762,6 +762,57 @@
b1
b0
+
+ V4L2_MBUS_FMT_SGBRG12_1X12
+ 0x3010
+
+ g11
+ g10
+ g9
+ g8
+ g7
+ g6
+ g5
+ g4
+ g3
+ g2
+ g1
+ g0
+
+
+ V4L2_MBUS_FMT_SGRBG12_1X12
+ 0x3011
+
+ g11
+ g10
+ g9
+ g8
+ g7
+ g6
+ g5
+ g4
+ g3
+ g2
+ g1
+ g0
+
+
+ V4L2_MBUS_FMT_SRGGB12_1X12
+ 0x3012
+
+ r11
+ r10
+ r9
+ r8
+ r7
+ r6
+ r5
+ r4
+ r3
+ r2
+ r1
+ r0
+
diff --git a/trunk/include/linux/v4l2-mediabus.h b/trunk/include/linux/v4l2-mediabus.h
index 5c64924371df..7054a7a8065e 100644
--- a/trunk/include/linux/v4l2-mediabus.h
+++ b/trunk/include/linux/v4l2-mediabus.h
@@ -67,7 +67,7 @@ enum v4l2_mbus_pixelcode {
V4L2_MBUS_FMT_YUYV10_1X20 = 0x200d,
V4L2_MBUS_FMT_YVYU10_1X20 = 0x200e,
- /* Bayer - next is 0x3010 */
+ /* Bayer - next is 0x3013 */
V4L2_MBUS_FMT_SBGGR8_1X8 = 0x3001,
V4L2_MBUS_FMT_SGRBG8_1X8 = 0x3002,
V4L2_MBUS_FMT_SBGGR10_DPCM8_1X8 = 0x300b,
@@ -83,6 +83,9 @@ enum v4l2_mbus_pixelcode {
V4L2_MBUS_FMT_SGRBG10_1X10 = 0x300a,
V4L2_MBUS_FMT_SRGGB10_1X10 = 0x300f,
V4L2_MBUS_FMT_SBGGR12_1X12 = 0x3008,
+ V4L2_MBUS_FMT_SGBRG12_1X12 = 0x3010,
+ V4L2_MBUS_FMT_SGRBG12_1X12 = 0x3011,
+ V4L2_MBUS_FMT_SRGGB12_1X12 = 0x3012,
};
/**