Skip to content

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

[media] cx231xx: change usage of I2C_1 to the real i2c port 

change almost all instances of I2C_1 to I2C_1_MUX_3

Only these cases are changed to I2C_1_MUX_1:
* All that have dont_use_port_3 set.
* CX231XX_BOARD_HAUPPAUGE_EXETER, old code did explicitly not switch to port3.
* eeprom access for 930C
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 8a025348
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 15 deletions
drivers/media/usb/cx231xx/cx231xx-cards.c
View file @ b9ce9dfd
...@@ -104,7 +104,7 @@ struct cx231xx_board cx231xx_boards[] = { ...@@ -104,7 +104,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 = I2C_1, .tuner_i2c_master = I2C_1_MUX_3,
.demod_i2c_master = I2C_2, .demod_i2c_master = I2C_2,
.has_dvb = 1, .has_dvb = 1,
.demod_addr = 0x02, .demod_addr = 0x02,
...@@ -144,7 +144,7 @@ struct cx231xx_board cx231xx_boards[] = { ...@@ -144,7 +144,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 = I2C_1, .tuner_i2c_master = I2C_1_MUX_3,
.demod_i2c_master = I2C_2, .demod_i2c_master = I2C_2,
.has_dvb = 1, .has_dvb = 1,
.demod_addr = 0x32, .demod_addr = 0x32,
...@@ -184,7 +184,7 @@ struct cx231xx_board cx231xx_boards[] = { ...@@ -184,7 +184,7 @@ 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 = I2C_1, .tuner_i2c_master = I2C_1_MUX_3,
.demod_i2c_master = I2C_2, .demod_i2c_master = I2C_2,
.has_dvb = 1, .has_dvb = 1,
.demod_addr = 0x02, .demod_addr = 0x02,
...@@ -225,7 +225,7 @@ struct cx231xx_board cx231xx_boards[] = { ...@@ -225,7 +225,7 @@ 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 = I2C_1, .tuner_i2c_master = I2C_1_MUX_3,
.demod_i2c_master = I2C_2, .demod_i2c_master = I2C_2,
.has_dvb = 1, .has_dvb = 1,
.demod_addr = 0x02, .demod_addr = 0x02,
...@@ -297,7 +297,7 @@ struct cx231xx_board cx231xx_boards[] = { ...@@ -297,7 +297,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 = I2C_1, .tuner_i2c_master = I2C_1_MUX_3,
.demod_i2c_master = I2C_2, .demod_i2c_master = I2C_2,
.has_dvb = 1, .has_dvb = 1,
.demod_addr = 0x02, .demod_addr = 0x02,
...@@ -325,7 +325,7 @@ struct cx231xx_board cx231xx_boards[] = { ...@@ -325,7 +325,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 = I2C_1, .tuner_i2c_master = I2C_1_MUX_3,
.demod_i2c_master = I2C_2, .demod_i2c_master = I2C_2,
.has_dvb = 1, .has_dvb = 1,
.demod_addr = 0x32, .demod_addr = 0x32,
...@@ -353,7 +353,7 @@ struct cx231xx_board cx231xx_boards[] = { ...@@ -353,7 +353,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 = I2C_1, .tuner_i2c_master = I2C_1_MUX_1,
.demod_i2c_master = I2C_2, .demod_i2c_master = I2C_2,
.has_dvb = 1, .has_dvb = 1,
.demod_addr = 0x0e, .demod_addr = 0x0e,
...@@ -419,7 +419,7 @@ struct cx231xx_board cx231xx_boards[] = { ...@@ -419,7 +419,7 @@ struct cx231xx_board cx231xx_boards[] = {
.tuner_sda_gpio = -1, .tuner_sda_gpio = -1,
.gpio_pin_status_mask = 0x4001000, .gpio_pin_status_mask = 0x4001000,
.tuner_i2c_master = I2C_2, .tuner_i2c_master = I2C_2,
.demod_i2c_master = I2C_1, .demod_i2c_master = I2C_1_MUX_3,
.ir_i2c_master = I2C_2, .ir_i2c_master = I2C_2,
.has_dvb = 1, .has_dvb = 1,
.demod_addr = 0x10, .demod_addr = 0x10,
...@@ -457,7 +457,7 @@ struct cx231xx_board cx231xx_boards[] = { ...@@ -457,7 +457,7 @@ struct cx231xx_board cx231xx_boards[] = {
.tuner_sda_gpio = -1, .tuner_sda_gpio = -1,
.gpio_pin_status_mask = 0x4001000, .gpio_pin_status_mask = 0x4001000,
.tuner_i2c_master = I2C_2, .tuner_i2c_master = I2C_2,
.demod_i2c_master = I2C_1, .demod_i2c_master = I2C_1_MUX_3,
.ir_i2c_master = I2C_2, .ir_i2c_master = I2C_2,
.has_dvb = 1, .has_dvb = 1,
.demod_addr = 0x10, .demod_addr = 0x10,
...@@ -495,7 +495,7 @@ struct cx231xx_board cx231xx_boards[] = { ...@@ -495,7 +495,7 @@ struct cx231xx_board cx231xx_boards[] = {
.tuner_sda_gpio = -1, .tuner_sda_gpio = -1,
.gpio_pin_status_mask = 0x4001000, .gpio_pin_status_mask = 0x4001000,
.tuner_i2c_master = I2C_2, .tuner_i2c_master = I2C_2,
.demod_i2c_master = I2C_1, .demod_i2c_master = I2C_1_MUX_3,
.ir_i2c_master = I2C_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,
...@@ -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 = I2C_1, .tuner_i2c_master = I2C_1_MUX_3,
.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 = I2C_1, .tuner_i2c_master = I2C_1_MUX_3,
.norm = V4L2_STD_NTSC, .norm = V4L2_STD_NTSC,
.input = {{ .input = {{
...@@ -718,7 +718,7 @@ struct cx231xx_board cx231xx_boards[] = { ...@@ -718,7 +718,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 = I2C_1, .tuner_i2c_master = I2C_1_MUX_3,
.demod_i2c_master = I2C_2, .demod_i2c_master = I2C_2,
.has_dvb = 1, .has_dvb = 1,
.demod_addr = 0x0e, .demod_addr = 0x0e,
...@@ -757,7 +757,7 @@ struct cx231xx_board cx231xx_boards[] = { ...@@ -757,7 +757,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 = I2C_1, .tuner_i2c_master = I2C_1_MUX_3,
.demod_i2c_master = I2C_2, .demod_i2c_master = I2C_2,
.has_dvb = 1, .has_dvb = 1,
.demod_addr = 0x0e, .demod_addr = 0x0e,
...@@ -1064,7 +1064,7 @@ void cx231xx_card_setup(struct cx231xx *dev) ...@@ -1064,7 +1064,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 = cx231xx_get_i2c_adap(dev, I2C_1); client.adapter = cx231xx_get_i2c_adap(dev, I2C_1_MUX_1);
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