From: Stefan Roese <sr@denx.de>
To: u-boot@lists.denx.de
Cc: "Heiko Schocher" <hs@denx.de>,
"Samuel Holland" <samuel@sholland.org>,
"Baruch Siach" <baruch@tkos.co.il>,
"Pali Rohár" <pali@kernel.org>,
"Marek Behún" <marek.behun@nic.cz>
Subject: [PATCH] i2c: mvtwsi: Swab the register address if its size is > 1
Date: Thu, 18 Nov 2021 09:18:41 +0100 [thread overview]
Message-ID: <20211118081841.861158-1-sr@denx.de> (raw)
Testing on Armada XP with an EEPROM using register address with size
of 2 has shown, that the register address bytes are sent to the I2C
EEPROM in the incorrect order. This patch swabs the address bytes so
that the correct address is transferred to the I2C device.
BTW: This worked without any issues before migrating Armada XP to
DM I2C.
Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Heiko Schocher <hs@denx.de>
Cc: Samuel Holland <samuel@sholland.org>
Cc: Baruch Siach <baruch@tkos.co.il>
Cc: Pali Rohár <pali@kernel.org>
Cc: Marek Behún <marek.behun@nic.cz>
---
It would be good if other users of this I2C driver could test this change
with e.g. I2C EEPROM devices using 2 bytes (or more) for addressing.
drivers/i2c/mvtwsi.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/drivers/i2c/mvtwsi.c b/drivers/i2c/mvtwsi.c
index 236bfb8d8e7f..ff21e3c52b58 100644
--- a/drivers/i2c/mvtwsi.c
+++ b/drivers/i2c/mvtwsi.c
@@ -860,6 +860,9 @@ static int mvtwsi_i2c_xfer(struct udevice *bus, struct i2c_msg *msg, int nmsgs)
{
struct mvtwsi_i2c_dev *dev = dev_get_priv(bus);
struct i2c_msg *dmsg, *omsg, dummy;
+ u8 *addr_buf_ptr;
+ u8 addr_buf[4];
+ int i;
memset(&dummy, 0, sizeof(struct i2c_msg));
@@ -873,12 +876,17 @@ static int mvtwsi_i2c_xfer(struct udevice *bus, struct i2c_msg *msg, int nmsgs)
omsg = nmsgs == 1 ? &dummy : msg;
dmsg = nmsgs == 1 ? msg : msg + 1;
+ /* We need to swap the register address if its size is > 1 */
+ addr_buf_ptr = &addr_buf[0];
+ for (i = omsg->len; i > 0; i--)
+ *addr_buf_ptr++ = omsg->buf[i - 1];
+
if (dmsg->flags & I2C_M_RD)
- return __twsi_i2c_read(dev->base, dmsg->addr, omsg->buf,
+ return __twsi_i2c_read(dev->base, dmsg->addr, addr_buf,
omsg->len, dmsg->buf, dmsg->len,
dev->tick);
else
- return __twsi_i2c_write(dev->base, dmsg->addr, omsg->buf,
+ return __twsi_i2c_write(dev->base, dmsg->addr, addr_buf,
omsg->len, dmsg->buf, dmsg->len,
dev->tick);
}
--
2.34.0
next reply other threads:[~2021-11-18 8:18 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-18 8:18 Stefan Roese [this message]
2021-12-18 13:42 ` [PATCH] i2c: mvtwsi: Swab the register address if its size is > 1 Stefan Roese
2021-12-18 22:41 ` Marek Behún
2021-12-20 7:03 ` Heiko Schocher
2021-12-20 10:12 ` Heiko Schocher
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=20211118081841.861158-1-sr@denx.de \
--to=sr@denx.de \
--cc=baruch@tkos.co.il \
--cc=hs@denx.de \
--cc=marek.behun@nic.cz \
--cc=pali@kernel.org \
--cc=samuel@sholland.org \
--cc=u-boot@lists.denx.de \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.