aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/i2c/sr030pc30.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/i2c/sr030pc30.c')
-rw-r--r--drivers/media/i2c/sr030pc30.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/media/i2c/sr030pc30.c b/drivers/media/i2c/sr030pc30.c
index 118f8ee88465..10c735c3a082 100644
--- a/drivers/media/i2c/sr030pc30.c
+++ b/drivers/media/i2c/sr030pc30.c
@@ -165,7 +165,7 @@ struct sr030pc30_info {
165}; 165};
166 166
167struct sr030pc30_format { 167struct sr030pc30_format {
168 enum v4l2_mbus_pixelcode code; 168 u32 code;
169 enum v4l2_colorspace colorspace; 169 enum v4l2_colorspace colorspace;
170 u16 ispctl1_reg; 170 u16 ispctl1_reg;
171}; 171};
@@ -201,23 +201,23 @@ static const struct sr030pc30_frmsize sr030pc30_sizes[] = {
201/* supported pixel formats */ 201/* supported pixel formats */
202static const struct sr030pc30_format sr030pc30_formats[] = { 202static const struct sr030pc30_format sr030pc30_formats[] = {
203 { 203 {
204 .code = V4L2_MBUS_FMT_YUYV8_2X8, 204 .code = MEDIA_BUS_FMT_YUYV8_2X8,
205 .colorspace = V4L2_COLORSPACE_JPEG, 205 .colorspace = V4L2_COLORSPACE_JPEG,
206 .ispctl1_reg = 0x03, 206 .ispctl1_reg = 0x03,
207 }, { 207 }, {
208 .code = V4L2_MBUS_FMT_YVYU8_2X8, 208 .code = MEDIA_BUS_FMT_YVYU8_2X8,
209 .colorspace = V4L2_COLORSPACE_JPEG, 209 .colorspace = V4L2_COLORSPACE_JPEG,
210 .ispctl1_reg = 0x02, 210 .ispctl1_reg = 0x02,
211 }, { 211 }, {
212 .code = V4L2_MBUS_FMT_VYUY8_2X8, 212 .code = MEDIA_BUS_FMT_VYUY8_2X8,
213 .colorspace = V4L2_COLORSPACE_JPEG, 213 .colorspace = V4L2_COLORSPACE_JPEG,
214 .ispctl1_reg = 0, 214 .ispctl1_reg = 0,
215 }, { 215 }, {
216 .code = V4L2_MBUS_FMT_UYVY8_2X8, 216 .code = MEDIA_BUS_FMT_UYVY8_2X8,
217 .colorspace = V4L2_COLORSPACE_JPEG, 217 .colorspace = V4L2_COLORSPACE_JPEG,
218 .ispctl1_reg = 0x01, 218 .ispctl1_reg = 0x01,
219 }, { 219 }, {
220 .code = V4L2_MBUS_FMT_RGB565_2X8_BE, 220 .code = MEDIA_BUS_FMT_RGB565_2X8_BE,
221 .colorspace = V4L2_COLORSPACE_JPEG, 221 .colorspace = V4L2_COLORSPACE_JPEG,
222 .ispctl1_reg = 0x40, 222 .ispctl1_reg = 0x40,
223 }, 223 },
@@ -472,7 +472,7 @@ static int sr030pc30_s_ctrl(struct v4l2_ctrl *ctrl)
472} 472}
473 473
474static int sr030pc30_enum_fmt(struct v4l2_subdev *sd, unsigned int index, 474static int sr030pc30_enum_fmt(struct v4l2_subdev *sd, unsigned int index,
475 enum v4l2_mbus_pixelcode *code) 475 u32 *code)
476{ 476{
477 if (!code || index >= ARRAY_SIZE(sr030pc30_formats)) 477 if (!code || index >= ARRAY_SIZE(sr030pc30_formats))
478 return -EINVAL; 478 return -EINVAL;