mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-27 03:47:43 +00:00
[media] cx231xx: scan all four existing i2c busses instead of the 3 masters
The scanning itself just fails (as before this series) but now the correct busses are scanned. Signed-off-by: Matthias Schwarzott <zzam@gentoo.org> Reviewed-by: Antti Palosaari <crope@iki.fi> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
parent
660acd54d1
commit
e4de03f263
@ -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 in the order of physical port numbers */
|
||||
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 */
|
||||
|
@ -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);
|
||||
|
||||
@ -528,10 +531,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);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user