From: Marek Vasut <marex@denx.de>
To: linux-i2c@vger.kernel.org
Cc: Marek Vasut <marex@denx.de>, Peter Rosin <peda@axentia.se>,
Wolfram Sang <wsa@kernel.org>
Subject: [PATCH 1/2] i2c: mux: pca954x: Make sure the mux remains configured the same as before resume
Date: Thu, 31 Aug 2023 20:17:52 +0200 [thread overview]
Message-ID: <20230831181753.154787-1-marex@denx.de> (raw)
The current implementation of pca954x_init() rewrites content of data->last_chan
which is then populated into the mux select register. Skip this part, so that the
mux is populated with content of data->last_chan as it was set before suspend.
This way, the mux state is retained across suspend/resume cycle.
Fixes: e65e228eb096 ("i2c: mux: pca954x: support property idle-state")
Signed-off-by: Marek Vasut <marex@denx.de>
---
Cc: Peter Rosin <peda@axentia.se>
Cc: Wolfram Sang <wsa@kernel.org>
Cc: linux-i2c@vger.kernel.org
---
drivers/i2c/muxes/i2c-mux-pca954x.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/i2c/muxes/i2c-mux-pca954x.c b/drivers/i2c/muxes/i2c-mux-pca954x.c
index 2219062104fbc..97cf475dde0f4 100644
--- a/drivers/i2c/muxes/i2c-mux-pca954x.c
+++ b/drivers/i2c/muxes/i2c-mux-pca954x.c
@@ -620,9 +620,9 @@ static int pca954x_resume(struct device *dev)
struct pca954x *data = i2c_mux_priv(muxc);
int ret;
- ret = pca954x_init(client, data);
+ ret = i2c_smbus_write_byte(client, data->last_chan);
if (ret < 0)
- dev_err(&client->dev, "failed to verify mux presence\n");
+ dev_err(&client->dev, "failed to restore mux state\n");
return ret;
}
--
2.40.1
next reply other threads:[~2023-08-31 18:18 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-31 18:17 Marek Vasut [this message]
2023-08-31 18:17 ` [PATCH 2/2] i2c: mux: pca954x: Resume the mux early Marek Vasut
2023-08-31 21:24 ` [PATCH 1/2] i2c: mux: pca954x: Make sure the mux remains configured the same as before resume Peter Rosin
2023-08-31 21:50 ` Marek Vasut
2023-09-01 8:07 ` Peter Rosin
2023-09-01 17:36 ` Marek Vasut
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230831181753.154787-1-marex@denx.de \
--to=marex@denx.de \
--cc=linux-i2c@vger.kernel.org \
--cc=peda@axentia.se \
--cc=wsa@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox