|
| 1 | +Adding PCA9548 I2C MUX force deselect-on-exit flag. |
| 2 | + |
| 3 | + |
| 4 | + |
| 5 | +--- |
| 6 | + drivers/i2c/muxes/i2c-mux-pca954x.c | 7 ++++++- |
| 7 | + 1 file changed, 6 insertions(+), 1 deletion(-) |
| 8 | + |
| 9 | +diff --git a/drivers/i2c/muxes/i2c-mux-pca954x.c b/drivers/i2c/muxes/i2c-mux-pca954x.c |
| 10 | +index 9bd4212..2ed7758 100644 |
| 11 | +--- a/drivers/i2c/muxes/i2c-mux-pca954x.c |
| 12 | ++++ b/drivers/i2c/muxes/i2c-mux-pca954x.c |
| 13 | +@@ -116,6 +116,11 @@ static const struct i2c_device_id pca954x_id[] = { |
| 14 | + }; |
| 15 | + MODULE_DEVICE_TABLE(i2c, pca954x_id); |
| 16 | + |
| 17 | ++/* Force deselect-on-exit feature for PCA954X devices. Default is disabled. */ |
| 18 | ++static unsigned int force_deselect_on_exit = 0; |
| 19 | ++module_param(force_deselect_on_exit, uint, S_IRUGO); |
| 20 | ++MODULE_PARM_DESC(force_deselect_on_exit, "Force deselect-on-exit feature for PCA954X devices. Default is disabled."); |
| 21 | ++ |
| 22 | + /* Write to mux register. Don't use i2c_transfer()/i2c_smbus_xfer() |
| 23 | + for this as they will try to lock adapter a second time */ |
| 24 | + static int pca954x_reg_write(struct i2c_adapter *adap, |
| 25 | +@@ -233,7 +238,7 @@ static int pca954x_probe(struct i2c_client *client, |
| 26 | + data->virt_adaps[num] = |
| 27 | + i2c_add_mux_adapter(adap, &client->dev, client, |
| 28 | + force, num, class, pca954x_select_chan, |
| 29 | +- (pdata && pdata->modes[num].deselect_on_exit) |
| 30 | ++ (pdata && pdata->modes[num].deselect_on_exit) || force_deselect_on_exit |
| 31 | + ? pca954x_deselect_mux : NULL); |
| 32 | + |
| 33 | + if (data->virt_adaps[num] == NULL) { |
| 34 | +-- |
| 35 | +2.1.4 |
| 36 | + |
0 commit comments