From: Rosen Kolev <rosen.kolev@amk-drives.bg>
To: barebox@lists.infradead.org
Subject: [PATCH] Allow data-only i2c transfers
Date: Thu, 29 Sep 2011 11:57:02 +0300 [thread overview]
Message-ID: <1317286622-7477-1-git-send-email-rosen.kolev@amk-drives.bg> (raw)
Modified the i2c_imx driver to support data-only transfers, without
command byte. This allows to construct more complex i2c transfers
and support non genuine devices like Atmel ATxx secure memory, where the
master reads data after a write command.
Signed-off-by: Rosen Kolev <rosen.kolev@amk-drives.bg>
---
drivers/i2c/busses/i2c-imx.c | 52 ++++++++++++++++++++++-------------------
include/i2c/i2c.h | 1 +
2 files changed, 29 insertions(+), 24 deletions(-)
diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c
index 2d075f7..d928839 100644
--- a/drivers/i2c/busses/i2c-imx.c
+++ b/drivers/i2c/busses/i2c-imx.c
@@ -314,19 +314,21 @@ static int i2c_imx_write(struct i2c_adapter *adapter, struct i2c_msg *msgs)
void __iomem *base = i2c_imx->base;
int i, result;
- dev_dbg(adapter->dev,
- "<%s> write slave address: addr=0x%02x\n",
- __func__, msgs->addr << 1);
+ if ( !(msgs->flags & I2C_M_DATA_ONLY) ) {
+ dev_dbg(adapter->dev,
+ "<%s> write slave address: addr=0x%02x\n",
+ __func__, msgs->addr << 1);
- /* write slave address */
- writeb(msgs->addr << 1, base + IMX_I2C_I2DR);
+ /* write slave address */
+ writeb(msgs->addr << 1, base + IMX_I2C_I2DR);
- result = i2c_imx_trx_complete(adapter);
- if (result)
- return result;
- result = i2c_imx_acked(adapter);
- if (result)
- return result;
+ result = i2c_imx_trx_complete(adapter);
+ if (result)
+ return result;
+ result = i2c_imx_acked(adapter);
+ if (result)
+ return result;
+ }
/* write data */
for (i = 0; i < msgs->len; i++) {
@@ -352,22 +354,24 @@ static int i2c_imx_read(struct i2c_adapter *adapter, struct i2c_msg *msgs)
int i, result;
unsigned int temp;
- dev_dbg(adapter->dev,
- "<%s> write slave address: addr=0x%02x\n",
- __func__, (msgs->addr << 1) | 0x01);
-
/* clear IIF */
writeb(0x0, base + IMX_I2C_I2SR);
- /* write slave address */
- writeb((msgs->addr << 1) | 0x01, base + IMX_I2C_I2DR);
+ if ( !(msgs->flags & I2C_M_DATA_ONLY) ) {
+ dev_dbg(adapter->dev,
+ "<%s> write slave address: addr=0x%02x\n",
+ __func__, (msgs->addr << 1) | 0x01);
- result = i2c_imx_trx_complete(adapter);
- if (result)
- return result;
- result = i2c_imx_acked(adapter);
- if (result)
- return result;
+ /* write slave address */
+ writeb((msgs->addr << 1) | 0x01, base + IMX_I2C_I2DR);
+
+ result = i2c_imx_trx_complete(adapter);
+ if (result)
+ return result;
+ result = i2c_imx_acked(adapter);
+ if (result)
+ return result;
+ }
/* setup bus to read data */
temp = readb(base + IMX_I2C_I2CR);
@@ -428,7 +432,7 @@ static int i2c_imx_xfer(struct i2c_adapter *adapter,
/* read/write data */
for (i = 0; i < num; i++) {
- if (i) {
+ if (i && !(msgs[i].flags & I2C_M_DATA_ONLY)) {
temp = readb(base + IMX_I2C_I2CR);
temp |= I2CR_RSTA;
writeb(temp, base + IMX_I2C_I2CR);
diff --git a/include/i2c/i2c.h b/include/i2c/i2c.h
index 2507d68..ccbf518 100644
--- a/include/i2c/i2c.h
+++ b/include/i2c/i2c.h
@@ -30,6 +30,7 @@ struct i2c_platform_data {
#define I2C_NAME_SIZE 20
#define I2C_M_RD 0x0001 /* read data, from slave to master */
+#define I2C_M_DATA_ONLY 0x0002 /* transfer data bytes only */
#define I2C_M_TEN 0x0010 /* this is a ten bit chip address */
#define I2C_M_IGNORE_NAK 0x1000 /* if I2C_FUNC_PROTOCOL_MANGLING */
--
1.7.2.3
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next reply other threads:[~2011-09-29 7:57 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-29 8:57 Rosen Kolev [this message]
2011-10-07 13:46 ` Sascha Hauer
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=1317286622-7477-1-git-send-email-rosen.kolev@amk-drives.bg \
--to=rosen.kolev@amk-drives.bg \
--cc=barebox@lists.infradead.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