i2c: mux: gpio: use reg value for i2c_add_mux_adapter
authorIonut Nicu <ioan.nicu.ext@nsn.com>
Fri, 11 Oct 2013 10:09:57 +0000 (12:09 +0200)
committerWolfram Sang <wsa@the-dreams.de>
Wed, 30 Oct 2013 16:29:46 +0000 (17:29 +0100)
commit8c0ec2500eeb89749341884a972860d7f9e56f9c
tree752b7ce74d978d8254861dc617095b8335fe4c05
parent250ad590d6f12d93f4d85be305b0a598d609232e
i2c: mux: gpio: use reg value for i2c_add_mux_adapter

The i2c-mux driver requires that the chan_id parameter
passed to the i2c_add_mux_adapter() function is equal
to the reg value for that adapter:

for_each_child_of_node(mux_dev->of_node, child) {
ret = of_property_read_u32(child, "reg", &reg);
if (ret)
continue;
if (chan_id == reg) {
priv->adap.dev.of_node = child;
break;
}
}

The i2c-mux-gpio driver uses an internal logical index
for chan_id when calling i2c_add_mux_adapter() instead
of using the reg value.

Because of this, there will problems in selecting the
right adapter when the i2c-mux-gpio's index into
mux->data.values doesn't match the reg value.

An example of such a case:

mux->data.values = { 1, 0 }

For chan_id = 0, i2c-mux will bind the adapter to the
of_node with reg = <0>, but when it will call the
select() callback with chan_id set to 0, the i2c-mux-gpio
will use it as an index into mux->data.values and it will
actually select the bus with reg = <1>.

Signed-off-by: Ionut Nicu <ioan.nicu.ext@nsn.com>
Acked-by: Alexander Sverdlin <alexander.sverdlin@nsn.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Cc: stable@kernel.org
drivers/i2c/muxes/i2c-mux-gpio.c