From: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
To: Matthias Schwarzott <zzam@gentoo.org>
Cc: linux-media@vger.kernel.org, crope@iki.fi
Subject: Re: [PATCH V3 10/13] cx231xx: change usage of I2C_1 to the real i2c port
Date: Thu, 30 Oct 2014 17:27:50 -0200 [thread overview]
Message-ID: <20141030172750.193cfaae@recife.lan> (raw)
In-Reply-To: <1412227265-17453-11-git-send-email-zzam@gentoo.org>
Em Thu, 2 Oct 2014 07:21:02 +0200
Matthias Schwarzott <zzam@gentoo.org> escreveu:
> change almost all instances of I2C_1 to I2C_1_MUX_3
So far, this is likely the most dangerous patch on this series ;)
>
> 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
I think Pixelview SBTVD Hybrid also doesn't use MUX_3 for tuner. Thankfully,
I have such tuner. So, I'll test and fix it if needed.
>
> Signed-off-by: Matthias Schwarzott <zzam@gentoo.org>
> Reviewed-by: Antti Palosaari <crope@iki.fi>
> ---
> drivers/media/usb/cx231xx/cx231xx-cards.c | 30 +++++++++++++++---------------
> 1 file changed, 15 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/media/usb/cx231xx/cx231xx-cards.c b/drivers/media/usb/cx231xx/cx231xx-cards.c
> index f5fb93a..4eb2057 100644
> --- a/drivers/media/usb/cx231xx/cx231xx-cards.c
> +++ b/drivers/media/usb/cx231xx/cx231xx-cards.c
> @@ -104,7 +104,7 @@ struct cx231xx_board cx231xx_boards[] = {
> .ctl_pin_status_mask = 0xFFFFFFC4,
> .agc_analog_digital_select_gpio = 0x0c,
> .gpio_pin_status_mask = 0x4001000,
> - .tuner_i2c_master = I2C_1,
> + .tuner_i2c_master = I2C_1_MUX_3,
> .demod_i2c_master = I2C_2,
> .has_dvb = 1,
> .demod_addr = 0x02,
> @@ -144,7 +144,7 @@ struct cx231xx_board cx231xx_boards[] = {
> .ctl_pin_status_mask = 0xFFFFFFC4,
> .agc_analog_digital_select_gpio = 0x0c,
> .gpio_pin_status_mask = 0x4001000,
> - .tuner_i2c_master = I2C_1,
> + .tuner_i2c_master = I2C_1_MUX_3,
> .demod_i2c_master = I2C_2,
> .has_dvb = 1,
> .demod_addr = 0x32,
> @@ -184,7 +184,7 @@ struct cx231xx_board cx231xx_boards[] = {
> .ctl_pin_status_mask = 0xFFFFFFC4,
> .agc_analog_digital_select_gpio = 0x1c,
> .gpio_pin_status_mask = 0x4001000,
> - .tuner_i2c_master = I2C_1,
> + .tuner_i2c_master = I2C_1_MUX_3,
> .demod_i2c_master = I2C_2,
> .has_dvb = 1,
> .demod_addr = 0x02,
> @@ -225,7 +225,7 @@ struct cx231xx_board cx231xx_boards[] = {
> .ctl_pin_status_mask = 0xFFFFFFC4,
> .agc_analog_digital_select_gpio = 0x1c,
> .gpio_pin_status_mask = 0x4001000,
> - .tuner_i2c_master = I2C_1,
> + .tuner_i2c_master = I2C_1_MUX_3,
> .demod_i2c_master = I2C_2,
> .has_dvb = 1,
> .demod_addr = 0x02,
> @@ -297,7 +297,7 @@ struct cx231xx_board cx231xx_boards[] = {
> .ctl_pin_status_mask = 0xFFFFFFC4,
> .agc_analog_digital_select_gpio = 0x0c,
> .gpio_pin_status_mask = 0x4001000,
> - .tuner_i2c_master = I2C_1,
> + .tuner_i2c_master = I2C_1_MUX_3,
> .demod_i2c_master = I2C_2,
> .has_dvb = 1,
> .demod_addr = 0x02,
> @@ -325,7 +325,7 @@ struct cx231xx_board cx231xx_boards[] = {
> .ctl_pin_status_mask = 0xFFFFFFC4,
> .agc_analog_digital_select_gpio = 0x0c,
> .gpio_pin_status_mask = 0x4001000,
> - .tuner_i2c_master = I2C_1,
> + .tuner_i2c_master = I2C_1_MUX_3,
> .demod_i2c_master = I2C_2,
> .has_dvb = 1,
> .demod_addr = 0x32,
> @@ -353,7 +353,7 @@ struct cx231xx_board cx231xx_boards[] = {
> .ctl_pin_status_mask = 0xFFFFFFC4,
> .agc_analog_digital_select_gpio = 0x0c,
> .gpio_pin_status_mask = 0x4001000,
> - .tuner_i2c_master = I2C_1,
> + .tuner_i2c_master = I2C_1_MUX_1,
> .demod_i2c_master = I2C_2,
> .has_dvb = 1,
> .demod_addr = 0x0e,
> @@ -419,7 +419,7 @@ struct cx231xx_board cx231xx_boards[] = {
> .tuner_sda_gpio = -1,
> .gpio_pin_status_mask = 0x4001000,
> .tuner_i2c_master = I2C_2,
> - .demod_i2c_master = I2C_1,
> + .demod_i2c_master = I2C_1_MUX_3,
> .ir_i2c_master = I2C_2,
> .has_dvb = 1,
> .demod_addr = 0x10,
> @@ -457,7 +457,7 @@ struct cx231xx_board cx231xx_boards[] = {
> .tuner_sda_gpio = -1,
> .gpio_pin_status_mask = 0x4001000,
> .tuner_i2c_master = I2C_2,
> - .demod_i2c_master = I2C_1,
> + .demod_i2c_master = I2C_1_MUX_3,
> .ir_i2c_master = I2C_2,
> .has_dvb = 1,
> .demod_addr = 0x10,
> @@ -495,7 +495,7 @@ struct cx231xx_board cx231xx_boards[] = {
> .tuner_sda_gpio = -1,
> .gpio_pin_status_mask = 0x4001000,
> .tuner_i2c_master = I2C_2,
> - .demod_i2c_master = I2C_1,
> + .demod_i2c_master = I2C_1_MUX_3,
> .ir_i2c_master = I2C_2,
> .rc_map_name = RC_MAP_PIXELVIEW_002T,
> .has_dvb = 1,
> @@ -587,7 +587,7 @@ struct cx231xx_board cx231xx_boards[] = {
> .ctl_pin_status_mask = 0xFFFFFFC4,
> .agc_analog_digital_select_gpio = 0x0c,
> .gpio_pin_status_mask = 0x4001000,
> - .tuner_i2c_master = I2C_1,
> + .tuner_i2c_master = I2C_1_MUX_3,
> .norm = V4L2_STD_PAL,
>
> .input = {{
> @@ -622,7 +622,7 @@ struct cx231xx_board cx231xx_boards[] = {
> .ctl_pin_status_mask = 0xFFFFFFC4,
> .agc_analog_digital_select_gpio = 0x0c,
> .gpio_pin_status_mask = 0x4001000,
> - .tuner_i2c_master = I2C_1,
> + .tuner_i2c_master = I2C_1_MUX_3,
> .norm = V4L2_STD_NTSC,
>
> .input = {{
> @@ -718,7 +718,7 @@ struct cx231xx_board cx231xx_boards[] = {
> .ctl_pin_status_mask = 0xFFFFFFC4,
> .agc_analog_digital_select_gpio = 0x0c,
> .gpio_pin_status_mask = 0x4001000,
> - .tuner_i2c_master = I2C_1,
> + .tuner_i2c_master = I2C_1_MUX_3,
> .demod_i2c_master = I2C_2,
> .has_dvb = 1,
> .demod_addr = 0x0e,
> @@ -757,7 +757,7 @@ struct cx231xx_board cx231xx_boards[] = {
> .ctl_pin_status_mask = 0xFFFFFFC4,
> .agc_analog_digital_select_gpio = 0x0c,
> .gpio_pin_status_mask = 0x4001000,
> - .tuner_i2c_master = I2C_1,
> + .tuner_i2c_master = I2C_1_MUX_3,
> .demod_i2c_master = I2C_2,
> .has_dvb = 1,
> .demod_addr = 0x0e,
> @@ -1064,7 +1064,7 @@ void cx231xx_card_setup(struct cx231xx *dev)
> struct i2c_client 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;
>
> read_eeprom(dev, &client, eeprom, sizeof(eeprom));
next prev parent reply other threads:[~2014-10-30 19:27 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-02 5:20 cx231xx: Use muxed i2c adapters instead of custom switching Matthias Schwarzott
2014-10-02 5:20 ` [PATCH V3 01/13] cx231xx: let i2c bus scanning use its own i2c_client Matthias Schwarzott
2014-10-02 5:20 ` [PATCH V3 02/13] cx231xx: use own i2c_client for eeprom access Matthias Schwarzott
2014-10-02 5:20 ` [PATCH V3 03/13] cx231xx: delete i2c_client per bus Matthias Schwarzott
2014-10-02 5:20 ` [PATCH V3 04/13] cx231xx: give each master i2c bus a seperate name Matthias Schwarzott
2014-10-02 5:25 ` Antti Palosaari
2014-10-02 5:20 ` [PATCH V3 05/13] cx231xx: Modifiy the symbolic constants for i2c ports and describe Matthias Schwarzott
2014-10-02 5:20 ` [PATCH V3 06/13] cx231xx: Use symbolic constants for i2c ports instead of numbers Matthias Schwarzott
2014-10-02 5:20 ` [PATCH V3 07/13] cx231xx: add wrapper to get the i2c_adapter pointer Matthias Schwarzott
2014-10-02 5:21 ` [PATCH V3 08/13] cx231xx: remember status of i2c port_3 switch Matthias Schwarzott
2014-10-02 5:34 ` Antti Palosaari
2014-10-02 5:21 ` [PATCH V3 09/13] cx231xx: let is_tuner check the real i2c port and not the i2c master number Matthias Schwarzott
2014-10-02 5:21 ` [PATCH V3 10/13] cx231xx: change usage of I2C_1 to the real i2c port Matthias Schwarzott
2014-10-30 19:27 ` Mauro Carvalho Chehab [this message]
2014-10-02 5:21 ` [PATCH V3 11/13] cx231xx: register i2c mux adapters for master1 and use as I2C_1_MUX_1 and I2C_1_MUX_3 Matthias Schwarzott
2014-10-02 5:21 ` [PATCH V3 12/13] cx231xx: drop unconditional port3 switching Matthias Schwarzott
2014-10-02 5:21 ` [PATCH V3 13/13] cx231xx: scan all four existing i2c busses instead of the 3 masters Matthias Schwarzott
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20141030172750.193cfaae@recife.lan \
--to=mchehab@osg.samsung.com \
--cc=crope@iki.fi \
--cc=linux-media@vger.kernel.org \
--cc=zzam@gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.