From: Tomoya MORINAGA <tomoya-linux@dsn.okisemi.com>
To: Jean Delvare <khali@linux-fr.org>,
Ben Dooks <ben-linux@fluff.org>,
linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Qi Wang <qi.wang@intel.com>,
yong.y.wang@intel.com, joel.clark@intel.com,
kok.howg.ewe@intel.com, toshiharu-linux@dsn.okisemi.com,
Tomoya MORINAGA <tomoya-linux@dsn.okisemi.com>
Subject: [PATCH 3/7] i2c-eg20t: delete 10bit access processing
Date: Wed, 21 Sep 2011 16:51:45 +0900 [thread overview]
Message-ID: <1316591509-4433-3-git-send-email-tomoya-linux@dsn.okisemi.com> (raw)
In-Reply-To: <1316591509-4433-1-git-send-email-tomoya-linux@dsn.okisemi.com>
Linux I2C core doesn't support 10bit access formally.
Additionally, we can't test with 10bit mode.
This patch deletes the 10bit access processing.
Signed-off-by: Tomoya MORINAGA <tomoya-linux@dsn.okisemi.com>
---
drivers/i2c/busses/i2c-eg20t.c | 27 +++++++--------------------
1 files changed, 7 insertions(+), 20 deletions(-)
diff --git a/drivers/i2c/busses/i2c-eg20t.c b/drivers/i2c/busses/i2c-eg20t.c
index 21ade63..a87a878 100644
--- a/drivers/i2c/busses/i2c-eg20t.c
+++ b/drivers/i2c/busses/i2c-eg20t.c
@@ -389,8 +389,6 @@ static s32 pch_i2c_writebytes(struct i2c_adapter *i2c_adap,
u8 *buf;
u32 length;
u32 addr;
- u32 addr_2_msb;
- u32 addr_8_lsb;
s32 wrcount;
void __iomem *p = adap->pch_base_address;
@@ -410,25 +408,16 @@ static s32 pch_i2c_writebytes(struct i2c_adapter *i2c_adap,
}
if (msgs->flags & I2C_M_TEN) {
- addr_2_msb = ((addr & I2C_MSB_2B_MSK) >> 7);
- iowrite32(addr_2_msb | TEN_BIT_ADDR_MASK, p + PCH_I2CDR);
- if (first)
- pch_i2c_start(adap);
- if (pch_i2c_wait_for_xfer_complete(adap) == 0 &&
- pch_i2c_getack(adap) == 0) {
- addr_8_lsb = (addr & I2C_ADDR_MSK);
- iowrite32(addr_8_lsb, p + PCH_I2CDR);
- } else {
- pch_i2c_stop(adap);
- return -ETIME;
- }
+ pch_err(adap, "10Bit access is not supported\n");
+ return -EINVAL;
} else {
/* set 7 bit slave address and R/W bit as 0 */
iowrite32(addr << 1, p + PCH_I2CDR);
- if (first)
- pch_i2c_start(adap);
}
+ if (first)
+ pch_i2c_start(adap);
+
if ((pch_i2c_wait_for_xfer_complete(adap) == 0) &&
(pch_i2c_getack(adap) == 0)) {
for (wrcount = 0; wrcount < length; ++wrcount) {
@@ -497,7 +486,6 @@ static s32 pch_i2c_readbytes(struct i2c_adapter *i2c_adap, struct i2c_msg *msgs,
u32 count;
u32 length;
u32 addr;
- u32 addr_2_msb;
void __iomem *p = adap->pch_base_address;
length = msgs->len;
@@ -513,9 +501,8 @@ static s32 pch_i2c_readbytes(struct i2c_adapter *i2c_adap, struct i2c_msg *msgs,
}
if (msgs->flags & I2C_M_TEN) {
- addr_2_msb = (((addr & I2C_MSB_2B_MSK) >> 7) | (I2C_RD));
- iowrite32(addr_2_msb | TEN_BIT_ADDR_MASK, p + PCH_I2CDR);
-
+ pch_err(adap, "10Bit access is not supported\n");
+ return -EINVAL;
} else {
/* 7 address bits + R/W bit */
addr = (((addr) << 1) | (I2C_RD));
--
1.7.4.4
next prev parent reply other threads:[~2011-09-21 7:51 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-21 7:51 [PATCH 1/7] i2c-eg20t: Fix bus-idle waiting issue Tomoya MORINAGA
2011-09-21 7:51 ` [PATCH 2/7] i2c-eg20t: Modify returned value s32 to long Tomoya MORINAGA
2011-09-21 7:51 ` Tomoya MORINAGA [this message]
[not found] ` <1316591509-4433-3-git-send-email-tomoya-linux-ECg8zkTtlr0C6LszWs/t0g@public.gmane.org>
2011-09-21 15:42 ` [PATCH 3/7] i2c-eg20t: delete 10bit access processing Jeffrey (Sheng-Hui) Chu
[not found] ` <B6A520E9CD57404AAFC0831E4FB39541A98073AC7E-4wnuKdaqIVJdD26/7+am4baTQr+y5IJFqs7JOtOhHmkAvxtiuMwx3w@public.gmane.org>
2011-09-22 0:13 ` Tomoya MORINAGA
[not found] ` <4E7A7DBA.3020406-ECg8zkTtlr0C6LszWs/t0g@public.gmane.org>
2011-09-22 17:49 ` Jeffrey (Sheng-Hui) Chu
[not found] ` <B6A520E9CD57404AAFC0831E4FB39541A98073AF26-4wnuKdaqIVJdD26/7+am4baTQr+y5IJFqs7JOtOhHmkAvxtiuMwx3w@public.gmane.org>
2011-09-27 0:05 ` Tomoya MORINAGA
[not found] ` <4E811338.2030005-ECg8zkTtlr0C6LszWs/t0g@public.gmane.org>
2011-09-27 13:06 ` Jeffrey (Sheng-Hui) Chu
2011-10-04 20:55 ` Ben Dooks
[not found] ` <20111004205536.GA13323-RazCHl0VsYgkUSuvROHNpA@public.gmane.org>
2011-10-05 1:59 ` Tomoya MORINAGA
2011-09-21 7:51 ` [PATCH 4/7] i2c-eg20t: Separate error processing Tomoya MORINAGA
2011-09-21 7:51 ` [PATCH 5/7] i2c-eg20t: add stop sequence in case wait-event timeout occurs Tomoya MORINAGA
2011-09-21 7:51 ` [PATCH 6/7] i2c-eg20t: Fix flag setting issue Tomoya MORINAGA
[not found] ` <1316591509-4433-1-git-send-email-tomoya-linux-ECg8zkTtlr0C6LszWs/t0g@public.gmane.org>
2011-09-21 7:51 ` [PATCH 7/7] i2c-eg20t: Add initialize processing in case i2c-error occurs Tomoya MORINAGA
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=1316591509-4433-3-git-send-email-tomoya-linux@dsn.okisemi.com \
--to=tomoya-linux@dsn.okisemi.com \
--cc=ben-linux@fluff.org \
--cc=joel.clark@intel.com \
--cc=khali@linux-fr.org \
--cc=kok.howg.ewe@intel.com \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=qi.wang@intel.com \
--cc=toshiharu-linux@dsn.okisemi.com \
--cc=yong.y.wang@intel.com \
/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;
as well as URLs for NNTP newsgroup(s).