diff options
| author | Andrey Smirnov <andrew.smirnov@gmail.com> | 2019-10-07 22:06:56 -0700 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-10-14 12:15:17 +0200 |
| commit | a6438ad878d97e5b7e2c366426d9ad4d8c45a0bd (patch) | |
| tree | 9d75cf42ea8af44bfb504f4cc508c076ebc512d1 /drivers | |
| parent | e2f42fbbe7eded87b8784a574af615fb8dc34f85 (diff) | |
| download | barebox-a6438ad878d97e5b7e2c366426d9ad4d8c45a0bd.tar.gz barebox-a6438ad878d97e5b7e2c366426d9ad4d8c45a0bd.tar.xz | |
i2c-mux-pca954x: Add support for "i2c-mux-idle-disconnect"
Add support for "i2c-mux-idle-disconnect" binding to match the
behavior, already present in upstream kernel driver. This feature is a
must have for I2C bus topologies with multiple muxes connected to
child segments containing slaves with identical addresses (e.g. ZII's
SCU4)
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/i2c/muxes/i2c-mux-pca954x.c | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/drivers/i2c/muxes/i2c-mux-pca954x.c b/drivers/i2c/muxes/i2c-mux-pca954x.c index 42bde5ed1c..aa7dcb8c31 100644 --- a/drivers/i2c/muxes/i2c-mux-pca954x.c +++ b/drivers/i2c/muxes/i2c-mux-pca954x.c @@ -170,6 +170,16 @@ static int pca954x_select_chan(struct i2c_adapter *adap, return ret; } +static int pca954x_deselect_chan(struct i2c_adapter *adap, + void *client, u32 chan) +{ + struct pca954x *data = i2c_get_clientdata(client); + + /* Deselect active channel */ + data->last_chan = 0; + return pca954x_reg_write(adap, client, data->last_chan); +} + /* * I2C init/probing/exit functions */ @@ -182,6 +192,7 @@ static int pca954x_probe(struct device_d *dev) uintptr_t tmp; int ret = -ENODEV; int gpio; + bool idle_disconnect; data = kzalloc(sizeof(struct pca954x), GFP_KERNEL); if (!data) { @@ -209,6 +220,9 @@ static int pca954x_probe(struct device_d *dev) if (ret) goto exit_free; + idle_disconnect = of_property_read_bool(dev->device_node, + "i2c-mux-idle-disconnect"); + data->last_chan = 0; /* force the first selection */ /* Now create an adapter for each channel */ @@ -216,7 +230,10 @@ static int pca954x_probe(struct device_d *dev) data->virt_adaps[num] = i2c_add_mux_adapter(adap, &client->dev, client, - 0, num, pca954x_select_chan, NULL); + 0, num, pca954x_select_chan, + idle_disconnect ? + pca954x_deselect_chan : + NULL); if (data->virt_adaps[num] == NULL) { ret = -ENODEV; |