Skip to content

L
linux
Commit d032ca12 authored by Matthias Schwarzott's avatar Matthias Schwarzott Committed by Mauro Carvalho Chehab
Browse files
Options

[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: default avatarMatthias Schwarzott <zzam@gentoo.org>
Reviewed-by: default avatarAntti Palosaari <crope@iki.fi>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 9abe3b89
Hide whitespace changes
Inline Side-by-side
Showing with 31 additions and 31 deletions
drivers/media/usb/cx231xx/cx231xx-cards.c
View file @ d032ca12
...@@ -104,8 +104,8 @@ struct cx231xx_board cx231xx_boards[] = { ...@@ -104,8 +104,8 @@ struct cx231xx_board cx231xx_boards[] = {
.ctl_pin_status_mask = 0xFFFFFFC4, .ctl_pin_status_mask = 0xFFFFFFC4,
.agc_analog_digital_select_gpio = 0x0c, .agc_analog_digital_select_gpio = 0x0c,
.gpio_pin_status_mask = 0x4001000, .gpio_pin_status_mask = 0x4001000,
.tuner_i2c_master = 1, .tuner_i2c_master = I2C_1,
.demod_i2c_master = 2, .demod_i2c_master = I2C_2,
.has_dvb = 1, .has_dvb = 1,
.demod_addr = 0x02, .demod_addr = 0x02,
.norm = V4L2_STD_PAL, .norm = V4L2_STD_PAL,
...@@ -144,8 +144,8 @@ struct cx231xx_board cx231xx_boards[] = { ...@@ -144,8 +144,8 @@ struct cx231xx_board cx231xx_boards[] = {
.ctl_pin_status_mask = 0xFFFFFFC4, .ctl_pin_status_mask = 0xFFFFFFC4,
.agc_analog_digital_select_gpio = 0x0c, .agc_analog_digital_select_gpio = 0x0c,
.gpio_pin_status_mask = 0x4001000, .gpio_pin_status_mask = 0x4001000,
.tuner_i2c_master = 1, .tuner_i2c_master = I2C_1,
.demod_i2c_master = 2, .demod_i2c_master = I2C_2,
.has_dvb = 1, .has_dvb = 1,
.demod_addr = 0x32, .demod_addr = 0x32,
.norm = V4L2_STD_NTSC, .norm = V4L2_STD_NTSC,
...@@ -184,8 +184,8 @@ struct cx231xx_board cx231xx_boards[] = { ...@@ -184,8 +184,8 @@ struct cx231xx_board cx231xx_boards[] = {
.ctl_pin_status_mask = 0xFFFFFFC4, .ctl_pin_status_mask = 0xFFFFFFC4,
.agc_analog_digital_select_gpio = 0x1c, .agc_analog_digital_select_gpio = 0x1c,
.gpio_pin_status_mask = 0x4001000, .gpio_pin_status_mask = 0x4001000,
.tuner_i2c_master = 1, .tuner_i2c_master = I2C_1,
.demod_i2c_master = 2, .demod_i2c_master = I2C_2,
.has_dvb = 1, .has_dvb = 1,
.demod_addr = 0x02, .demod_addr = 0x02,
.norm = V4L2_STD_PAL, .norm = V4L2_STD_PAL,
...@@ -225,8 +225,8 @@ struct cx231xx_board cx231xx_boards[] = { ...@@ -225,8 +225,8 @@ struct cx231xx_board cx231xx_boards[] = {
.ctl_pin_status_mask = 0xFFFFFFC4, .ctl_pin_status_mask = 0xFFFFFFC4,
.agc_analog_digital_select_gpio = 0x1c, .agc_analog_digital_select_gpio = 0x1c,
.gpio_pin_status_mask = 0x4001000, .gpio_pin_status_mask = 0x4001000,
.tuner_i2c_master = 1, .tuner_i2c_master = I2C_1,
.demod_i2c_master = 2, .demod_i2c_master = I2C_2,
.has_dvb = 1, .has_dvb = 1,
.demod_addr = 0x02, .demod_addr = 0x02,
.norm = V4L2_STD_PAL, .norm = V4L2_STD_PAL,
...@@ -297,8 +297,8 @@ struct cx231xx_board cx231xx_boards[] = { ...@@ -297,8 +297,8 @@ struct cx231xx_board cx231xx_boards[] = {
.ctl_pin_status_mask = 0xFFFFFFC4, .ctl_pin_status_mask = 0xFFFFFFC4,
.agc_analog_digital_select_gpio = 0x0c, .agc_analog_digital_select_gpio = 0x0c,
.gpio_pin_status_mask = 0x4001000, .gpio_pin_status_mask = 0x4001000,
.tuner_i2c_master = 1, .tuner_i2c_master = I2C_1,
.demod_i2c_master = 2, .demod_i2c_master = I2C_2,
.has_dvb = 1, .has_dvb = 1,
.demod_addr = 0x02, .demod_addr = 0x02,
.norm = V4L2_STD_PAL, .norm = V4L2_STD_PAL,
...@@ -325,8 +325,8 @@ struct cx231xx_board cx231xx_boards[] = { ...@@ -325,8 +325,8 @@ struct cx231xx_board cx231xx_boards[] = {
.ctl_pin_status_mask = 0xFFFFFFC4, .ctl_pin_status_mask = 0xFFFFFFC4,
.agc_analog_digital_select_gpio = 0x0c, .agc_analog_digital_select_gpio = 0x0c,
.gpio_pin_status_mask = 0x4001000, .gpio_pin_status_mask = 0x4001000,
.tuner_i2c_master = 1, .tuner_i2c_master = I2C_1,
.demod_i2c_master = 2, .demod_i2c_master = I2C_2,
.has_dvb = 1, .has_dvb = 1,
.demod_addr = 0x32, .demod_addr = 0x32,
.norm = V4L2_STD_NTSC, .norm = V4L2_STD_NTSC,
...@@ -353,8 +353,8 @@ struct cx231xx_board cx231xx_boards[] = { ...@@ -353,8 +353,8 @@ struct cx231xx_board cx231xx_boards[] = {
.ctl_pin_status_mask = 0xFFFFFFC4, .ctl_pin_status_mask = 0xFFFFFFC4,
.agc_analog_digital_select_gpio = 0x0c, .agc_analog_digital_select_gpio = 0x0c,
.gpio_pin_status_mask = 0x4001000, .gpio_pin_status_mask = 0x4001000,
.tuner_i2c_master = 1, .tuner_i2c_master = I2C_1,
.demod_i2c_master = 2, .demod_i2c_master = I2C_2,
.has_dvb = 1, .has_dvb = 1,
.demod_addr = 0x0e, .demod_addr = 0x0e,
.norm = V4L2_STD_NTSC, .norm = V4L2_STD_NTSC,
...@@ -418,9 +418,9 @@ struct cx231xx_board cx231xx_boards[] = { ...@@ -418,9 +418,9 @@ struct cx231xx_board cx231xx_boards[] = {
.tuner_scl_gpio = -1, .tuner_scl_gpio = -1,
.tuner_sda_gpio = -1, .tuner_sda_gpio = -1,
.gpio_pin_status_mask = 0x4001000, .gpio_pin_status_mask = 0x4001000,
.tuner_i2c_master = 2, .tuner_i2c_master = I2C_2,
.demod_i2c_master = 1, .demod_i2c_master = I2C_1,
.ir_i2c_master = 2, .ir_i2c_master = I2C_2,
.has_dvb = 1, .has_dvb = 1,
.demod_addr = 0x10, .demod_addr = 0x10,
.norm = V4L2_STD_PAL_M, .norm = V4L2_STD_PAL_M,
...@@ -456,9 +456,9 @@ struct cx231xx_board cx231xx_boards[] = { ...@@ -456,9 +456,9 @@ struct cx231xx_board cx231xx_boards[] = {
.tuner_scl_gpio = -1, .tuner_scl_gpio = -1,
.tuner_sda_gpio = -1, .tuner_sda_gpio = -1,
.gpio_pin_status_mask = 0x4001000, .gpio_pin_status_mask = 0x4001000,
.tuner_i2c_master = 2, .tuner_i2c_master = I2C_2,
.demod_i2c_master = 1, .demod_i2c_master = I2C_1,
.ir_i2c_master = 2, .ir_i2c_master = I2C_2,
.has_dvb = 1, .has_dvb = 1,
.demod_addr = 0x10, .demod_addr = 0x10,
.norm = V4L2_STD_NTSC_M, .norm = V4L2_STD_NTSC_M,
...@@ -494,9 +494,9 @@ struct cx231xx_board cx231xx_boards[] = { ...@@ -494,9 +494,9 @@ struct cx231xx_board cx231xx_boards[] = {
.tuner_scl_gpio = -1, .tuner_scl_gpio = -1,
.tuner_sda_gpio = -1, .tuner_sda_gpio = -1,
.gpio_pin_status_mask = 0x4001000, .gpio_pin_status_mask = 0x4001000,
.tuner_i2c_master = 2, .tuner_i2c_master = I2C_2,
.demod_i2c_master = 1, .demod_i2c_master = I2C_1,
.ir_i2c_master = 2, .ir_i2c_master = I2C_2,
.rc_map_name = RC_MAP_PIXELVIEW_002T, .rc_map_name = RC_MAP_PIXELVIEW_002T,
.has_dvb = 1, .has_dvb = 1,
.demod_addr = 0x10, .demod_addr = 0x10,
...@@ -587,7 +587,7 @@ struct cx231xx_board cx231xx_boards[] = { ...@@ -587,7 +587,7 @@ struct cx231xx_board cx231xx_boards[] = {
.ctl_pin_status_mask = 0xFFFFFFC4, .ctl_pin_status_mask = 0xFFFFFFC4,
.agc_analog_digital_select_gpio = 0x0c, .agc_analog_digital_select_gpio = 0x0c,
.gpio_pin_status_mask = 0x4001000, .gpio_pin_status_mask = 0x4001000,
.tuner_i2c_master = 1, .tuner_i2c_master = I2C_1,
.norm = V4L2_STD_PAL, .norm = V4L2_STD_PAL,
.input = {{ .input = {{
...@@ -622,7 +622,7 @@ struct cx231xx_board cx231xx_boards[] = { ...@@ -622,7 +622,7 @@ struct cx231xx_board cx231xx_boards[] = {
.ctl_pin_status_mask = 0xFFFFFFC4, .ctl_pin_status_mask = 0xFFFFFFC4,
.agc_analog_digital_select_gpio = 0x0c, .agc_analog_digital_select_gpio = 0x0c,
.gpio_pin_status_mask = 0x4001000, .gpio_pin_status_mask = 0x4001000,
.tuner_i2c_master = 1, .tuner_i2c_master = I2C_1,
.norm = V4L2_STD_NTSC, .norm = V4L2_STD_NTSC,
.input = {{ .input = {{
...@@ -718,8 +718,8 @@ struct cx231xx_board cx231xx_boards[] = { ...@@ -718,8 +718,8 @@ struct cx231xx_board cx231xx_boards[] = {
.ctl_pin_status_mask = 0xFFFFFFC4, .ctl_pin_status_mask = 0xFFFFFFC4,
.agc_analog_digital_select_gpio = 0x0c, .agc_analog_digital_select_gpio = 0x0c,
.gpio_pin_status_mask = 0x4001000, .gpio_pin_status_mask = 0x4001000,
.tuner_i2c_master = 1, .tuner_i2c_master = I2C_1,
.demod_i2c_master = 2, .demod_i2c_master = I2C_2,
.has_dvb = 1, .has_dvb = 1,
.demod_addr = 0x0e, .demod_addr = 0x0e,
.norm = V4L2_STD_PAL, .norm = V4L2_STD_PAL,
...@@ -757,8 +757,8 @@ struct cx231xx_board cx231xx_boards[] = { ...@@ -757,8 +757,8 @@ struct cx231xx_board cx231xx_boards[] = {
.ctl_pin_status_mask = 0xFFFFFFC4, .ctl_pin_status_mask = 0xFFFFFFC4,
.agc_analog_digital_select_gpio = 0x0c, .agc_analog_digital_select_gpio = 0x0c,
.gpio_pin_status_mask = 0x4001000, .gpio_pin_status_mask = 0x4001000,
.tuner_i2c_master = 1, .tuner_i2c_master = I2C_1,
.demod_i2c_master = 2, .demod_i2c_master = I2C_2,
.has_dvb = 1, .has_dvb = 1,
.demod_addr = 0x0e, .demod_addr = 0x0e,
.norm = V4L2_STD_PAL, .norm = V4L2_STD_PAL,
...@@ -1033,7 +1033,7 @@ void cx231xx_card_setup(struct cx231xx *dev) ...@@ -1033,7 +1033,7 @@ void cx231xx_card_setup(struct cx231xx *dev)
/* request some modules */ /* request some modules */
if (dev->board.decoder == CX231XX_AVDECODER) { if (dev->board.decoder == CX231XX_AVDECODER) {
dev->sd_cx25840 = v4l2_i2c_new_subdev(&dev->v4l2_dev, dev->sd_cx25840 = v4l2_i2c_new_subdev(&dev->v4l2_dev,
&dev->i2c_bus[0].i2c_adap, &dev->i2c_bus[I2C_0].i2c_adap,
"cx25840", 0x88 >> 1, NULL); "cx25840", 0x88 >> 1, NULL);
if (dev->sd_cx25840 == NULL) if (dev->sd_cx25840 == NULL)
cx231xx_info("cx25840 subdev registration failure\n"); cx231xx_info("cx25840 subdev registration failure\n");
...@@ -1062,7 +1062,7 @@ void cx231xx_card_setup(struct cx231xx *dev) ...@@ -1062,7 +1062,7 @@ void cx231xx_card_setup(struct cx231xx *dev)
struct i2c_client client; struct i2c_client client;
memset(&client, 0, sizeof(client)); memset(&client, 0, sizeof(client));
client.adapter = &dev->i2c_bus[1].i2c_adap; client.adapter = &dev->i2c_bus[I2C_1].i2c_adap;
client.addr = 0xa0 >> 1; client.addr = 0xa0 >> 1;
read_eeprom(dev, &client, eeprom, sizeof(eeprom)); read_eeprom(dev, &client, eeprom, sizeof(eeprom));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7