[lkml]   [2016]   [Nov]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Patch in this message
Subject[PATCH] i2c: i2c-mux-pca954x: fix deselect enabling for device-tree
From: Alex Hemme <>

Deselect functionality can be ignored for device-trees with
"i2c-mux-idle-disconnect" entries if no platform_data is available.
By enabling the deselect functionality outside the platform_data
block the logic works as it did in previous kernels.

Fixes: 7fcac9807175 ("i2c: i2c-mux-pca954x: convert to use an explicit i2c mux core")
Cc: <> # v4.7+
Signed-off-by: Alex Hemme <>
Signed-off-by: Ziyang Wu <>
[touched up a few minor issues /peda]
Signed-off-by: Peter Rosin <>
drivers/i2c/muxes/i2c-mux-pca954x.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)


I got this regression report and patch off-list, and am now
feeding it on to the appropriate places.

I would like to thank Alex (and team?) for finding the bug and
providing a fix for the bug that I introduced.


diff --git a/drivers/i2c/muxes/i2c-mux-pca954x.c b/drivers/i2c/muxes/i2c-mux-pca954x.c
index 1091346f2480..8bc3d36d2837 100644
--- a/drivers/i2c/muxes/i2c-mux-pca954x.c
+++ b/drivers/i2c/muxes/i2c-mux-pca954x.c
@@ -268,9 +268,9 @@ static int pca954x_probe(struct i2c_client *client,
/* discard unconfigured channels */
idle_disconnect_pd = pdata->modes[num].deselect_on_exit;
- data->deselect |= (idle_disconnect_pd
- || idle_disconnect_dt) << num;
+ data->deselect |= (idle_disconnect_pd ||
+ idle_disconnect_dt) << num;

ret = i2c_mux_add_adapter(muxc, force, num, class);

 \ /
  Last update: 2016-11-19 14:25    [W:2.191 / U:0.844 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site