From: Fabien Marteau <fabien.marteau@armadeus.com>
To: "Jean Delvare (PC drivers, core)" <khali@linux-fr.org>,
"Ben Dooks (embedded platforms)" <ben-linux@fluff.org>,
"\"Uwe Kleine-König\"" <u.kleine-koenig@pengutronix>
Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH] i2c: Adding mangling capability to i2c imx bus controller.
Date: Mon, 31 Jan 2011 16:29:53 +0100 [thread overview]
Message-ID: <4D46D571.5010907@armadeus.com> (raw)
Adding Mangling capability to i2c imx bus controller.
Signed-off-by: Fabien Marteau <fabien.marteau@armadeus.com>
---
Index: linux-2.6.36/drivers/i2c/busses/i2c-imx.c
===================================================================
--- linux-2.6.36.orig/drivers/i2c/busses/i2c-imx.c 2010-10-20 22:30:22.000000000 +0200
+++ linux-2.6.36/drivers/i2c/busses/i2c-imx.c 2011-01-31 16:23:34.000000000 +0100
@@ -300,17 +300,28 @@
{
int i, result;
- dev_dbg(&i2c_imx->adapter.dev, "<%s> write slave address: addr=0x%x\n",
- __func__, msgs->addr << 1);
+ if ((msgs->flags & I2C_M_NOSTART) == 0) {
+ /* write slave address */
+ if (msgs->flags & I2C_M_REV_DIR_ADDR) {
+ dev_dbg(&i2c_imx->adapter.dev,
+ "<%s> write slave address: addr=0x%x\n",
+ __func__, msgs->addr << 1 | 0x01);
+ writeb((msgs->addr << 1) | 0x01,
+ i2c_imx->base + IMX_I2C_I2DR);
+ } else {
+ dev_dbg(&i2c_imx->adapter.dev,
+ "<%s> write slave address: addr=0x%x\n",
+ __func__, msgs->addr << 1);
+ writeb((msgs->addr << 1), i2c_imx->base + IMX_I2C_I2DR);
+ }
+ result = i2c_imx_trx_complete(i2c_imx);
+ if (result)
+ return result;
+ result = i2c_imx_acked(i2c_imx);
+ if (result != 0)
+ return result;
+ }
- /* write slave address */
- writeb(msgs->addr << 1, i2c_imx->base + IMX_I2C_I2DR);
- result = i2c_imx_trx_complete(i2c_imx);
- if (result)
- return result;
- result = i2c_imx_acked(i2c_imx);
- if (result)
- return result;
dev_dbg(&i2c_imx->adapter.dev, "<%s> write data\n", __func__);
/* write data */
@@ -323,7 +334,7 @@
if (result)
return result;
result = i2c_imx_acked(i2c_imx);
- if (result)
+ if ((result != 0) && ((msgs[0].flags & I2C_M_IGNORE_NAK) == 0))
return result;
}
return 0;
@@ -334,18 +345,27 @@
int i, result;
unsigned int temp;
- dev_dbg(&i2c_imx->adapter.dev,
- "<%s> write slave address: addr=0x%x\n",
- __func__, (msgs->addr << 1) | 0x01);
-
- /* write slave address */
- writeb((msgs->addr << 1) | 0x01, i2c_imx->base + IMX_I2C_I2DR);
- result = i2c_imx_trx_complete(i2c_imx);
- if (result)
- return result;
- result = i2c_imx_acked(i2c_imx);
- if (result)
- return result;
+ if ((msgs->flags & I2C_M_NOSTART) == 0) {
+ /* write slave address */
+ if (msgs->flags & I2C_M_REV_DIR_ADDR) {
+ dev_dbg(&i2c_imx->adapter.dev,
+ "<%s> write slave address: addr=0x%x\n",
+ __func__, (msgs->addr << 1));
+ writeb((msgs->addr << 1), i2c_imx->base + IMX_I2C_I2DR);
+ } else {
+ dev_dbg(&i2c_imx->adapter.dev,
+ "<%s> write slave address: addr=0x%x\n",
+ __func__, (msgs->addr << 1) | 0x01);
+ writeb((msgs->addr << 1) | 0x01,
+ i2c_imx->base + IMX_I2C_I2DR);
+ }
+ result = i2c_imx_trx_complete(i2c_imx);
+ if (result)
+ return result;
+ result = i2c_imx_acked(i2c_imx);
+ if (result != 0)
+ return result;
+ }
dev_dbg(&i2c_imx->adapter.dev, "<%s> setup bus\n", __func__);
@@ -405,7 +425,7 @@
/* read/write data */
for (i = 0; i < num; i++) {
- if (i) {
+ if (i && ((msgs[i].flags & I2C_M_NOSTART) == 0)) {
dev_dbg(&i2c_imx->adapter.dev,
"<%s> repeated start\n", __func__);
temp = readb(i2c_imx->base + IMX_I2C_I2CR);
@@ -454,7 +474,7 @@
static u32 i2c_imx_func(struct i2c_adapter *adapter)
{
- return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL;
+ return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL | I2C_FUNC_PROTOCOL_MANGLING;
}
static struct i2c_algorithm i2c_imx_algo = {
WARNING: multiple messages have this Message-ID (diff)
From: Fabien Marteau <fabien.marteau@armadeus.com>
To: "Jean Delvare (PC drivers, core)" <khali@linux-fr.org>,
"Ben Dooks (embedded platforms)" <ben-linux@fluff.org>,
"\"Uwe Kleine-König\"" <u.kleine-koenig@pengutronix.de>,
"Arnaud Patard" <apatard@mandriva.com>,
"Tejun Heo" <tj@kernel.org>
Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH] i2c: Adding mangling capability to i2c imx bus controller.
Date: Mon, 31 Jan 2011 16:29:53 +0100 [thread overview]
Message-ID: <4D46D571.5010907@armadeus.com> (raw)
Adding Mangling capability to i2c imx bus controller.
Signed-off-by: Fabien Marteau <fabien.marteau@armadeus.com>
---
Index: linux-2.6.36/drivers/i2c/busses/i2c-imx.c
===================================================================
--- linux-2.6.36.orig/drivers/i2c/busses/i2c-imx.c 2010-10-20 22:30:22.000000000 +0200
+++ linux-2.6.36/drivers/i2c/busses/i2c-imx.c 2011-01-31 16:23:34.000000000 +0100
@@ -300,17 +300,28 @@
{
int i, result;
- dev_dbg(&i2c_imx->adapter.dev, "<%s> write slave address: addr=0x%x\n",
- __func__, msgs->addr << 1);
+ if ((msgs->flags & I2C_M_NOSTART) == 0) {
+ /* write slave address */
+ if (msgs->flags & I2C_M_REV_DIR_ADDR) {
+ dev_dbg(&i2c_imx->adapter.dev,
+ "<%s> write slave address: addr=0x%x\n",
+ __func__, msgs->addr << 1 | 0x01);
+ writeb((msgs->addr << 1) | 0x01,
+ i2c_imx->base + IMX_I2C_I2DR);
+ } else {
+ dev_dbg(&i2c_imx->adapter.dev,
+ "<%s> write slave address: addr=0x%x\n",
+ __func__, msgs->addr << 1);
+ writeb((msgs->addr << 1), i2c_imx->base + IMX_I2C_I2DR);
+ }
+ result = i2c_imx_trx_complete(i2c_imx);
+ if (result)
+ return result;
+ result = i2c_imx_acked(i2c_imx);
+ if (result != 0)
+ return result;
+ }
- /* write slave address */
- writeb(msgs->addr << 1, i2c_imx->base + IMX_I2C_I2DR);
- result = i2c_imx_trx_complete(i2c_imx);
- if (result)
- return result;
- result = i2c_imx_acked(i2c_imx);
- if (result)
- return result;
dev_dbg(&i2c_imx->adapter.dev, "<%s> write data\n", __func__);
/* write data */
@@ -323,7 +334,7 @@
if (result)
return result;
result = i2c_imx_acked(i2c_imx);
- if (result)
+ if ((result != 0) && ((msgs[0].flags & I2C_M_IGNORE_NAK) == 0))
return result;
}
return 0;
@@ -334,18 +345,27 @@
int i, result;
unsigned int temp;
- dev_dbg(&i2c_imx->adapter.dev,
- "<%s> write slave address: addr=0x%x\n",
- __func__, (msgs->addr << 1) | 0x01);
-
- /* write slave address */
- writeb((msgs->addr << 1) | 0x01, i2c_imx->base + IMX_I2C_I2DR);
- result = i2c_imx_trx_complete(i2c_imx);
- if (result)
- return result;
- result = i2c_imx_acked(i2c_imx);
- if (result)
- return result;
+ if ((msgs->flags & I2C_M_NOSTART) == 0) {
+ /* write slave address */
+ if (msgs->flags & I2C_M_REV_DIR_ADDR) {
+ dev_dbg(&i2c_imx->adapter.dev,
+ "<%s> write slave address: addr=0x%x\n",
+ __func__, (msgs->addr << 1));
+ writeb((msgs->addr << 1), i2c_imx->base + IMX_I2C_I2DR);
+ } else {
+ dev_dbg(&i2c_imx->adapter.dev,
+ "<%s> write slave address: addr=0x%x\n",
+ __func__, (msgs->addr << 1) | 0x01);
+ writeb((msgs->addr << 1) | 0x01,
+ i2c_imx->base + IMX_I2C_I2DR);
+ }
+ result = i2c_imx_trx_complete(i2c_imx);
+ if (result)
+ return result;
+ result = i2c_imx_acked(i2c_imx);
+ if (result != 0)
+ return result;
+ }
dev_dbg(&i2c_imx->adapter.dev, "<%s> setup bus\n", __func__);
@@ -405,7 +425,7 @@
/* read/write data */
for (i = 0; i < num; i++) {
- if (i) {
+ if (i && ((msgs[i].flags & I2C_M_NOSTART) == 0)) {
dev_dbg(&i2c_imx->adapter.dev,
"<%s> repeated start\n", __func__);
temp = readb(i2c_imx->base + IMX_I2C_I2CR);
@@ -454,7 +474,7 @@
static u32 i2c_imx_func(struct i2c_adapter *adapter)
{
- return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL;
+ return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL | I2C_FUNC_PROTOCOL_MANGLING;
}
static struct i2c_algorithm i2c_imx_algo = {
next reply other threads:[~2011-01-31 15:29 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-31 15:29 Fabien Marteau [this message]
2011-01-31 15:29 ` [PATCH] i2c: Adding mangling capability to i2c imx bus controller Fabien Marteau
2011-03-02 13:28 ` Wolfram Sang
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=4D46D571.5010907@armadeus.com \
--to=fabien.marteau@armadeus.com \
--cc=ben-linux@fluff.org \
--cc=khali@linux-fr.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=u.kleine-koenig@pengutronix \
/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.