From: Antti Palosaari <crope@iki.fi>
To: Matthias Schwarzott <zzam@gentoo.org>,
linux-media@vger.kernel.org, mchehab@osg.samsung.com
Subject: Re: [PATCH 11/12] cx231xx: drop unconditional port3 switching
Date: Thu, 25 Sep 2014 18:26:10 +0300 [thread overview]
Message-ID: <54243412.6040204@iki.fi> (raw)
In-Reply-To: <1411621684-8295-11-git-send-email-zzam@gentoo.org>
Reviewed-by: Antti Palosaari <crope@iki.fi>
Antti
On 09/25/2014 08:08 AM, Matthias Schwarzott wrote:
> All switching should be done by i2c mux adapters.
> Drop explicit dont_use_port_3 flag.
> Drop info message about switch.
>
> Only the removed code in start_streaming is questionable:
> It did switch the port_3 flag without accessing i2c in between.
>
> Signed-off-by: Matthias Schwarzott <zzam@gentoo.org>
> ---
> drivers/media/usb/cx231xx/cx231xx-avcore.c | 17 -----------------
> drivers/media/usb/cx231xx/cx231xx-cards.c | 8 --------
> drivers/media/usb/cx231xx/cx231xx-core.c | 4 +---
> drivers/media/usb/cx231xx/cx231xx-dvb.c | 4 ----
> drivers/media/usb/cx231xx/cx231xx.h | 1 -
> 5 files changed, 1 insertion(+), 33 deletions(-)
>
> diff --git a/drivers/media/usb/cx231xx/cx231xx-avcore.c b/drivers/media/usb/cx231xx/cx231xx-avcore.c
> index d31ea57..138ee5e 100644
> --- a/drivers/media/usb/cx231xx/cx231xx-avcore.c
> +++ b/drivers/media/usb/cx231xx/cx231xx-avcore.c
> @@ -1270,8 +1270,6 @@ int cx231xx_enable_i2c_port_3(struct cx231xx *dev, bool is_port_3)
> int status = 0;
> bool current_is_port_3;
>
> - if (dev->board.dont_use_port_3)
> - is_port_3 = false;
> status = cx231xx_read_ctrl_reg(dev, VRT_GET_REGISTER,
> PWR_CTL_EN, value, 4);
> if (status < 0)
> @@ -1288,9 +1286,6 @@ int cx231xx_enable_i2c_port_3(struct cx231xx *dev, bool is_port_3)
> else
> value[0] &= ~I2C_DEMOD_EN;
>
> - cx231xx_info("Changing the i2c master port to %d\n",
> - is_port_3 ? 3 : 1);
> -
> status = cx231xx_write_ctrl_reg(dev, VRT_SET_REGISTER,
> PWR_CTL_EN, value, 4);
>
> @@ -2320,9 +2315,6 @@ int cx231xx_set_power_mode(struct cx231xx *dev, enum AV_MODE mode)
> }
>
> if (dev->board.tuner_type != TUNER_ABSENT) {
> - /* Enable tuner */
> - cx231xx_enable_i2c_port_3(dev, true);
> -
> /* reset the Tuner */
> if (dev->board.tuner_gpio)
> cx231xx_gpio_set(dev, dev->board.tuner_gpio);
> @@ -2387,15 +2379,6 @@ int cx231xx_set_power_mode(struct cx231xx *dev, enum AV_MODE mode)
> }
>
> if (dev->board.tuner_type != TUNER_ABSENT) {
> - /*
> - * Enable tuner
> - * Hauppauge Exeter seems to need to do something different!
> - */
> - if (dev->model == CX231XX_BOARD_HAUPPAUGE_EXETER)
> - cx231xx_enable_i2c_port_3(dev, false);
> - else
> - cx231xx_enable_i2c_port_3(dev, true);
> -
> /* reset the Tuner */
> if (dev->board.tuner_gpio)
> cx231xx_gpio_set(dev, dev->board.tuner_gpio);
> diff --git a/drivers/media/usb/cx231xx/cx231xx-cards.c b/drivers/media/usb/cx231xx/cx231xx-cards.c
> index a6fdb6f..0a0a4e9 100644
> --- a/drivers/media/usb/cx231xx/cx231xx-cards.c
> +++ b/drivers/media/usb/cx231xx/cx231xx-cards.c
> @@ -262,7 +262,6 @@ struct cx231xx_board cx231xx_boards[] = {
> .norm = V4L2_STD_PAL,
> .no_alt_vanc = 1,
> .external_av = 1,
> - .dont_use_port_3 = 1,
> /* Actually, it has a 417, but it isn't working correctly.
> * So set to 0 for now until someone can manage to get this
> * to work reliably. */
> @@ -390,7 +389,6 @@ struct cx231xx_board cx231xx_boards[] = {
> .norm = V4L2_STD_NTSC,
> .no_alt_vanc = 1,
> .external_av = 1,
> - .dont_use_port_3 = 1,
> .input = {{
> .type = CX231XX_VMUX_COMPOSITE1,
> .vmux = CX231XX_VIN_2_1,
> @@ -532,7 +530,6 @@ struct cx231xx_board cx231xx_boards[] = {
> .norm = V4L2_STD_NTSC,
> .no_alt_vanc = 1,
> .external_av = 1,
> - .dont_use_port_3 = 1,
>
> .input = {{
> .type = CX231XX_VMUX_COMPOSITE1,
> @@ -656,7 +653,6 @@ struct cx231xx_board cx231xx_boards[] = {
> .norm = V4L2_STD_NTSC,
> .no_alt_vanc = 1,
> .external_av = 1,
> - .dont_use_port_3 = 1,
> .input = {{
> .type = CX231XX_VMUX_COMPOSITE1,
> .vmux = CX231XX_VIN_2_1,
> @@ -683,7 +679,6 @@ struct cx231xx_board cx231xx_boards[] = {
> .norm = V4L2_STD_NTSC,
> .no_alt_vanc = 1,
> .external_av = 1,
> - .dont_use_port_3 = 1,
> /*.has_417 = 1, */
> /* This board is believed to have a hardware encoding chip
> * supporting mpeg1/2/4, but as the 417 is apparently not
> @@ -1012,9 +1007,6 @@ static int read_eeprom(struct cx231xx *dev, struct i2c_client *client,
> len_todo -= msg_read.len;
> }
>
> - cx231xx_enable_i2c_port_3(dev, true);
> - /* mutex_unlock(&dev->i2c_lock); */
> -
> for (i = 0; i + 15 < len; i += 16)
> cx231xx_info("i2c eeprom %02x: %*ph\n", i, 16, &eedata[i]);
>
> diff --git a/drivers/media/usb/cx231xx/cx231xx-core.c b/drivers/media/usb/cx231xx/cx231xx-core.c
> index c8a6d20..c49022f 100644
> --- a/drivers/media/usb/cx231xx/cx231xx-core.c
> +++ b/drivers/media/usb/cx231xx/cx231xx-core.c
> @@ -1407,9 +1407,7 @@ int cx231xx_dev_init(struct cx231xx *dev)
> if (dev->board.has_dvb)
> cx231xx_set_alt_setting(dev, INDEX_TS1, 0);
>
> - /* set the I2C master port to 3 on channel 1 */
> - errCode = cx231xx_enable_i2c_port_3(dev, true);
> -
> + errCode = 0;
> return errCode;
> }
> EXPORT_SYMBOL_GPL(cx231xx_dev_init);
> diff --git a/drivers/media/usb/cx231xx/cx231xx-dvb.c b/drivers/media/usb/cx231xx/cx231xx-dvb.c
> index 869c433..2ea6946 100644
> --- a/drivers/media/usb/cx231xx/cx231xx-dvb.c
> +++ b/drivers/media/usb/cx231xx/cx231xx-dvb.c
> @@ -266,11 +266,7 @@ static int start_streaming(struct cx231xx_dvb *dvb)
>
> if (dev->USE_ISO) {
> cx231xx_info("DVB transfer mode is ISO.\n");
> - mutex_lock(&dev->i2c_lock);
> - cx231xx_enable_i2c_port_3(dev, false);
> cx231xx_set_alt_setting(dev, INDEX_TS1, 4);
> - cx231xx_enable_i2c_port_3(dev, true);
> - mutex_unlock(&dev->i2c_lock);
> rc = cx231xx_set_mode(dev, CX231XX_DIGITAL_MODE);
> if (rc < 0)
> return rc;
> diff --git a/drivers/media/usb/cx231xx/cx231xx.h b/drivers/media/usb/cx231xx/cx231xx.h
> index 9234cd7..b8daff6 100644
> --- a/drivers/media/usb/cx231xx/cx231xx.h
> +++ b/drivers/media/usb/cx231xx/cx231xx.h
> @@ -367,7 +367,6 @@ struct cx231xx_board {
> unsigned int valid:1;
> unsigned int no_alt_vanc:1;
> unsigned int external_av:1;
> - unsigned int dont_use_port_3:1;
>
> unsigned char xclk, i2c_speed;
>
>
--
http://palosaari.fi/
next prev parent reply other threads:[~2014-09-25 15:26 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-25 5:07 [PATCH 01/12] cx231xx: let i2c bus scanning use its own i2c_client Matthias Schwarzott
2014-09-25 5:07 ` [PATCH 02/12] cx231xx: use own i2c_client for eeprom access Matthias Schwarzott
2014-09-25 14:58 ` Antti Palosaari
2014-09-26 4:30 ` Matthias Schwarzott
2014-09-26 12:31 ` Antti Palosaari
2014-09-26 13:00 ` Antti Palosaari
2014-09-25 5:07 ` [PATCH 03/12] cx231xx: delete i2c_client per bus Matthias Schwarzott
2014-09-25 15:00 ` Antti Palosaari
2014-09-25 5:07 ` [PATCH 04/12] cx231xx: give each master i2c bus a seperate name Matthias Schwarzott
2014-09-25 15:04 ` Antti Palosaari
2014-09-26 4:34 ` Matthias Schwarzott
2014-09-26 12:32 ` Antti Palosaari
2014-09-25 5:07 ` [PATCH 05/12] cx231xx: Use symbolic constants for i2c ports Matthias Schwarzott
2014-09-25 15:06 ` Antti Palosaari
2014-09-25 5:07 ` [PATCH 06/12] cx231xx: add wrapper to get the i2c_adapter pointer Matthias Schwarzott
2014-09-25 15:13 ` Antti Palosaari
2014-09-25 5:07 ` [PATCH 07/12] cx231xx: remember status of port_3 switch Matthias Schwarzott
2014-09-25 5:08 ` [PATCH 08/12] cx231xx: let is_tuner check the real i2c port and not the i2c master number Matthias Schwarzott
2014-09-25 5:08 ` [PATCH 09/12] cx231xx: change usage of I2C_1 to the real i2c port Matthias Schwarzott
2014-09-25 5:08 ` [PATCH 10/12] cx231xx: register i2c mux adapters for master1 and use as I2C_1 and I2C_3 Matthias Schwarzott
2014-09-25 15:25 ` Antti Palosaari
2014-09-25 5:08 ` [PATCH 11/12] cx231xx: drop unconditional port3 switching Matthias Schwarzott
2014-09-25 15:26 ` Antti Palosaari [this message]
2014-09-25 5:08 ` [PATCH 12/12] cx231xx: scan all four existing i2c busses instead of the 3 masters Matthias Schwarzott
2014-09-25 15:30 ` Antti Palosaari
2014-09-25 14:50 ` [PATCH 01/12] cx231xx: let i2c bus scanning use its own i2c_client Antti Palosaari
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=54243412.6040204@iki.fi \
--to=crope@iki.fi \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@osg.samsung.com \
--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.