projects / openwrt / staging / linusw.git / blob
? search:


b24d06cb45438f45b8454beee6de04d695d64f86
[openwrt/staging/linusw.git] /
1 From d079a51d8d34c2123d71c7ecfd8cefc2e7950109 Mon Sep 17 00:00:00 2001
2 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
3 Date: Fri, 20 Jan 2023 11:50:28 +0000
4 Subject: [PATCH 0412/1085] media: bcm2835-unicam: Use mipi-csi2.h header for
5 data type values
6
7 The MIPI CSI2 data type ID values are now defined in the
8 mipi-csi2.h header, so use those defines instead of hard
9 coding them in the driver.
10
11 Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
12 ---
13 .../media/platform/bcm2835/bcm2835-unicam.c | 69 ++++++++++---------
14 1 file changed, 35 insertions(+), 34 deletions(-)
15
16 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
17 +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
18 @@ -62,6 +62,7 @@
19 #include <linux/uaccess.h>
20 #include <linux/videodev2.h>
21
22 +#include <media/mipi-csi2.h>
23 #include <media/v4l2-common.h>
24 #include <media/v4l2-ctrls.h>
25 #include <media/v4l2-dev.h>
26 @@ -191,7 +192,7 @@ static const struct unicam_fmt formats[]
27 .fourcc = V4L2_PIX_FMT_YUYV,
28 .code = MEDIA_BUS_FMT_YUYV8_2X8,
29 .depth = 16,
30 - .csi_dt = 0x1e,
31 + .csi_dt = MIPI_CSI2_DT_YUV422_8B,
32 .check_variants = 1,
33 .valid_colorspaces = MASK_CS_SMPTE170M | MASK_CS_REC709 |
34 MASK_CS_JPEG,
35 @@ -199,7 +200,7 @@ static const struct unicam_fmt formats[]
36 .fourcc = V4L2_PIX_FMT_UYVY,
37 .code = MEDIA_BUS_FMT_UYVY8_2X8,
38 .depth = 16,
39 - .csi_dt = 0x1e,
40 + .csi_dt = MIPI_CSI2_DT_YUV422_8B,
41 .check_variants = 1,
42 .valid_colorspaces = MASK_CS_SMPTE170M | MASK_CS_REC709 |
43 MASK_CS_JPEG,
44 @@ -207,7 +208,7 @@ static const struct unicam_fmt formats[]
45 .fourcc = V4L2_PIX_FMT_YVYU,
46 .code = MEDIA_BUS_FMT_YVYU8_2X8,
47 .depth = 16,
48 - .csi_dt = 0x1e,
49 + .csi_dt = MIPI_CSI2_DT_YUV422_8B,
50 .check_variants = 1,
51 .valid_colorspaces = MASK_CS_SMPTE170M | MASK_CS_REC709 |
52 MASK_CS_JPEG,
53 @@ -215,7 +216,7 @@ static const struct unicam_fmt formats[]
54 .fourcc = V4L2_PIX_FMT_VYUY,
55 .code = MEDIA_BUS_FMT_VYUY8_2X8,
56 .depth = 16,
57 - .csi_dt = 0x1e,
58 + .csi_dt = MIPI_CSI2_DT_YUV422_8B,
59 .check_variants = 1,
60 .valid_colorspaces = MASK_CS_SMPTE170M | MASK_CS_REC709 |
61 MASK_CS_JPEG,
62 @@ -223,7 +224,7 @@ static const struct unicam_fmt formats[]
63 .fourcc = V4L2_PIX_FMT_YUYV,
64 .code = MEDIA_BUS_FMT_YUYV8_1X16,
65 .depth = 16,
66 - .csi_dt = 0x1e,
67 + .csi_dt = MIPI_CSI2_DT_YUV422_8B,
68 .mc_skip = 1,
69 .valid_colorspaces = MASK_CS_SMPTE170M | MASK_CS_REC709 |
70 MASK_CS_JPEG,
71 @@ -231,7 +232,7 @@ static const struct unicam_fmt formats[]
72 .fourcc = V4L2_PIX_FMT_UYVY,
73 .code = MEDIA_BUS_FMT_UYVY8_1X16,
74 .depth = 16,
75 - .csi_dt = 0x1e,
76 + .csi_dt = MIPI_CSI2_DT_YUV422_8B,
77 .mc_skip = 1,
78 .valid_colorspaces = MASK_CS_SMPTE170M | MASK_CS_REC709 |
79 MASK_CS_JPEG,
80 @@ -239,7 +240,7 @@ static const struct unicam_fmt formats[]
81 .fourcc = V4L2_PIX_FMT_YVYU,
82 .code = MEDIA_BUS_FMT_YVYU8_1X16,
83 .depth = 16,
84 - .csi_dt = 0x1e,
85 + .csi_dt = MIPI_CSI2_DT_YUV422_8B,
86 .mc_skip = 1,
87 .valid_colorspaces = MASK_CS_SMPTE170M | MASK_CS_REC709 |
88 MASK_CS_JPEG,
89 @@ -247,7 +248,7 @@ static const struct unicam_fmt formats[]
90 .fourcc = V4L2_PIX_FMT_VYUY,
91 .code = MEDIA_BUS_FMT_VYUY8_1X16,
92 .depth = 16,
93 - .csi_dt = 0x1e,
94 + .csi_dt = MIPI_CSI2_DT_YUV422_8B,
95 .mc_skip = 1,
96 .valid_colorspaces = MASK_CS_SMPTE170M | MASK_CS_REC709 |
97 MASK_CS_JPEG,
98 @@ -256,37 +257,37 @@ static const struct unicam_fmt formats[]
99 .fourcc = V4L2_PIX_FMT_RGB565, /* gggbbbbb rrrrrggg */
100 .code = MEDIA_BUS_FMT_RGB565_2X8_LE,
101 .depth = 16,
102 - .csi_dt = 0x22,
103 + .csi_dt = MIPI_CSI2_DT_RGB565,
104 .valid_colorspaces = MASK_CS_SRGB,
105 }, {
106 .fourcc = V4L2_PIX_FMT_RGB565X, /* rrrrrggg gggbbbbb */
107 .code = MEDIA_BUS_FMT_RGB565_2X8_BE,
108 .depth = 16,
109 - .csi_dt = 0x22,
110 + .csi_dt = MIPI_CSI2_DT_RGB565,
111 .valid_colorspaces = MASK_CS_SRGB,
112 }, {
113 .fourcc = V4L2_PIX_FMT_RGB555, /* gggbbbbb arrrrrgg */
114 .code = MEDIA_BUS_FMT_RGB555_2X8_PADHI_LE,
115 .depth = 16,
116 - .csi_dt = 0x21,
117 + .csi_dt = MIPI_CSI2_DT_RGB555,
118 .valid_colorspaces = MASK_CS_SRGB,
119 }, {
120 .fourcc = V4L2_PIX_FMT_RGB555X, /* arrrrrgg gggbbbbb */
121 .code = MEDIA_BUS_FMT_RGB555_2X8_PADHI_BE,
122 .depth = 16,
123 - .csi_dt = 0x21,
124 + .csi_dt = MIPI_CSI2_DT_RGB555,
125 .valid_colorspaces = MASK_CS_SRGB,
126 }, {
127 .fourcc = V4L2_PIX_FMT_RGB24, /* rgb */
128 .code = MEDIA_BUS_FMT_RGB888_1X24,
129 .depth = 24,
130 - .csi_dt = 0x24,
131 + .csi_dt = MIPI_CSI2_DT_RGB888,
132 .valid_colorspaces = MASK_CS_SRGB,
133 }, {
134 .fourcc = V4L2_PIX_FMT_BGR24, /* bgr */
135 .code = MEDIA_BUS_FMT_BGR888_1X24,
136 .depth = 24,
137 - .csi_dt = 0x24,
138 + .csi_dt = MIPI_CSI2_DT_RGB888,
139 .valid_colorspaces = MASK_CS_SRGB,
140 }, {
141 .fourcc = V4L2_PIX_FMT_RGB32, /* argb */
142 @@ -299,109 +300,109 @@ static const struct unicam_fmt formats[]
143 .fourcc = V4L2_PIX_FMT_SBGGR8,
144 .code = MEDIA_BUS_FMT_SBGGR8_1X8,
145 .depth = 8,
146 - .csi_dt = 0x2a,
147 + .csi_dt = MIPI_CSI2_DT_RAW8,
148 .valid_colorspaces = MASK_CS_RAW,
149 }, {
150 .fourcc = V4L2_PIX_FMT_SGBRG8,
151 .code = MEDIA_BUS_FMT_SGBRG8_1X8,
152 .depth = 8,
153 - .csi_dt = 0x2a,
154 + .csi_dt = MIPI_CSI2_DT_RAW8,
155 .valid_colorspaces = MASK_CS_RAW,
156 }, {
157 .fourcc = V4L2_PIX_FMT_SGRBG8,
158 .code = MEDIA_BUS_FMT_SGRBG8_1X8,
159 .depth = 8,
160 - .csi_dt = 0x2a,
161 + .csi_dt = MIPI_CSI2_DT_RAW8,
162 .valid_colorspaces = MASK_CS_RAW,
163 }, {
164 .fourcc = V4L2_PIX_FMT_SRGGB8,
165 .code = MEDIA_BUS_FMT_SRGGB8_1X8,
166 .depth = 8,
167 - .csi_dt = 0x2a,
168 + .csi_dt = MIPI_CSI2_DT_RAW8,
169 .valid_colorspaces = MASK_CS_RAW,
170 }, {
171 .fourcc = V4L2_PIX_FMT_SBGGR10P,
172 .repacked_fourcc = V4L2_PIX_FMT_SBGGR10,
173 .code = MEDIA_BUS_FMT_SBGGR10_1X10,
174 .depth = 10,
175 - .csi_dt = 0x2b,
176 + .csi_dt = MIPI_CSI2_DT_RAW10,
177 .valid_colorspaces = MASK_CS_RAW,
178 }, {
179 .fourcc = V4L2_PIX_FMT_SGBRG10P,
180 .repacked_fourcc = V4L2_PIX_FMT_SGBRG10,
181 .code = MEDIA_BUS_FMT_SGBRG10_1X10,
182 .depth = 10,
183 - .csi_dt = 0x2b,
184 + .csi_dt = MIPI_CSI2_DT_RAW10,
185 .valid_colorspaces = MASK_CS_RAW,
186 }, {
187 .fourcc = V4L2_PIX_FMT_SGRBG10P,
188 .repacked_fourcc = V4L2_PIX_FMT_SGRBG10,
189 .code = MEDIA_BUS_FMT_SGRBG10_1X10,
190 .depth = 10,
191 - .csi_dt = 0x2b,
192 + .csi_dt = MIPI_CSI2_DT_RAW10,
193 .valid_colorspaces = MASK_CS_RAW,
194 }, {
195 .fourcc = V4L2_PIX_FMT_SRGGB10P,
196 .repacked_fourcc = V4L2_PIX_FMT_SRGGB10,
197 .code = MEDIA_BUS_FMT_SRGGB10_1X10,
198 .depth = 10,
199 - .csi_dt = 0x2b,
200 + .csi_dt = MIPI_CSI2_DT_RAW10,
201 .valid_colorspaces = MASK_CS_RAW,
202 }, {
203 .fourcc = V4L2_PIX_FMT_SBGGR12P,
204 .repacked_fourcc = V4L2_PIX_FMT_SBGGR12,
205 .code = MEDIA_BUS_FMT_SBGGR12_1X12,
206 .depth = 12,
207 - .csi_dt = 0x2c,
208 + .csi_dt = MIPI_CSI2_DT_RAW12,
209 .valid_colorspaces = MASK_CS_RAW,
210 }, {
211 .fourcc = V4L2_PIX_FMT_SGBRG12P,
212 .repacked_fourcc = V4L2_PIX_FMT_SGBRG12,
213 .code = MEDIA_BUS_FMT_SGBRG12_1X12,
214 .depth = 12,
215 - .csi_dt = 0x2c,
216 + .csi_dt = MIPI_CSI2_DT_RAW12,
217 .valid_colorspaces = MASK_CS_RAW,
218 }, {
219 .fourcc = V4L2_PIX_FMT_SGRBG12P,
220 .repacked_fourcc = V4L2_PIX_FMT_SGRBG12,
221 .code = MEDIA_BUS_FMT_SGRBG12_1X12,
222 .depth = 12,
223 - .csi_dt = 0x2c,
224 + .csi_dt = MIPI_CSI2_DT_RAW12,
225 .valid_colorspaces = MASK_CS_RAW,
226 }, {
227 .fourcc = V4L2_PIX_FMT_SRGGB12P,
228 .repacked_fourcc = V4L2_PIX_FMT_SRGGB12,
229 .code = MEDIA_BUS_FMT_SRGGB12_1X12,
230 .depth = 12,
231 - .csi_dt = 0x2c,
232 + .csi_dt = MIPI_CSI2_DT_RAW12,
233 .valid_colorspaces = MASK_CS_RAW,
234 }, {
235 .fourcc = V4L2_PIX_FMT_SBGGR14P,
236 .repacked_fourcc = V4L2_PIX_FMT_SBGGR14,
237 .code = MEDIA_BUS_FMT_SBGGR14_1X14,
238 .depth = 14,
239 - .csi_dt = 0x2d,
240 + .csi_dt = MIPI_CSI2_DT_RAW14,
241 .valid_colorspaces = MASK_CS_RAW,
242 }, {
243 .fourcc = V4L2_PIX_FMT_SGBRG14P,
244 .repacked_fourcc = V4L2_PIX_FMT_SGBRG14,
245 .code = MEDIA_BUS_FMT_SGBRG14_1X14,
246 .depth = 14,
247 - .csi_dt = 0x2d,
248 + .csi_dt = MIPI_CSI2_DT_RAW14,
249 .valid_colorspaces = MASK_CS_RAW,
250 }, {
251 .fourcc = V4L2_PIX_FMT_SGRBG14P,
252 .repacked_fourcc = V4L2_PIX_FMT_SGRBG14,
253 .code = MEDIA_BUS_FMT_SGRBG14_1X14,
254 .depth = 14,
255 - .csi_dt = 0x2d,
256 + .csi_dt = MIPI_CSI2_DT_RAW14,
257 .valid_colorspaces = MASK_CS_RAW,
258 }, {
259 .fourcc = V4L2_PIX_FMT_SRGGB14P,
260 .repacked_fourcc = V4L2_PIX_FMT_SRGGB14,
261 .code = MEDIA_BUS_FMT_SRGGB14_1X14,
262 .depth = 14,
263 - .csi_dt = 0x2d,
264 + .csi_dt = MIPI_CSI2_DT_RAW14,
265 .valid_colorspaces = MASK_CS_RAW,
266 }, {
267 /*
268 @@ -414,28 +415,28 @@ static const struct unicam_fmt formats[]
269 .fourcc = V4L2_PIX_FMT_GREY,
270 .code = MEDIA_BUS_FMT_Y8_1X8,
271 .depth = 8,
272 - .csi_dt = 0x2a,
273 + .csi_dt = MIPI_CSI2_DT_RAW8,
274 .valid_colorspaces = MASK_CS_RAW,
275 }, {
276 .fourcc = V4L2_PIX_FMT_Y10P,
277 .repacked_fourcc = V4L2_PIX_FMT_Y10,
278 .code = MEDIA_BUS_FMT_Y10_1X10,
279 .depth = 10,
280 - .csi_dt = 0x2b,
281 + .csi_dt = MIPI_CSI2_DT_RAW10,
282 .valid_colorspaces = MASK_CS_RAW,
283 }, {
284 .fourcc = V4L2_PIX_FMT_Y12P,
285 .repacked_fourcc = V4L2_PIX_FMT_Y12,
286 .code = MEDIA_BUS_FMT_Y12_1X12,
287 .depth = 12,
288 - .csi_dt = 0x2c,
289 + .csi_dt = MIPI_CSI2_DT_RAW12,
290 .valid_colorspaces = MASK_CS_RAW,
291 }, {
292 .fourcc = V4L2_PIX_FMT_Y14P,
293 .repacked_fourcc = V4L2_PIX_FMT_Y14,
294 .code = MEDIA_BUS_FMT_Y14_1X14,
295 .depth = 14,
296 - .csi_dt = 0x2d,
297 + .csi_dt = MIPI_CSI2_DT_RAW14,
298 .valid_colorspaces = MASK_CS_RAW,
299 },
300 /* Embedded data format */
Staging tree of Linus Walleij