aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/i2c/adv7604.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/media/i2c/adv7604.c b/drivers/media/i2c/adv7604.c
index 5f34e0ab06f3..8d455b766cc2 100644
--- a/drivers/media/i2c/adv7604.c
+++ b/drivers/media/i2c/adv7604.c
@@ -109,6 +109,7 @@ struct adv7604_chip_info {
109 unsigned int cable_det_mask; 109 unsigned int cable_det_mask;
110 unsigned int tdms_lock_mask; 110 unsigned int tdms_lock_mask;
111 unsigned int fmt_change_digital_mask; 111 unsigned int fmt_change_digital_mask;
112 unsigned int cp_csc;
112 113
113 const struct adv7604_format_info *formats; 114 const struct adv7604_format_info *formats;
114 unsigned int nformats; 115 unsigned int nformats;
@@ -2241,7 +2242,7 @@ static int adv7604_log_status(struct v4l2_subdev *sd)
2241 ((reg_io_0x02 & 0x04) ^ (reg_io_0x02 & 0x01)) ? 2242 ((reg_io_0x02 & 0x04) ^ (reg_io_0x02 & 0x01)) ?
2242 "enabled" : "disabled"); 2243 "enabled" : "disabled");
2243 v4l2_info(sd, "Color space conversion: %s\n", 2244 v4l2_info(sd, "Color space conversion: %s\n",
2244 csc_coeff_sel_rb[cp_read(sd, 0xfc) >> 4]); 2245 csc_coeff_sel_rb[cp_read(sd, info->cp_csc) >> 4]);
2245 2246
2246 if (!is_digital_input(sd)) 2247 if (!is_digital_input(sd))
2247 return 0; 2248 return 0;
@@ -2545,6 +2546,7 @@ static const struct adv7604_chip_info adv7604_chip_info[] = {
2545 .tdms_lock_mask = 0xe0, 2546 .tdms_lock_mask = 0xe0,
2546 .cable_det_mask = 0x1e, 2547 .cable_det_mask = 0x1e,
2547 .fmt_change_digital_mask = 0xc1, 2548 .fmt_change_digital_mask = 0xc1,
2549 .cp_csc = 0xfc,
2548 .formats = adv7604_formats, 2550 .formats = adv7604_formats,
2549 .nformats = ARRAY_SIZE(adv7604_formats), 2551 .nformats = ARRAY_SIZE(adv7604_formats),
2550 .set_termination = adv7604_set_termination, 2552 .set_termination = adv7604_set_termination,
@@ -2578,6 +2580,7 @@ static const struct adv7604_chip_info adv7604_chip_info[] = {
2578 .tdms_lock_mask = 0x43, 2580 .tdms_lock_mask = 0x43,
2579 .cable_det_mask = 0x01, 2581 .cable_det_mask = 0x01,
2580 .fmt_change_digital_mask = 0x03, 2582 .fmt_change_digital_mask = 0x03,
2583 .cp_csc = 0xf4,
2581 .formats = adv7611_formats, 2584 .formats = adv7611_formats,
2582 .nformats = ARRAY_SIZE(adv7611_formats), 2585 .nformats = ARRAY_SIZE(adv7611_formats),
2583 .set_termination = adv7611_set_termination, 2586 .set_termination = adv7611_set_termination,