linux-omap.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Tony Lindgren <tony@atomide.com>
To: i2c@lm-sensors.org
Cc: linux-omap@vger.kernel.org, Chandra shekhar <x0044955@ti.com>,
	Tony Lindgren <tony@atomide.com>
Subject: [PATCH 5/8] i2c-omap: Add support on 34xx
Date: Thu, 25 Sep 2008 10:53:51 +0300	[thread overview]
Message-ID: <1222329234-31473-6-git-send-email-tony@atomide.com> (raw)
In-Reply-To: <1222329234-31473-5-git-send-email-tony@atomide.com>

From: Chandra shekhar <x0044955@ti.com>

Signed-off-by: chandra shekhar <x0044955@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
 drivers/i2c/busses/i2c-omap.c |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index ded4636..b41431a 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -156,7 +156,7 @@ static inline u16 omap_i2c_read_reg(struct omap_i2c_dev *i2c_dev, int reg)
 
 static int omap_i2c_get_clocks(struct omap_i2c_dev *dev)
 {
-	if (cpu_is_omap16xx() || cpu_is_omap24xx()) {
+	if (cpu_is_omap16xx() || cpu_class_is_omap2()) {
 		dev->iclk = clk_get(dev->dev, "i2c_ick");
 		if (IS_ERR(dev->iclk)) {
 			dev->iclk = NULL;
@@ -279,7 +279,7 @@ static int omap_i2c_init(struct omap_i2c_dev *dev)
 			psc = fclk_rate / 12000000;
 	}
 
-	if (cpu_is_omap2430()) {
+	if (cpu_is_omap2430() || cpu_is_omap34xx()) {
 
 		/* HSI2C controller internal clk rate should be 19.2 Mhz */
 		internal_clk = 19200;
@@ -616,7 +616,8 @@ omap_i2c_isr(int this_irq, void *dev_id)
 					*dev->buf++ = w;
 					dev->buf_len--;
 					/* Data reg from 2430 is 8 bit wide */
-					if (!cpu_is_omap2430()) {
+					if (!cpu_is_omap2430() &&
+							!cpu_is_omap34xx()) {
 						if (dev->buf_len) {
 							*dev->buf++ = w >> 8;
 							dev->buf_len--;
@@ -654,7 +655,8 @@ omap_i2c_isr(int this_irq, void *dev_id)
 					w = *dev->buf++;
 					dev->buf_len--;
 					/* Data reg from  2430 is 8 bit wide */
-					if (!cpu_is_omap2430()) {
+					if (!cpu_is_omap2430() &&
+							!cpu_is_omap34xx()) {
 						if (dev->buf_len) {
 							w |= *dev->buf++ << 8;
 							dev->buf_len--;
@@ -748,7 +750,7 @@ omap_i2c_probe(struct platform_device *pdev)
 	if (cpu_is_omap15xx())
 		dev->rev1 = omap_i2c_read_reg(dev, OMAP_I2C_REV_REG) < 0x20;
 
-	if (cpu_is_omap2430()) {
+	if (cpu_is_omap2430() || cpu_is_omap34xx()) {
 		u16 s;
 
 		/* Set up the fifo size - Get total size */
-- 
1.5.6.rc3.21.g8c6b5


  reply	other threads:[~2008-09-25  7:54 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-09-25  7:53 [PATCH 0/8] Updates for i2c-omap from linux-omap tree for review, v2 Tony Lindgren
2008-09-25  7:53 ` [PATCH 1/8] i2c-omap: Do not use interruptible wait call in omap_i2c_xfer_msg Tony Lindgren
2008-09-25  7:53   ` [PATCH 2/8] i2c-omap: Close suspected race between omap_i2c_idle() and omap_i2c_isr() Tony Lindgren
2008-09-25  7:53     ` [PATCH 3/8] i2c-omap: Add high-speed support to omap-i2c Tony Lindgren
2008-09-25  7:53       ` [PATCH 4/8] i2c-omap: FIFO handling support and broken hw workaround for i2c-omap Tony Lindgren
2008-09-25  7:53         ` Tony Lindgren [this message]
2008-09-25  7:53           ` [PATCH 6/8] i2c-omap: Mark init-only functions as __init Tony Lindgren
2008-09-25  7:53             ` [PATCH 7/8] i2c-omap: Don't compile in OMAP15xx I2C ISR for non-OMAP15xx builds Tony Lindgren
2008-09-25  7:53               ` [PATCH 8/8] i2c-omap: Clean-up i2c-omap Tony Lindgren
2008-09-25 11:40                 ` [PATCH 8/8] i2c-omap: Clean-up i2c-omap, v3 Tony Lindgren
2008-09-29 22:31                 ` [i2c] [PATCH 8/8] i2c-omap: Clean-up i2c-omap Ben Dooks
2008-10-17 15:41                   ` Tony Lindgren
2008-09-29 22:29               ` [i2c] [PATCH 7/8] i2c-omap: Don't compile in OMAP15xx I2C ISR for non-OMAP15xx builds Ben Dooks
2008-09-29 23:06                 ` David Brownell
2008-09-30  5:35                   ` Paul Walmsley
2008-09-30  5:36                     ` Paul Walmsley
2008-10-17 15:40                       ` Tony Lindgren
2008-09-29 22:30             ` [i2c] [PATCH 6/8] i2c-omap: Mark init-only functions as __init Ben Dooks
2008-10-17 15:39               ` Tony Lindgren
2008-10-17 17:07                 ` Tony Lindgren
2008-09-29 22:28           ` [i2c] [PATCH 5/8] i2c-omap: Add support on 34xx Ben Dooks
2008-10-17 15:38             ` Tony Lindgren
2008-09-25 11:39         ` [PATCH 4/8] i2c-omap: FIFO handling support and broken hw workaround for i2c-omap, v3 Tony Lindgren
2008-09-29 22:27         ` [i2c] [PATCH 4/8] i2c-omap: FIFO handling support and broken hw workaround for i2c-omap Ben Dooks
2008-09-29 22:25       ` [i2c] [PATCH 3/8] i2c-omap: Add high-speed support to omap-i2c Ben Dooks
2008-10-17 15:37         ` Tony Lindgren
2008-09-29 22:21     ` [i2c] [PATCH 2/8] i2c-omap: Close suspected race between omap_i2c_idle() and omap_i2c_isr() Ben Dooks
2008-09-29 22:21   ` [i2c] [PATCH 1/8] i2c-omap: Do not use interruptible wait call in omap_i2c_xfer_msg Ben Dooks
2008-09-30 11:51     ` Jarkko Nikula
2008-10-17 15:35       ` Tony Lindgren
2008-09-29 22:23 ` [i2c] [PATCH 0/8] Updates for i2c-omap from linux-omap tree for review, v2 Ben Dooks
2008-09-30  5:35   ` Tony Lindgren
2008-10-17 16:04     ` git-pull request for i2c-omap changes (Re: [i2c] [PATCH 0/8] Updates for i2c-omap from linux-omap tree for review, v2) Tony Lindgren
  -- strict thread matches above, loose matches on Subject: below --
2008-09-25  7:16 [PATCH 0/8] Updates for i2c-omap from linux-omap tree for review Tony Lindgren
2008-09-25  7:16 ` [PATCH 1/8] i2c-omap: Do not use interruptible wait call in omap_i2c_xfer_msg Tony Lindgren
2008-09-25  7:16   ` [PATCH 2/8] i2c-omap: Close suspected race between omap_i2c_idle() and omap_i2c_isr() Tony Lindgren
2008-09-25  7:16     ` [PATCH 3/8] i2c-omap: Add high-speed support to omap-i2c Tony Lindgren
2008-09-25  7:16       ` [PATCH 4/8] i2c-omap: FIFO handling support and broken hw workaround for i2c-omap Tony Lindgren
2008-09-25  7:16         ` [PATCH 5/8] i2c-omap: Add support on 34xx Tony Lindgren

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=1222329234-31473-6-git-send-email-tony@atomide.com \
    --to=tony@atomide.com \
    --cc=i2c@lm-sensors.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=x0044955@ti.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).