tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
media: rockchip: rkisp1: Use mipi-csi2.h
Replace the driver-specific definitions of MIPI CSI-2 data types with
macros from mipi-csi2.h.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Tested-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com>
Reviewed-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
authored by
Laurent Pinchart
and committed by
Mauro Carvalho Chehab
117368f0
f87c445c
+18
-27
+18
-16
drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
+18
-16
drivers/media/platform/rockchip/rkisp1/rkisp1-isp.c
···
14
14
#include <linux/pm_runtime.h>
15
15
#include <linux/videodev2.h>
16
16
#include <linux/vmalloc.h>
17
+
18
+
#include <media/mipi-csi2.h>
17
19
#include <media/v4l2-event.h>
18
20
19
21
#include "rkisp1-common.h"
···
64
62
}, {
65
63
.mbus_code = MEDIA_BUS_FMT_SRGGB10_1X10,
66
64
.pixel_enc = V4L2_PIXEL_ENC_BAYER,
67
-
.mipi_dt = RKISP1_CIF_CSI2_DT_RAW10,
65
+
.mipi_dt = MIPI_CSI2_DT_RAW10,
68
66
.bayer_pat = RKISP1_RAW_RGGB,
69
67
.bus_width = 10,
70
68
.direction = RKISP1_ISP_SD_SINK | RKISP1_ISP_SD_SRC,
71
69
}, {
72
70
.mbus_code = MEDIA_BUS_FMT_SBGGR10_1X10,
73
71
.pixel_enc = V4L2_PIXEL_ENC_BAYER,
74
-
.mipi_dt = RKISP1_CIF_CSI2_DT_RAW10,
72
+
.mipi_dt = MIPI_CSI2_DT_RAW10,
75
73
.bayer_pat = RKISP1_RAW_BGGR,
76
74
.bus_width = 10,
77
75
.direction = RKISP1_ISP_SD_SINK | RKISP1_ISP_SD_SRC,
78
76
}, {
79
77
.mbus_code = MEDIA_BUS_FMT_SGBRG10_1X10,
80
78
.pixel_enc = V4L2_PIXEL_ENC_BAYER,
81
-
.mipi_dt = RKISP1_CIF_CSI2_DT_RAW10,
79
+
.mipi_dt = MIPI_CSI2_DT_RAW10,
82
80
.bayer_pat = RKISP1_RAW_GBRG,
83
81
.bus_width = 10,
84
82
.direction = RKISP1_ISP_SD_SINK | RKISP1_ISP_SD_SRC,
85
83
}, {
86
84
.mbus_code = MEDIA_BUS_FMT_SGRBG10_1X10,
87
85
.pixel_enc = V4L2_PIXEL_ENC_BAYER,
88
-
.mipi_dt = RKISP1_CIF_CSI2_DT_RAW10,
86
+
.mipi_dt = MIPI_CSI2_DT_RAW10,
89
87
.bayer_pat = RKISP1_RAW_GRBG,
90
88
.bus_width = 10,
91
89
.direction = RKISP1_ISP_SD_SINK | RKISP1_ISP_SD_SRC,
92
90
}, {
93
91
.mbus_code = MEDIA_BUS_FMT_SRGGB12_1X12,
94
92
.pixel_enc = V4L2_PIXEL_ENC_BAYER,
95
-
.mipi_dt = RKISP1_CIF_CSI2_DT_RAW12,
93
+
.mipi_dt = MIPI_CSI2_DT_RAW12,
96
94
.bayer_pat = RKISP1_RAW_RGGB,
97
95
.bus_width = 12,
98
96
.direction = RKISP1_ISP_SD_SINK | RKISP1_ISP_SD_SRC,
99
97
}, {
100
98
.mbus_code = MEDIA_BUS_FMT_SBGGR12_1X12,
101
99
.pixel_enc = V4L2_PIXEL_ENC_BAYER,
102
-
.mipi_dt = RKISP1_CIF_CSI2_DT_RAW12,
100
+
.mipi_dt = MIPI_CSI2_DT_RAW12,
103
101
.bayer_pat = RKISP1_RAW_BGGR,
104
102
.bus_width = 12,
105
103
.direction = RKISP1_ISP_SD_SINK | RKISP1_ISP_SD_SRC,
106
104
}, {
107
105
.mbus_code = MEDIA_BUS_FMT_SGBRG12_1X12,
108
106
.pixel_enc = V4L2_PIXEL_ENC_BAYER,
109
-
.mipi_dt = RKISP1_CIF_CSI2_DT_RAW12,
107
+
.mipi_dt = MIPI_CSI2_DT_RAW12,
110
108
.bayer_pat = RKISP1_RAW_GBRG,
111
109
.bus_width = 12,
112
110
.direction = RKISP1_ISP_SD_SINK | RKISP1_ISP_SD_SRC,
113
111
}, {
114
112
.mbus_code = MEDIA_BUS_FMT_SGRBG12_1X12,
115
113
.pixel_enc = V4L2_PIXEL_ENC_BAYER,
116
-
.mipi_dt = RKISP1_CIF_CSI2_DT_RAW12,
114
+
.mipi_dt = MIPI_CSI2_DT_RAW12,
117
115
.bayer_pat = RKISP1_RAW_GRBG,
118
116
.bus_width = 12,
119
117
.direction = RKISP1_ISP_SD_SINK | RKISP1_ISP_SD_SRC,
120
118
}, {
121
119
.mbus_code = MEDIA_BUS_FMT_SRGGB8_1X8,
122
120
.pixel_enc = V4L2_PIXEL_ENC_BAYER,
123
-
.mipi_dt = RKISP1_CIF_CSI2_DT_RAW8,
121
+
.mipi_dt = MIPI_CSI2_DT_RAW8,
124
122
.bayer_pat = RKISP1_RAW_RGGB,
125
123
.bus_width = 8,
126
124
.direction = RKISP1_ISP_SD_SINK | RKISP1_ISP_SD_SRC,
127
125
}, {
128
126
.mbus_code = MEDIA_BUS_FMT_SBGGR8_1X8,
129
127
.pixel_enc = V4L2_PIXEL_ENC_BAYER,
130
-
.mipi_dt = RKISP1_CIF_CSI2_DT_RAW8,
128
+
.mipi_dt = MIPI_CSI2_DT_RAW8,
131
129
.bayer_pat = RKISP1_RAW_BGGR,
132
130
.bus_width = 8,
133
131
.direction = RKISP1_ISP_SD_SINK | RKISP1_ISP_SD_SRC,
134
132
}, {
135
133
.mbus_code = MEDIA_BUS_FMT_SGBRG8_1X8,
136
134
.pixel_enc = V4L2_PIXEL_ENC_BAYER,
137
-
.mipi_dt = RKISP1_CIF_CSI2_DT_RAW8,
135
+
.mipi_dt = MIPI_CSI2_DT_RAW8,
138
136
.bayer_pat = RKISP1_RAW_GBRG,
139
137
.bus_width = 8,
140
138
.direction = RKISP1_ISP_SD_SINK | RKISP1_ISP_SD_SRC,
141
139
}, {
142
140
.mbus_code = MEDIA_BUS_FMT_SGRBG8_1X8,
143
141
.pixel_enc = V4L2_PIXEL_ENC_BAYER,
144
-
.mipi_dt = RKISP1_CIF_CSI2_DT_RAW8,
142
+
.mipi_dt = MIPI_CSI2_DT_RAW8,
145
143
.bayer_pat = RKISP1_RAW_GRBG,
146
144
.bus_width = 8,
147
145
.direction = RKISP1_ISP_SD_SINK | RKISP1_ISP_SD_SRC,
148
146
}, {
149
147
.mbus_code = MEDIA_BUS_FMT_YUYV8_1X16,
150
148
.pixel_enc = V4L2_PIXEL_ENC_YUV,
151
-
.mipi_dt = RKISP1_CIF_CSI2_DT_YUV422_8b,
149
+
.mipi_dt = MIPI_CSI2_DT_YUV422_8B,
152
150
.yuv_seq = RKISP1_CIF_ISP_ACQ_PROP_YCBYCR,
153
151
.bus_width = 16,
154
152
.direction = RKISP1_ISP_SD_SINK,
155
153
}, {
156
154
.mbus_code = MEDIA_BUS_FMT_YVYU8_1X16,
157
155
.pixel_enc = V4L2_PIXEL_ENC_YUV,
158
-
.mipi_dt = RKISP1_CIF_CSI2_DT_YUV422_8b,
156
+
.mipi_dt = MIPI_CSI2_DT_YUV422_8B,
159
157
.yuv_seq = RKISP1_CIF_ISP_ACQ_PROP_YCRYCB,
160
158
.bus_width = 16,
161
159
.direction = RKISP1_ISP_SD_SINK,
162
160
}, {
163
161
.mbus_code = MEDIA_BUS_FMT_UYVY8_1X16,
164
162
.pixel_enc = V4L2_PIXEL_ENC_YUV,
165
-
.mipi_dt = RKISP1_CIF_CSI2_DT_YUV422_8b,
163
+
.mipi_dt = MIPI_CSI2_DT_YUV422_8B,
166
164
.yuv_seq = RKISP1_CIF_ISP_ACQ_PROP_CBYCRY,
167
165
.bus_width = 16,
168
166
.direction = RKISP1_ISP_SD_SINK,
169
167
}, {
170
168
.mbus_code = MEDIA_BUS_FMT_VYUY8_1X16,
171
169
.pixel_enc = V4L2_PIXEL_ENC_YUV,
172
-
.mipi_dt = RKISP1_CIF_CSI2_DT_YUV422_8b,
170
+
.mipi_dt = MIPI_CSI2_DT_YUV422_8B,
173
171
.yuv_seq = RKISP1_CIF_ISP_ACQ_PROP_CRYCBY,
174
172
.bus_width = 16,
175
173
.direction = RKISP1_ISP_SD_SINK,
-11
drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h
-11
drivers/media/platform/rockchip/rkisp1/rkisp1-regs.h
···
333
333
/* MIPI_DATA_SEL */
334
334
#define RKISP1_CIF_MIPI_DATA_SEL_VC(a) (((a) & 0x3) << 6)
335
335
#define RKISP1_CIF_MIPI_DATA_SEL_DT(a) (((a) & 0x3F) << 0)
336
-
/* MIPI DATA_TYPE */
337
-
#define RKISP1_CIF_CSI2_DT_YUV420_8b 0x18
338
-
#define RKISP1_CIF_CSI2_DT_YUV420_10b 0x19
339
-
#define RKISP1_CIF_CSI2_DT_YUV422_8b 0x1E
340
-
#define RKISP1_CIF_CSI2_DT_YUV422_10b 0x1F
341
-
#define RKISP1_CIF_CSI2_DT_RGB565 0x22
342
-
#define RKISP1_CIF_CSI2_DT_RGB666 0x23
343
-
#define RKISP1_CIF_CSI2_DT_RGB888 0x24
344
-
#define RKISP1_CIF_CSI2_DT_RAW8 0x2A
345
-
#define RKISP1_CIF_CSI2_DT_RAW10 0x2B
346
-
#define RKISP1_CIF_CSI2_DT_RAW12 0x2C
347
336
348
337
/* MIPI_IMSC, MIPI_RIS, MIPI_MIS, MIPI_ICR, MIPI_ISR */
349
338
#define RKISP1_CIF_MIPI_SYNC_FIFO_OVFLW(a) (((a) & 0xF) << 0)