Commit f5e596cd authored by Jisheng Zhang's avatar Jisheng Zhang Committed by Wolfram Sang

i2c: pca954x: put the mux to disconnected state after resume

pca954x may be power lost during suspend, so after resume we also suffer
the issue fixed by commit cd823db8,

 "pca954x power-on default is channel 0 connected. If multiple pca954x
 muxes are connected to the same physical I2C bus, the parent bus will
 see channel 0 devices behind both muxes by default."

What's more, when resume bootloader may also operate the mux, so the
the channel connected after that may not be the one driver thought.

We fix this problem by putting the mux to disconnected state and
clearing last_chan in the resume hook.
Signed-off-by: default avatarJisheng Zhang <jszhang@marvell.com>
Reviewed-by: default avatarJean Delvare <jdelvare@suse.de>
Acked-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parent 52976fa7
...@@ -41,6 +41,7 @@ ...@@ -41,6 +41,7 @@
#include <linux/i2c-mux.h> #include <linux/i2c-mux.h>
#include <linux/i2c/pca954x.h> #include <linux/i2c/pca954x.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/pm.h>
#include <linux/slab.h> #include <linux/slab.h>
#define PCA954X_MAX_NCHANS 8 #define PCA954X_MAX_NCHANS 8
...@@ -273,9 +274,23 @@ static int pca954x_remove(struct i2c_client *client) ...@@ -273,9 +274,23 @@ static int pca954x_remove(struct i2c_client *client)
return 0; return 0;
} }
#ifdef CONFIG_PM_SLEEP
static int pca954x_resume(struct device *dev)
{
struct i2c_client *client = to_i2c_client(dev);
struct pca954x *data = i2c_get_clientdata(client);
data->last_chan = 0;
return i2c_smbus_write_byte(client, 0);
}
#endif
static SIMPLE_DEV_PM_OPS(pca954x_pm, NULL, pca954x_resume);
static struct i2c_driver pca954x_driver = { static struct i2c_driver pca954x_driver = {
.driver = { .driver = {
.name = "pca954x", .name = "pca954x",
.pm = &pca954x_pm,
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = pca954x_probe, .probe = pca954x_probe,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment