From: Antti Palosaari <crope@iki.fi>
To: Matthias Schwarzott <zzam@gentoo.org>,
linux-media@vger.kernel.org, mchehab@osg.samsung.com
Subject: Re: [PATCH V2 13/13] cx231xx: scan all four existing i2c busses instead of the 3 masters
Date: Wed, 01 Oct 2014 22:47:01 +0300 [thread overview]
Message-ID: <542C5A35.1040005@iki.fi> (raw)
In-Reply-To: <1412140821-16285-14-git-send-email-zzam@gentoo.org>
Reviewed-by: Antti Palosaari <crope@iki.fi>
btw. is there some reason you those on that order? I mean you scan I2C_2
between MUX segments?
Antti
On 10/01/2014 08:20 AM, Matthias Schwarzott wrote:
> The scanning itself just fails (as before this series) but now the correct busses are scanned.
>
> V2: Changed to symbolic names where muxed adapters can be seen directly.
>
> Signed-off-by: Matthias Schwarzott <zzam@gentoo.org>
> ---
> drivers/media/usb/cx231xx/cx231xx-core.c | 6 ++++++
> drivers/media/usb/cx231xx/cx231xx-i2c.c | 8 ++++----
> 2 files changed, 10 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/media/usb/cx231xx/cx231xx-core.c b/drivers/media/usb/cx231xx/cx231xx-core.c
> index c49022f..60dbbbb 100644
> --- a/drivers/media/usb/cx231xx/cx231xx-core.c
> +++ b/drivers/media/usb/cx231xx/cx231xx-core.c
> @@ -1303,6 +1303,12 @@ int cx231xx_dev_init(struct cx231xx *dev)
> cx231xx_i2c_mux_register(dev, 0);
> cx231xx_i2c_mux_register(dev, 1);
>
> + /* scan the real bus segments */
> + cx231xx_do_i2c_scan(dev, I2C_0);
> + cx231xx_do_i2c_scan(dev, I2C_1_MUX_1);
> + cx231xx_do_i2c_scan(dev, I2C_2);
> + cx231xx_do_i2c_scan(dev, I2C_1_MUX_3);
> +
> /* init hardware */
> /* Note : with out calling set power mode function,
> afe can not be set up correctly */
> diff --git a/drivers/media/usb/cx231xx/cx231xx-i2c.c b/drivers/media/usb/cx231xx/cx231xx-i2c.c
> index bb82e6d..0df50d3 100644
> --- a/drivers/media/usb/cx231xx/cx231xx-i2c.c
> +++ b/drivers/media/usb/cx231xx/cx231xx-i2c.c
> @@ -492,6 +492,9 @@ void cx231xx_do_i2c_scan(struct cx231xx *dev, int i2c_port)
> int i, rc;
> struct i2c_client client;
>
> + if (!i2c_scan)
> + return;
> +
> memset(&client, 0, sizeof(client));
> client.adapter = cx231xx_get_i2c_adap(dev, i2c_port);
>
> @@ -533,10 +536,7 @@ int cx231xx_i2c_register(struct cx231xx_i2c *bus)
> i2c_set_adapdata(&bus->i2c_adap, &dev->v4l2_dev);
> i2c_add_adapter(&bus->i2c_adap);
>
> - if (0 == bus->i2c_rc) {
> - if (i2c_scan)
> - cx231xx_do_i2c_scan(dev, bus->nr);
> - } else
> + if (0 != bus->i2c_rc)
> cx231xx_warn("%s: i2c bus %d register FAILED\n",
> dev->name, bus->nr);
>
>
--
http://palosaari.fi/
next prev parent reply other threads:[~2014-10-01 19:47 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-01 5:20 [PATCH V2 00/13] cx231xx: Use muxed i2c adapters instead of custom switching Matthias Schwarzott
2014-10-01 5:20 ` [PATCH V2 01/13] cx231xx: let i2c bus scanning use its own i2c_client Matthias Schwarzott
2014-10-01 5:20 ` [PATCH V2 02/13] cx231xx: use own i2c_client for eeprom access Matthias Schwarzott
2014-10-01 5:20 ` [PATCH V2 03/13] cx231xx: delete i2c_client per bus Matthias Schwarzott
2014-10-01 5:20 ` [PATCH V2 04/13] cx231xx: give each master i2c bus a seperate name Matthias Schwarzott
2014-10-01 19:22 ` Antti Palosaari
2014-10-02 5:16 ` Matthias Schwarzott
2014-10-01 5:20 ` [PATCH V2 05/13] cx231xx: Modifiy the symbolic constants for i2c ports and describe Matthias Schwarzott
2014-10-01 19:12 ` Antti Palosaari
2014-10-01 5:20 ` [PATCH V2 06/13] cx231xx: Use symbolic constants for i2c ports instead of numbers Matthias Schwarzott
2014-10-01 5:20 ` [PATCH V2 07/13] cx231xx: add wrapper to get the i2c_adapter pointer Matthias Schwarzott
2014-10-01 19:28 ` Antti Palosaari
2014-10-01 5:20 ` [PATCH V2 08/13] cx231xx: remember status of i2c port_3 switch Matthias Schwarzott
2014-10-01 19:36 ` Antti Palosaari
2014-10-01 21:02 ` Matthias Schwarzott
2014-10-01 5:20 ` [PATCH V2 09/13] cx231xx: let is_tuner check the real i2c port and not the i2c master number Matthias Schwarzott
2014-10-01 5:20 ` [PATCH V2 10/13] cx231xx: change usage of I2C_1 to the real i2c port Matthias Schwarzott
2014-10-01 19:40 ` Antti Palosaari
2014-10-01 5:20 ` [PATCH V2 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-01 19:43 ` Antti Palosaari
2014-10-01 5:20 ` [PATCH V2 12/13] cx231xx: drop unconditional port3 switching Matthias Schwarzott
2014-10-01 5:20 ` [PATCH V2 13/13] cx231xx: scan all four existing i2c busses instead of the 3 masters Matthias Schwarzott
2014-10-01 19:47 ` Antti Palosaari [this message]
2014-10-02 4:31 ` 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=542C5A35.1040005@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.