Skip to content

Commit 01f6095

Browse files
6by9popcornmix
6by9
authored and
popcornmix
committed
media: rp1: cfe: Use the MIPI_CSI2_DT_xxx defines for csi_dt
Seeing as we now have the CSI2 data types defined, make use of them instead of hardcoding the values. Signed-off-by: Dave Stevenson <[email protected]>
1 parent 9242233 commit 01f6095

File tree

1 file changed

+32
-31
lines changed
  • drivers/media/platform/raspberrypi/rp1_cfe

1 file changed

+32
-31
lines changed

‎drivers/media/platform/raspberrypi/rp1_cfe/cfe_fmts.h

Lines changed: 32 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -9,68 +9,69 @@
99
#define _CFE_FMTS_H_
1010

1111
#include "cfe.h"
12+
#include <media/mipi-csi2.h>
1213

1314
static const struct cfe_fmt formats[] = {
1415
/* YUV Formats */
1516
{
1617
.fourcc = V4L2_PIX_FMT_YUYV,
1718
.code = MEDIA_BUS_FMT_YUYV8_1X16,
1819
.depth = 16,
19-
.csi_dt = 0x1e,
20+
.csi_dt = MIPI_CSI2_DT_YUV422_8B,
2021
},
2122
{
2223
.fourcc = V4L2_PIX_FMT_UYVY,
2324
.code = MEDIA_BUS_FMT_UYVY8_1X16,
2425
.depth = 16,
25-
.csi_dt = 0x1e,
26+
.csi_dt = MIPI_CSI2_DT_YUV422_8B,
2627
},
2728
{
2829
.fourcc = V4L2_PIX_FMT_YVYU,
2930
.code = MEDIA_BUS_FMT_YVYU8_1X16,
3031
.depth = 16,
31-
.csi_dt = 0x1e,
32+
.csi_dt = MIPI_CSI2_DT_YUV422_8B,
3233
},
3334
{
3435
.fourcc = V4L2_PIX_FMT_VYUY,
3536
.code = MEDIA_BUS_FMT_VYUY8_1X16,
3637
.depth = 16,
37-
.csi_dt = 0x1e,
38+
.csi_dt = MIPI_CSI2_DT_YUV422_8B,
3839
},
3940
{
4041
/* RGB Formats */
4142
.fourcc = V4L2_PIX_FMT_RGB565, /* gggbbbbb rrrrrggg */
4243
.code = MEDIA_BUS_FMT_RGB565_2X8_LE,
4344
.depth = 16,
44-
.csi_dt = 0x22,
45+
.csi_dt = MIPI_CSI2_DT_RGB565,
4546
},
4647
{ .fourcc = V4L2_PIX_FMT_RGB565X, /* rrrrrggg gggbbbbb */
4748
.code = MEDIA_BUS_FMT_RGB565_2X8_BE,
4849
.depth = 16,
49-
.csi_dt = 0x22
50+
.csi_dt = MIPI_CSI2_DT_RGB565,
5051
},
5152
{
5253
.fourcc = V4L2_PIX_FMT_RGB555, /* gggbbbbb arrrrrgg */
5354
.code = MEDIA_BUS_FMT_RGB555_2X8_PADHI_LE,
5455
.depth = 16,
55-
.csi_dt = 0x21,
56+
.csi_dt = MIPI_CSI2_DT_RGB555,
5657
},
5758
{
5859
.fourcc = V4L2_PIX_FMT_RGB555X, /* arrrrrgg gggbbbbb */
5960
.code = MEDIA_BUS_FMT_RGB555_2X8_PADHI_BE,
6061
.depth = 16,
61-
.csi_dt = 0x21,
62+
.csi_dt = MIPI_CSI2_DT_RGB555,
6263
},
6364
{
6465
.fourcc = V4L2_PIX_FMT_RGB24, /* rgb */
6566
.code = MEDIA_BUS_FMT_RGB888_1X24,
6667
.depth = 24,
67-
.csi_dt = 0x24,
68+
.csi_dt = MIPI_CSI2_DT_RGB888,
6869
},
6970
{
7071
.fourcc = V4L2_PIX_FMT_BGR24, /* bgr */
7172
.code = MEDIA_BUS_FMT_BGR888_1X24,
7273
.depth = 24,
73-
.csi_dt = 0x24,
74+
.csi_dt = MIPI_CSI2_DT_RGB888,
7475
},
7576
{
7677
.fourcc = V4L2_PIX_FMT_RGB32, /* argb */
@@ -84,112 +85,112 @@ static const struct cfe_fmt formats[] = {
8485
.fourcc = V4L2_PIX_FMT_SBGGR8,
8586
.code = MEDIA_BUS_FMT_SBGGR8_1X8,
8687
.depth = 8,
87-
.csi_dt = 0x2a,
88+
.csi_dt = MIPI_CSI2_DT_RAW8,
8889
.remap = { V4L2_PIX_FMT_SBGGR16, V4L2_PIX_FMT_PISP_COMP1_BGGR },
8990
},
9091
{
9192
.fourcc = V4L2_PIX_FMT_SGBRG8,
9293
.code = MEDIA_BUS_FMT_SGBRG8_1X8,
9394
.depth = 8,
94-
.csi_dt = 0x2a,
95+
.csi_dt = MIPI_CSI2_DT_RAW8,
9596
.remap = { V4L2_PIX_FMT_SGBRG16, V4L2_PIX_FMT_PISP_COMP1_GBRG },
9697
},
9798
{
9899
.fourcc = V4L2_PIX_FMT_SGRBG8,
99100
.code = MEDIA_BUS_FMT_SGRBG8_1X8,
100101
.depth = 8,
101-
.csi_dt = 0x2a,
102+
.csi_dt = MIPI_CSI2_DT_RAW8,
102103
.remap = { V4L2_PIX_FMT_SGRBG16, V4L2_PIX_FMT_PISP_COMP1_GRBG },
103104
},
104105
{
105106
.fourcc = V4L2_PIX_FMT_SRGGB8,
106107
.code = MEDIA_BUS_FMT_SRGGB8_1X8,
107108
.depth = 8,
108-
.csi_dt = 0x2a,
109+
.csi_dt = MIPI_CSI2_DT_RAW8,
109110
.remap = { V4L2_PIX_FMT_SRGGB16, V4L2_PIX_FMT_PISP_COMP1_RGGB },
110111
},
111112
{
112113
.fourcc = V4L2_PIX_FMT_SBGGR10P,
113114
.code = MEDIA_BUS_FMT_SBGGR10_1X10,
114115
.depth = 10,
115-
.csi_dt = 0x2b,
116+
.csi_dt = MIPI_CSI2_DT_RAW10,
116117
.remap = { V4L2_PIX_FMT_SBGGR16, V4L2_PIX_FMT_PISP_COMP1_BGGR },
117118
},
118119
{
119120
.fourcc = V4L2_PIX_FMT_SGBRG10P,
120121
.code = MEDIA_BUS_FMT_SGBRG10_1X10,
121122
.depth = 10,
122-
.csi_dt = 0x2b,
123+
.csi_dt = MIPI_CSI2_DT_RAW10,
123124
.remap = { V4L2_PIX_FMT_SGBRG16, V4L2_PIX_FMT_PISP_COMP1_GBRG },
124125
},
125126
{
126127
.fourcc = V4L2_PIX_FMT_SGRBG10P,
127128
.code = MEDIA_BUS_FMT_SGRBG10_1X10,
128129
.depth = 10,
129-
.csi_dt = 0x2b,
130+
.csi_dt = MIPI_CSI2_DT_RAW10,
130131
.remap = { V4L2_PIX_FMT_SGRBG16, V4L2_PIX_FMT_PISP_COMP1_GRBG },
131132
},
132133
{
133134
.fourcc = V4L2_PIX_FMT_SRGGB10P,
134135
.code = MEDIA_BUS_FMT_SRGGB10_1X10,
135136
.depth = 10,
136-
.csi_dt = 0x2b,
137+
.csi_dt = MIPI_CSI2_DT_RAW10,
137138
.remap = { V4L2_PIX_FMT_SRGGB16, V4L2_PIX_FMT_PISP_COMP1_RGGB },
138139
},
139140
{
140141
.fourcc = V4L2_PIX_FMT_SBGGR12P,
141142
.code = MEDIA_BUS_FMT_SBGGR12_1X12,
142143
.depth = 12,
143-
.csi_dt = 0x2c,
144+
.csi_dt = MIPI_CSI2_DT_RAW12,
144145
.remap = { V4L2_PIX_FMT_SBGGR16, V4L2_PIX_FMT_PISP_COMP1_BGGR },
145146
},
146147
{
147148
.fourcc = V4L2_PIX_FMT_SGBRG12P,
148149
.code = MEDIA_BUS_FMT_SGBRG12_1X12,
149150
.depth = 12,
150-
.csi_dt = 0x2c,
151+
.csi_dt = MIPI_CSI2_DT_RAW12,
151152
.remap = { V4L2_PIX_FMT_SGBRG16, V4L2_PIX_FMT_PISP_COMP1_GBRG },
152153
},
153154
{
154155
.fourcc = V4L2_PIX_FMT_SGRBG12P,
155156
.code = MEDIA_BUS_FMT_SGRBG12_1X12,
156157
.depth = 12,
157-
.csi_dt = 0x2c,
158+
.csi_dt = MIPI_CSI2_DT_RAW12,
158159
.remap = { V4L2_PIX_FMT_SGRBG16, V4L2_PIX_FMT_PISP_COMP1_GRBG },
159160
},
160161
{
161162
.fourcc = V4L2_PIX_FMT_SRGGB12P,
162163
.code = MEDIA_BUS_FMT_SRGGB12_1X12,
163164
.depth = 12,
164-
.csi_dt = 0x2c,
165+
.csi_dt = MIPI_CSI2_DT_RAW12,
165166
.remap = { V4L2_PIX_FMT_SRGGB16, V4L2_PIX_FMT_PISP_COMP1_RGGB },
166167
},
167168
{
168169
.fourcc = V4L2_PIX_FMT_SBGGR14P,
169170
.code = MEDIA_BUS_FMT_SBGGR14_1X14,
170171
.depth = 14,
171-
.csi_dt = 0x2d,
172+
.csi_dt = MIPI_CSI2_DT_RAW14,
172173
.remap = { V4L2_PIX_FMT_SBGGR16, V4L2_PIX_FMT_PISP_COMP1_BGGR },
173174
},
174175
{
175176
.fourcc = V4L2_PIX_FMT_SGBRG14P,
176177
.code = MEDIA_BUS_FMT_SGBRG14_1X14,
177178
.depth = 14,
178-
.csi_dt = 0x2d,
179+
.csi_dt = MIPI_CSI2_DT_RAW14,
179180
.remap = { V4L2_PIX_FMT_SGBRG16, V4L2_PIX_FMT_PISP_COMP1_GBRG },
180181
},
181182
{
182183
.fourcc = V4L2_PIX_FMT_SGRBG14P,
183184
.code = MEDIA_BUS_FMT_SGRBG14_1X14,
184185
.depth = 14,
185-
.csi_dt = 0x2d,
186+
.csi_dt = MIPI_CSI2_DT_RAW14,
186187
.remap = { V4L2_PIX_FMT_SGRBG16, V4L2_PIX_FMT_PISP_COMP1_GRBG },
187188
},
188189
{
189190
.fourcc = V4L2_PIX_FMT_SRGGB14P,
190191
.code = MEDIA_BUS_FMT_SRGGB14_1X14,
191192
.depth = 14,
192-
.csi_dt = 0x2d,
193+
.csi_dt = MIPI_CSI2_DT_RAW14,
193194
.remap = { V4L2_PIX_FMT_SRGGB16, V4L2_PIX_FMT_PISP_COMP1_RGGB },
194195
},
195196
{
@@ -250,27 +251,27 @@ static const struct cfe_fmt formats[] = {
250251
.fourcc = V4L2_PIX_FMT_GREY,
251252
.code = MEDIA_BUS_FMT_Y8_1X8,
252253
.depth = 8,
253-
.csi_dt = 0x2a,
254+
.csi_dt = MIPI_CSI2_DT_RAW8,
254255
},
255256
{
256257
.fourcc = V4L2_PIX_FMT_Y10P,
257258
.code = MEDIA_BUS_FMT_Y10_1X10,
258259
.depth = 10,
259-
.csi_dt = 0x2b,
260+
.csi_dt = MIPI_CSI2_DT_RAW10,
260261
.remap = { V4L2_PIX_FMT_Y16, V4L2_PIX_FMT_PISP_COMP1_MONO },
261262
},
262263
{
263264
.fourcc = V4L2_PIX_FMT_Y12P,
264265
.code = MEDIA_BUS_FMT_Y12_1X12,
265266
.depth = 12,
266-
.csi_dt = 0x2c,
267+
.csi_dt = MIPI_CSI2_DT_RAW12,
267268
.remap = { V4L2_PIX_FMT_Y16, V4L2_PIX_FMT_PISP_COMP1_MONO },
268269
},
269270
{
270271
.fourcc = V4L2_PIX_FMT_Y14P,
271272
.code = MEDIA_BUS_FMT_Y14_1X14,
272273
.depth = 14,
273-
.csi_dt = 0x2d,
274+
.csi_dt = MIPI_CSI2_DT_RAW14,
274275
.remap = { V4L2_PIX_FMT_Y16, V4L2_PIX_FMT_PISP_COMP1_MONO },
275276
},
276277
{
@@ -290,7 +291,7 @@ static const struct cfe_fmt formats[] = {
290291
.fourcc = V4L2_META_FMT_SENSOR_DATA,
291292
.code = MEDIA_BUS_FMT_SENSOR_DATA,
292293
.depth = 8,
293-
.csi_dt = 0x12,
294+
.csi_dt = MIPI_CSI2_DT_EMBEDDED_8B,
294295
.flags = CFE_FORMAT_FLAG_META_CAP,
295296
},
296297

0 commit comments

Comments
 (0)