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


ece915a4560dd4cf43a8eca883207a849c1bac04
[openwrt/staging/pepe2k.git] /
1 From 019c78a29bba078fdfe4c3feed570af46c18d79b Mon Sep 17 00:00:00 2001
2 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
3 Date: Fri, 22 Dec 2023 11:50:38 +0000
4 Subject: [PATCH 0815/1085] media: rp1: cfe: Use the MIPI_CSI2_DT_xxx defines
5 for csi_dt
6
7 Seeing as we now have the CSI2 data types defined, make use of
8 them instead of hardcoding the values.
9
10 Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
11 ---
12 .../platform/raspberrypi/rp1_cfe/cfe_fmts.h | 63 ++++++++++---------
13 1 file changed, 32 insertions(+), 31 deletions(-)
14
15 --- a/drivers/media/platform/raspberrypi/rp1_cfe/cfe_fmts.h
16 +++ b/drivers/media/platform/raspberrypi/rp1_cfe/cfe_fmts.h
17 @@ -9,6 +9,7 @@
18 #define _CFE_FMTS_H_
19
20 #include "cfe.h"
21 +#include <media/mipi-csi2.h>
22
23 static const struct cfe_fmt formats[] = {
24 /* YUV Formats */
25 @@ -16,61 +17,61 @@ static const struct cfe_fmt formats[] =
26 .fourcc = V4L2_PIX_FMT_YUYV,
27 .code = MEDIA_BUS_FMT_YUYV8_1X16,
28 .depth = 16,
29 - .csi_dt = 0x1e,
30 + .csi_dt = MIPI_CSI2_DT_YUV422_8B,
31 },
32 {
33 .fourcc = V4L2_PIX_FMT_UYVY,
34 .code = MEDIA_BUS_FMT_UYVY8_1X16,
35 .depth = 16,
36 - .csi_dt = 0x1e,
37 + .csi_dt = MIPI_CSI2_DT_YUV422_8B,
38 },
39 {
40 .fourcc = V4L2_PIX_FMT_YVYU,
41 .code = MEDIA_BUS_FMT_YVYU8_1X16,
42 .depth = 16,
43 - .csi_dt = 0x1e,
44 + .csi_dt = MIPI_CSI2_DT_YUV422_8B,
45 },
46 {
47 .fourcc = V4L2_PIX_FMT_VYUY,
48 .code = MEDIA_BUS_FMT_VYUY8_1X16,
49 .depth = 16,
50 - .csi_dt = 0x1e,
51 + .csi_dt = MIPI_CSI2_DT_YUV422_8B,
52 },
53 {
54 /* RGB Formats */
55 .fourcc = V4L2_PIX_FMT_RGB565, /* gggbbbbb rrrrrggg */
56 .code = MEDIA_BUS_FMT_RGB565_2X8_LE,
57 .depth = 16,
58 - .csi_dt = 0x22,
59 + .csi_dt = MIPI_CSI2_DT_RGB565,
60 },
61 { .fourcc = V4L2_PIX_FMT_RGB565X, /* rrrrrggg gggbbbbb */
62 .code = MEDIA_BUS_FMT_RGB565_2X8_BE,
63 .depth = 16,
64 - .csi_dt = 0x22
65 + .csi_dt = MIPI_CSI2_DT_RGB565,
66 },
67 {
68 .fourcc = V4L2_PIX_FMT_RGB555, /* gggbbbbb arrrrrgg */
69 .code = MEDIA_BUS_FMT_RGB555_2X8_PADHI_LE,
70 .depth = 16,
71 - .csi_dt = 0x21,
72 + .csi_dt = MIPI_CSI2_DT_RGB555,
73 },
74 {
75 .fourcc = V4L2_PIX_FMT_RGB555X, /* arrrrrgg gggbbbbb */
76 .code = MEDIA_BUS_FMT_RGB555_2X8_PADHI_BE,
77 .depth = 16,
78 - .csi_dt = 0x21,
79 + .csi_dt = MIPI_CSI2_DT_RGB555,
80 },
81 {
82 .fourcc = V4L2_PIX_FMT_RGB24, /* rgb */
83 .code = MEDIA_BUS_FMT_RGB888_1X24,
84 .depth = 24,
85 - .csi_dt = 0x24,
86 + .csi_dt = MIPI_CSI2_DT_RGB888,
87 },
88 {
89 .fourcc = V4L2_PIX_FMT_BGR24, /* bgr */
90 .code = MEDIA_BUS_FMT_BGR888_1X24,
91 .depth = 24,
92 - .csi_dt = 0x24,
93 + .csi_dt = MIPI_CSI2_DT_RGB888,
94 },
95 {
96 .fourcc = V4L2_PIX_FMT_RGB32, /* argb */
97 @@ -84,112 +85,112 @@ static const struct cfe_fmt formats[] =
98 .fourcc = V4L2_PIX_FMT_SBGGR8,
99 .code = MEDIA_BUS_FMT_SBGGR8_1X8,
100 .depth = 8,
101 - .csi_dt = 0x2a,
102 + .csi_dt = MIPI_CSI2_DT_RAW8,
103 .remap = { V4L2_PIX_FMT_SBGGR16, V4L2_PIX_FMT_PISP_COMP1_BGGR },
104 },
105 {
106 .fourcc = V4L2_PIX_FMT_SGBRG8,
107 .code = MEDIA_BUS_FMT_SGBRG8_1X8,
108 .depth = 8,
109 - .csi_dt = 0x2a,
110 + .csi_dt = MIPI_CSI2_DT_RAW8,
111 .remap = { V4L2_PIX_FMT_SGBRG16, V4L2_PIX_FMT_PISP_COMP1_GBRG },
112 },
113 {
114 .fourcc = V4L2_PIX_FMT_SGRBG8,
115 .code = MEDIA_BUS_FMT_SGRBG8_1X8,
116 .depth = 8,
117 - .csi_dt = 0x2a,
118 + .csi_dt = MIPI_CSI2_DT_RAW8,
119 .remap = { V4L2_PIX_FMT_SGRBG16, V4L2_PIX_FMT_PISP_COMP1_GRBG },
120 },
121 {
122 .fourcc = V4L2_PIX_FMT_SRGGB8,
123 .code = MEDIA_BUS_FMT_SRGGB8_1X8,
124 .depth = 8,
125 - .csi_dt = 0x2a,
126 + .csi_dt = MIPI_CSI2_DT_RAW8,
127 .remap = { V4L2_PIX_FMT_SRGGB16, V4L2_PIX_FMT_PISP_COMP1_RGGB },
128 },
129 {
130 .fourcc = V4L2_PIX_FMT_SBGGR10P,
131 .code = MEDIA_BUS_FMT_SBGGR10_1X10,
132 .depth = 10,
133 - .csi_dt = 0x2b,
134 + .csi_dt = MIPI_CSI2_DT_RAW10,
135 .remap = { V4L2_PIX_FMT_SBGGR16, V4L2_PIX_FMT_PISP_COMP1_BGGR },
136 },
137 {
138 .fourcc = V4L2_PIX_FMT_SGBRG10P,
139 .code = MEDIA_BUS_FMT_SGBRG10_1X10,
140 .depth = 10,
141 - .csi_dt = 0x2b,
142 + .csi_dt = MIPI_CSI2_DT_RAW10,
143 .remap = { V4L2_PIX_FMT_SGBRG16, V4L2_PIX_FMT_PISP_COMP1_GBRG },
144 },
145 {
146 .fourcc = V4L2_PIX_FMT_SGRBG10P,
147 .code = MEDIA_BUS_FMT_SGRBG10_1X10,
148 .depth = 10,
149 - .csi_dt = 0x2b,
150 + .csi_dt = MIPI_CSI2_DT_RAW10,
151 .remap = { V4L2_PIX_FMT_SGRBG16, V4L2_PIX_FMT_PISP_COMP1_GRBG },
152 },
153 {
154 .fourcc = V4L2_PIX_FMT_SRGGB10P,
155 .code = MEDIA_BUS_FMT_SRGGB10_1X10,
156 .depth = 10,
157 - .csi_dt = 0x2b,
158 + .csi_dt = MIPI_CSI2_DT_RAW10,
159 .remap = { V4L2_PIX_FMT_SRGGB16, V4L2_PIX_FMT_PISP_COMP1_RGGB },
160 },
161 {
162 .fourcc = V4L2_PIX_FMT_SBGGR12P,
163 .code = MEDIA_BUS_FMT_SBGGR12_1X12,
164 .depth = 12,
165 - .csi_dt = 0x2c,
166 + .csi_dt = MIPI_CSI2_DT_RAW12,
167 .remap = { V4L2_PIX_FMT_SBGGR16, V4L2_PIX_FMT_PISP_COMP1_BGGR },
168 },
169 {
170 .fourcc = V4L2_PIX_FMT_SGBRG12P,
171 .code = MEDIA_BUS_FMT_SGBRG12_1X12,
172 .depth = 12,
173 - .csi_dt = 0x2c,
174 + .csi_dt = MIPI_CSI2_DT_RAW12,
175 .remap = { V4L2_PIX_FMT_SGBRG16, V4L2_PIX_FMT_PISP_COMP1_GBRG },
176 },
177 {
178 .fourcc = V4L2_PIX_FMT_SGRBG12P,
179 .code = MEDIA_BUS_FMT_SGRBG12_1X12,
180 .depth = 12,
181 - .csi_dt = 0x2c,
182 + .csi_dt = MIPI_CSI2_DT_RAW12,
183 .remap = { V4L2_PIX_FMT_SGRBG16, V4L2_PIX_FMT_PISP_COMP1_GRBG },
184 },
185 {
186 .fourcc = V4L2_PIX_FMT_SRGGB12P,
187 .code = MEDIA_BUS_FMT_SRGGB12_1X12,
188 .depth = 12,
189 - .csi_dt = 0x2c,
190 + .csi_dt = MIPI_CSI2_DT_RAW12,
191 .remap = { V4L2_PIX_FMT_SRGGB16, V4L2_PIX_FMT_PISP_COMP1_RGGB },
192 },
193 {
194 .fourcc = V4L2_PIX_FMT_SBGGR14P,
195 .code = MEDIA_BUS_FMT_SBGGR14_1X14,
196 .depth = 14,
197 - .csi_dt = 0x2d,
198 + .csi_dt = MIPI_CSI2_DT_RAW14,
199 .remap = { V4L2_PIX_FMT_SBGGR16, V4L2_PIX_FMT_PISP_COMP1_BGGR },
200 },
201 {
202 .fourcc = V4L2_PIX_FMT_SGBRG14P,
203 .code = MEDIA_BUS_FMT_SGBRG14_1X14,
204 .depth = 14,
205 - .csi_dt = 0x2d,
206 + .csi_dt = MIPI_CSI2_DT_RAW14,
207 .remap = { V4L2_PIX_FMT_SGBRG16, V4L2_PIX_FMT_PISP_COMP1_GBRG },
208 },
209 {
210 .fourcc = V4L2_PIX_FMT_SGRBG14P,
211 .code = MEDIA_BUS_FMT_SGRBG14_1X14,
212 .depth = 14,
213 - .csi_dt = 0x2d,
214 + .csi_dt = MIPI_CSI2_DT_RAW14,
215 .remap = { V4L2_PIX_FMT_SGRBG16, V4L2_PIX_FMT_PISP_COMP1_GRBG },
216 },
217 {
218 .fourcc = V4L2_PIX_FMT_SRGGB14P,
219 .code = MEDIA_BUS_FMT_SRGGB14_1X14,
220 .depth = 14,
221 - .csi_dt = 0x2d,
222 + .csi_dt = MIPI_CSI2_DT_RAW14,
223 .remap = { V4L2_PIX_FMT_SRGGB16, V4L2_PIX_FMT_PISP_COMP1_RGGB },
224 },
225 {
226 @@ -250,27 +251,27 @@ static const struct cfe_fmt formats[] =
227 .fourcc = V4L2_PIX_FMT_GREY,
228 .code = MEDIA_BUS_FMT_Y8_1X8,
229 .depth = 8,
230 - .csi_dt = 0x2a,
231 + .csi_dt = MIPI_CSI2_DT_RAW8,
232 },
233 {
234 .fourcc = V4L2_PIX_FMT_Y10P,
235 .code = MEDIA_BUS_FMT_Y10_1X10,
236 .depth = 10,
237 - .csi_dt = 0x2b,
238 + .csi_dt = MIPI_CSI2_DT_RAW10,
239 .remap = { V4L2_PIX_FMT_Y16, V4L2_PIX_FMT_PISP_COMP1_MONO },
240 },
241 {
242 .fourcc = V4L2_PIX_FMT_Y12P,
243 .code = MEDIA_BUS_FMT_Y12_1X12,
244 .depth = 12,
245 - .csi_dt = 0x2c,
246 + .csi_dt = MIPI_CSI2_DT_RAW12,
247 .remap = { V4L2_PIX_FMT_Y16, V4L2_PIX_FMT_PISP_COMP1_MONO },
248 },
249 {
250 .fourcc = V4L2_PIX_FMT_Y14P,
251 .code = MEDIA_BUS_FMT_Y14_1X14,
252 .depth = 14,
253 - .csi_dt = 0x2d,
254 + .csi_dt = MIPI_CSI2_DT_RAW14,
255 .remap = { V4L2_PIX_FMT_Y16, V4L2_PIX_FMT_PISP_COMP1_MONO },
256 },
257 {
258 @@ -290,7 +291,7 @@ static const struct cfe_fmt formats[] =
259 .fourcc = V4L2_META_FMT_SENSOR_DATA,
260 .code = MEDIA_BUS_FMT_SENSOR_DATA,
261 .depth = 8,
262 - .csi_dt = 0x12,
263 + .csi_dt = MIPI_CSI2_DT_EMBEDDED_8B,
264 .flags = CFE_FORMAT_FLAG_META_CAP,
265 },
266
Staging tree of Piotr Dymacz