Hi Mauro,
Today's linux-next merge of the v4l-dvb tree got a conflict in
Documentation/DocBook/media/v4l/subdev-formats.xml between various
commits from Linus' tree and various commits from the v4l-dvb tree.
I reported this previously against the drm tree, but some of the
numbers have changed now.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc Documentation/DocBook/media/v4l/subdev-formats.xml
index 553a38024745,bc8d3fb9e4a9..000000000000
--- a/Documentation/DocBook/media/v4l/subdev-formats.xml
+++ b/Documentation/DocBook/media/v4l/subdev-formats.xml
@@@ -482,96 -440,36 +482,126 @@@ see .b1
b0
+
+ MEDIA_BUS_FMT_RGB666_1X24_CPADHI
+ 0x1015
+
+ &dash-ent-8;
+ 0
+ 0
+ r5
+ r4
+ r3
+ r2
+ r1
+ r0
+ 0
+ 0
+ g5
+ g4
+ g3
+ g2
+ g1
+ g0
+ 0
+ 0
+ b5
+ b4
+ b3
+ b2
+ b1
+ b0
+
+
+ MEDIA_BUS_FMT_BGR888_1X24
+ 0x1013
+
+ &dash-ent-8;
+ b7
+ b6
+ b5
+ b4
+ b3
+ b2
+ b1
+ b0
+ g7
+ g6
+ g5
+ g4
+ g3
+ g2
+ g1
+ g0
+ r7
+ r6
+ r5
+ r4
+ r3
+ r2
+ r1
+ r0
+
+
+ MEDIA_BUS_FMT_GBR888_1X24
+ 0x1014
+
+ &dash-ent-8;
+ g7
+ g6
+ g5
+ g4
+ g3
+ g2
+ g1
+ g0
+ b7
+ b6
+ b5
+ b4
+ b3
+ b2
+ b1
+ b0
+ r7
+ r6
+ r5
+ r4
+ r3
+ r2
+ r1
+ r0
+
+
+ MEDIA_BUS_FMT_RBG888_1X24
+ 0x100e
+
+ &dash-ent-8;
+ r7
+ r6
+ r5
+ r4
+ r3
+ r2
+ r1
+ r0
+ b7
+ b6
+ b5
+ b4
+ b3
+ b2
+ b1
+ b0
+ g7
+ g6
+ g5
+ g4
+ g3
+ g2
+ g1
+ g0
+
MEDIA_BUS_FMT_RGB888_1X24
0x100a
@@@ -3047,92 -2719,33 +3106,92 @@@
u1
u0
+
+ MEDIA_BUS_FMT_YUV8_1X24
+ 0x2025
+
+ -
+ -
+ -
+ -
+ -
+ -
+ -
+ -
+ y7
+ y6
+ y5
+ y4
+ y3
+ y2
+ y1
+ y0
+ u7
+ u6
+ u5
+ u4
+ u3
+ u2
+ u1
+ u0
+ v7
+ v6
+ v5
+ v4
+ v3
+ v2
+ v1
+ v0
+
+
+ MEDIA_BUS_FMT_YUV10_1X30
+ 0x2016
+
- -
- -
- y9
- y8
++ &dash-ent-16;
+ y7
+ y6
+ y5
+ y4
+ y3
+ y2
+ y1
+ y0
- u9
- u8
- u7
- u6
- u5
- u4
- u3
- u2
- u1
- u0
- v9
- v8
- v7
- v6
- v5
- v4
- v3
- v2
- v1
- v0
++ d
++ d
++ d
++ d
++ d
++ d
++ d
++ d
+
-
- MEDIA_BUS_FMT_AYUV8_1X32
- 0x2017
+
+ MEDIA_BUS_FMT_YDYUYDYV8_1X16
+ 0x2014
- a7
- a6
- a5
- a4
- a3
- a2
- a1
- a0
+ &dash-ent-16;
+ y7
+ y6
+ y5
+ y4
+ y3
+ y2
+ y1
+ y0
+ d
+ d
+ d
+ d
+ d
+ d
+ d
+ d
+
+
+
+
+
+ &dash-ent-16;
y7
y6
y5