aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/usb/cx231xx
diff options
context:
space:
mode:
authorMatthias Schwarzott <zzam@gentoo.org>2014-10-02 01:20:58 -0400
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2014-10-30 15:16:41 -0400
commitd032ca1283b68446df0adbec4561463b3f0aa147 (patch)
tree44d76a3f23624d371bf2255ed6cfc40032179f10 /drivers/media/usb/cx231xx
parent9abe3b89f38312052b885311ce93b1a53627793c (diff)
[media] cx231xx: Use symbolic constants for i2c ports instead of numbers
Replace numbers by the constants of same value and same meaning. Signed-off-by: Matthias Schwarzott <zzam@gentoo.org> Reviewed-by: Antti Palosaari <crope@iki.fi> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/usb/cx231xx')
-rw-r--r--drivers/media/usb/cx231xx/cx231xx-cards.c62
1 files changed, 31 insertions, 31 deletions
diff --git a/drivers/media/usb/cx231xx/cx231xx-cards.c b/drivers/media/usb/cx231xx/cx231xx-cards.c
index 092fb85ae166..2f027c70f786 100644
--- a/drivers/media/usb/cx231xx/cx231xx-cards.c
+++ b/drivers/media/usb/cx231xx/cx231xx-cards.c
@@ -104,8 +104,8 @@ struct cx231xx_board cx231xx_boards[] = {
104 .ctl_pin_status_mask = 0xFFFFFFC4, 104 .ctl_pin_status_mask = 0xFFFFFFC4,
105 .agc_analog_digital_select_gpio = 0x0c, 105 .agc_analog_digital_select_gpio = 0x0c,
106 .gpio_pin_status_mask = 0x4001000, 106 .gpio_pin_status_mask = 0x4001000,
107 .tuner_i2c_master = 1, 107 .tuner_i2c_master = I2C_1,
108 .demod_i2c_master = 2, 108 .demod_i2c_master = I2C_2,
109 .has_dvb = 1, 109 .has_dvb = 1,
110 .demod_addr = 0x02, 110 .demod_addr = 0x02,
111 .norm = V4L2_STD_PAL, 111 .norm = V4L2_STD_PAL,
@@ -144,8 +144,8 @@ struct cx231xx_board cx231xx_boards[] = {
144 .ctl_pin_status_mask = 0xFFFFFFC4, 144 .ctl_pin_status_mask = 0xFFFFFFC4,
145 .agc_analog_digital_select_gpio = 0x0c, 145 .agc_analog_digital_select_gpio = 0x0c,
146 .gpio_pin_status_mask = 0x4001000, 146 .gpio_pin_status_mask = 0x4001000,
147 .tuner_i2c_master = 1, 147 .tuner_i2c_master = I2C_1,
148 .demod_i2c_master = 2, 148 .demod_i2c_master = I2C_2,
149 .has_dvb = 1, 149 .has_dvb = 1,
150 .demod_addr = 0x32, 150 .demod_addr = 0x32,
151 .norm = V4L2_STD_NTSC, 151 .norm = V4L2_STD_NTSC,
@@ -184,8 +184,8 @@ struct cx231xx_board cx231xx_boards[] = {
184 .ctl_pin_status_mask = 0xFFFFFFC4, 184 .ctl_pin_status_mask = 0xFFFFFFC4,
185 .agc_analog_digital_select_gpio = 0x1c, 185 .agc_analog_digital_select_gpio = 0x1c,
186 .gpio_pin_status_mask = 0x4001000, 186 .gpio_pin_status_mask = 0x4001000,
187 .tuner_i2c_master = 1, 187 .tuner_i2c_master = I2C_1,
188 .demod_i2c_master = 2, 188 .demod_i2c_master = I2C_2,
189 .has_dvb = 1, 189 .has_dvb = 1,
190 .demod_addr = 0x02, 190 .demod_addr = 0x02,
191 .norm = V4L2_STD_PAL, 191 .norm = V4L2_STD_PAL,
@@ -225,8 +225,8 @@ struct cx231xx_board cx231xx_boards[] = {
225 .ctl_pin_status_mask = 0xFFFFFFC4, 225 .ctl_pin_status_mask = 0xFFFFFFC4,
226 .agc_analog_digital_select_gpio = 0x1c, 226 .agc_analog_digital_select_gpio = 0x1c,
227 .gpio_pin_status_mask = 0x4001000, 227 .gpio_pin_status_mask = 0x4001000,
228 .tuner_i2c_master = 1, 228 .tuner_i2c_master = I2C_1,
229 .demod_i2c_master = 2, 229 .demod_i2c_master = I2C_2,
230 .has_dvb = 1, 230 .has_dvb = 1,
231 .demod_addr = 0x02, 231 .demod_addr = 0x02,
232 .norm = V4L2_STD_PAL, 232 .norm = V4L2_STD_PAL,
@@ -297,8 +297,8 @@ struct cx231xx_board cx231xx_boards[] = {
297 .ctl_pin_status_mask = 0xFFFFFFC4, 297 .ctl_pin_status_mask = 0xFFFFFFC4,
298 .agc_analog_digital_select_gpio = 0x0c, 298 .agc_analog_digital_select_gpio = 0x0c,
299 .gpio_pin_status_mask = 0x4001000, 299 .gpio_pin_status_mask = 0x4001000,
300 .tuner_i2c_master = 1, 300 .tuner_i2c_master = I2C_1,
301 .demod_i2c_master = 2, 301 .demod_i2c_master = I2C_2,
302 .has_dvb = 1, 302 .has_dvb = 1,
303 .demod_addr = 0x02, 303 .demod_addr = 0x02,
304 .norm = V4L2_STD_PAL, 304 .norm = V4L2_STD_PAL,
@@ -325,8 +325,8 @@ struct cx231xx_board cx231xx_boards[] = {
325 .ctl_pin_status_mask = 0xFFFFFFC4, 325 .ctl_pin_status_mask = 0xFFFFFFC4,
326 .agc_analog_digital_select_gpio = 0x0c, 326 .agc_analog_digital_select_gpio = 0x0c,
327 .gpio_pin_status_mask = 0x4001000, 327 .gpio_pin_status_mask = 0x4001000,
328 .tuner_i2c_master = 1, 328 .tuner_i2c_master = I2C_1,
329 .demod_i2c_master = 2, 329 .demod_i2c_master = I2C_2,
330 .has_dvb = 1, 330 .has_dvb = 1,
331 .demod_addr = 0x32, 331 .demod_addr = 0x32,
332 .norm = V4L2_STD_NTSC, 332 .norm = V4L2_STD_NTSC,
@@ -353,8 +353,8 @@ struct cx231xx_board cx231xx_boards[] = {
353 .ctl_pin_status_mask = 0xFFFFFFC4, 353 .ctl_pin_status_mask = 0xFFFFFFC4,
354 .agc_analog_digital_select_gpio = 0x0c, 354 .agc_analog_digital_select_gpio = 0x0c,
355 .gpio_pin_status_mask = 0x4001000, 355 .gpio_pin_status_mask = 0x4001000,
356 .tuner_i2c_master = 1, 356 .tuner_i2c_master = I2C_1,
357 .demod_i2c_master = 2, 357 .demod_i2c_master = I2C_2,
358 .has_dvb = 1, 358 .has_dvb = 1,
359 .demod_addr = 0x0e, 359 .demod_addr = 0x0e,
360 .norm = V4L2_STD_NTSC, 360 .norm = V4L2_STD_NTSC,
@@ -418,9 +418,9 @@ struct cx231xx_board cx231xx_boards[] = {
418 .tuner_scl_gpio = -1, 418 .tuner_scl_gpio = -1,
419 .tuner_sda_gpio = -1, 419 .tuner_sda_gpio = -1,
420 .gpio_pin_status_mask = 0x4001000, 420 .gpio_pin_status_mask = 0x4001000,
421 .tuner_i2c_master = 2, 421 .tuner_i2c_master = I2C_2,
422 .demod_i2c_master = 1, 422 .demod_i2c_master = I2C_1,
423 .ir_i2c_master = 2, 423 .ir_i2c_master = I2C_2,
424 .has_dvb = 1, 424 .has_dvb = 1,
425 .demod_addr = 0x10, 425 .demod_addr = 0x10,
426 .norm = V4L2_STD_PAL_M, 426 .norm = V4L2_STD_PAL_M,
@@ -456,9 +456,9 @@ struct cx231xx_board cx231xx_boards[] = {
456 .tuner_scl_gpio = -1, 456 .tuner_scl_gpio = -1,
457 .tuner_sda_gpio = -1, 457 .tuner_sda_gpio = -1,
458 .gpio_pin_status_mask = 0x4001000, 458 .gpio_pin_status_mask = 0x4001000,
459 .tuner_i2c_master = 2, 459 .tuner_i2c_master = I2C_2,
460 .demod_i2c_master = 1, 460 .demod_i2c_master = I2C_1,
461 .ir_i2c_master = 2, 461 .ir_i2c_master = I2C_2,
462 .has_dvb = 1, 462 .has_dvb = 1,
463 .demod_addr = 0x10, 463 .demod_addr = 0x10,
464 .norm = V4L2_STD_NTSC_M, 464 .norm = V4L2_STD_NTSC_M,
@@ -494,9 +494,9 @@ struct cx231xx_board cx231xx_boards[] = {
494 .tuner_scl_gpio = -1, 494 .tuner_scl_gpio = -1,
495 .tuner_sda_gpio = -1, 495 .tuner_sda_gpio = -1,
496 .gpio_pin_status_mask = 0x4001000, 496 .gpio_pin_status_mask = 0x4001000,
497 .tuner_i2c_master = 2, 497 .tuner_i2c_master = I2C_2,
498 .demod_i2c_master = 1, 498 .demod_i2c_master = I2C_1,
499 .ir_i2c_master = 2, 499 .ir_i2c_master = I2C_2,
500 .rc_map_name = RC_MAP_PIXELVIEW_002T, 500 .rc_map_name = RC_MAP_PIXELVIEW_002T,
501 .has_dvb = 1, 501 .has_dvb = 1,
502 .demod_addr = 0x10, 502 .demod_addr = 0x10,
@@ -587,7 +587,7 @@ struct cx231xx_board cx231xx_boards[] = {
587 .ctl_pin_status_mask = 0xFFFFFFC4, 587 .ctl_pin_status_mask = 0xFFFFFFC4,
588 .agc_analog_digital_select_gpio = 0x0c, 588 .agc_analog_digital_select_gpio = 0x0c,
589 .gpio_pin_status_mask = 0x4001000, 589 .gpio_pin_status_mask = 0x4001000,
590 .tuner_i2c_master = 1, 590 .tuner_i2c_master = I2C_1,
591 .norm = V4L2_STD_PAL, 591 .norm = V4L2_STD_PAL,
592 592
593 .input = {{ 593 .input = {{
@@ -622,7 +622,7 @@ struct cx231xx_board cx231xx_boards[] = {
622 .ctl_pin_status_mask = 0xFFFFFFC4, 622 .ctl_pin_status_mask = 0xFFFFFFC4,
623 .agc_analog_digital_select_gpio = 0x0c, 623 .agc_analog_digital_select_gpio = 0x0c,
624 .gpio_pin_status_mask = 0x4001000, 624 .gpio_pin_status_mask = 0x4001000,
625 .tuner_i2c_master = 1, 625 .tuner_i2c_master = I2C_1,
626 .norm = V4L2_STD_NTSC, 626 .norm = V4L2_STD_NTSC,
627 627
628 .input = {{ 628 .input = {{
@@ -718,8 +718,8 @@ struct cx231xx_board cx231xx_boards[] = {
718 .ctl_pin_status_mask = 0xFFFFFFC4, 718 .ctl_pin_status_mask = 0xFFFFFFC4,
719 .agc_analog_digital_select_gpio = 0x0c, 719 .agc_analog_digital_select_gpio = 0x0c,
720 .gpio_pin_status_mask = 0x4001000, 720 .gpio_pin_status_mask = 0x4001000,
721 .tuner_i2c_master = 1, 721 .tuner_i2c_master = I2C_1,
722 .demod_i2c_master = 2, 722 .demod_i2c_master = I2C_2,
723 .has_dvb = 1, 723 .has_dvb = 1,
724 .demod_addr = 0x0e, 724 .demod_addr = 0x0e,
725 .norm = V4L2_STD_PAL, 725 .norm = V4L2_STD_PAL,
@@ -757,8 +757,8 @@ struct cx231xx_board cx231xx_boards[] = {
757 .ctl_pin_status_mask = 0xFFFFFFC4, 757 .ctl_pin_status_mask = 0xFFFFFFC4,
758 .agc_analog_digital_select_gpio = 0x0c, 758 .agc_analog_digital_select_gpio = 0x0c,
759 .gpio_pin_status_mask = 0x4001000, 759 .gpio_pin_status_mask = 0x4001000,
760 .tuner_i2c_master = 1, 760 .tuner_i2c_master = I2C_1,
761 .demod_i2c_master = 2, 761 .demod_i2c_master = I2C_2,
762 .has_dvb = 1, 762 .has_dvb = 1,
763 .demod_addr = 0x0e, 763 .demod_addr = 0x0e,
764 .norm = V4L2_STD_PAL, 764 .norm = V4L2_STD_PAL,
@@ -1033,7 +1033,7 @@ void cx231xx_card_setup(struct cx231xx *dev)
1033 /* request some modules */ 1033 /* request some modules */
1034 if (dev->board.decoder == CX231XX_AVDECODER) { 1034 if (dev->board.decoder == CX231XX_AVDECODER) {
1035 dev->sd_cx25840 = v4l2_i2c_new_subdev(&dev->v4l2_dev, 1035 dev->sd_cx25840 = v4l2_i2c_new_subdev(&dev->v4l2_dev,
1036 &dev->i2c_bus[0].i2c_adap, 1036 &dev->i2c_bus[I2C_0].i2c_adap,
1037 "cx25840", 0x88 >> 1, NULL); 1037 "cx25840", 0x88 >> 1, NULL);
1038 if (dev->sd_cx25840 == NULL) 1038 if (dev->sd_cx25840 == NULL)
1039 cx231xx_info("cx25840 subdev registration failure\n"); 1039 cx231xx_info("cx25840 subdev registration failure\n");
@@ -1062,7 +1062,7 @@ void cx231xx_card_setup(struct cx231xx *dev)
1062 struct i2c_client client; 1062 struct i2c_client client;
1063 1063
1064 memset(&client, 0, sizeof(client)); 1064 memset(&client, 0, sizeof(client));
1065 client.adapter = &dev->i2c_bus[1].i2c_adap; 1065 client.adapter = &dev->i2c_bus[I2C_1].i2c_adap;
1066 client.addr = 0xa0 >> 1; 1066 client.addr = 0xa0 >> 1;
1067 1067
1068 read_eeprom(dev, &client, eeprom, sizeof(eeprom)); 1068 read_eeprom(dev, &client, eeprom, sizeof(eeprom));
generated by cgit v1.2.2 (git 2.25.0) at 2025-08-24 11:22:04 -0400