public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: tom.rini at gmail.com <tom.rini@gmail.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 1/2] Revert "ARM: AM33XX: Add AM33XX I2C driver support"
Date: Mon, 20 Feb 2012 21:49:15 -0700	[thread overview]
Message-ID: <4f432250.433c440a.6702.ffffaf89@mx.google.com> (raw)

From: Tom Rini <trini@ti.com>

This reverts commit 498cbdfe62a8330f6c89765bdd15e60328a26511 as we need
to revert the i2c changes that add the support for the platform.

Cc: Heiko Schocher <hs@denx.de>
Cc: Patil, Rachna <rachna@ti.com>
Signed-off-by: Tom Rini <trini@ti.com>
---
 drivers/i2c/omap24xx_i2c.c |   20 +++++++-------------
 1 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/drivers/i2c/omap24xx_i2c.c b/drivers/i2c/omap24xx_i2c.c
index f06af02..80932ef 100644
--- a/drivers/i2c/omap24xx_i2c.c
+++ b/drivers/i2c/omap24xx_i2c.c
@@ -147,7 +147,7 @@ static void flush_fifo(void)
 		stat = readw(&i2c_base->stat);
 		if (stat == I2C_STAT_RRDY) {
 #if defined(CONFIG_OMAP243X) || defined(CONFIG_OMAP34XX) || \
-	defined(CONFIG_OMAP44XX) || defined(CONFIG_AM33XX)
+	defined(CONFIG_OMAP44XX)
 			readb(&i2c_base->data);
 #else
 			readw(&i2c_base->data);
@@ -247,8 +247,7 @@ int i2c_read(uchar chip, uint addr, int alen, uchar *buffer, int len)
 			switch (alen) {
 			case 2:
 				/* Send address MSByte */
-#if defined(CONFIG_OMAP243X) || defined(CONFIG_OMAP34XX) || \
-			defined(CONFIG_AM33XX)
+#if defined(CONFIG_OMAP243X) || defined(CONFIG_OMAP34XX)
 				writew(((addr >> 8) & 0xFF), &i2c_base->data);
 
 				/* Clearing XRDY event */
@@ -265,8 +264,7 @@ int i2c_read(uchar chip, uint addr, int alen, uchar *buffer, int len)
 				}
 #endif
 			case 1:
-#if defined(CONFIG_OMAP243X) || defined(CONFIG_OMAP34XX) || \
-			defined(CONFIG_AM33XX)
+#if defined(CONFIG_OMAP243X) || defined(CONFIG_OMAP34XX)
 				/* Send address LSByte */
 				writew((addr & 0xFF), &i2c_base->data);
 #else
@@ -315,8 +313,7 @@ int i2c_read(uchar chip, uint addr, int alen, uchar *buffer, int len)
 			}
 
 			if (status & I2C_STAT_RRDY) {
-#if defined(CONFIG_OMAP243X) || defined(CONFIG_OMAP34XX) || \
-			defined(CONFIG_AM33XX)
+#if defined(CONFIG_OMAP243X) || defined(CONFIG_OMAP34XX)
 				buffer[i] = readb(&i2c_base->data);
 #else
 				*((u16 *)&buffer[i]) =
@@ -403,8 +400,7 @@ int i2c_write(uchar chip, uint addr, int alen, uchar *buffer, int len)
 	if (!i2c_error) {
 		if (status & I2C_STAT_XRDY) {
 			switch (alen) {
-#if defined(CONFIG_OMAP243X) || defined(CONFIG_OMAP34XX) || \
-			defined(CONFIG_AM33XX)
+#if defined(CONFIG_OMAP243X) || defined(CONFIG_OMAP34XX)
 			case 2:
 				/* send out MSB byte */
 				writeb(((addr >> 8) & 0xFF), &i2c_base->data);
@@ -424,8 +420,7 @@ int i2c_write(uchar chip, uint addr, int alen, uchar *buffer, int len)
 					break;
 				}
 			case 1:
-#if defined(CONFIG_OMAP243X) || defined(CONFIG_OMAP34XX) || \
-			defined(CONFIG_AM33XX)
+#if defined(CONFIG_OMAP243X) || defined(CONFIG_OMAP34XX)
 				/* send out MSB byte */
 				writeb((addr  & 0xFF), &i2c_base->data);
 #else
@@ -447,8 +442,7 @@ int i2c_write(uchar chip, uint addr, int alen, uchar *buffer, int len)
 		if (!i2c_error) {
 			for (i = ((alen > 1) ? 0 : 1); i < len; i++) {
 				if (status & I2C_STAT_XRDY) {
-#if defined(CONFIG_OMAP243X) || defined(CONFIG_OMAP34XX) || \
-				defined(CONFIG_AM33XX)
+#if defined(CONFIG_OMAP243X) || defined(CONFIG_OMAP34XX)
 					writeb((buffer[i] & 0xFF),
 						&i2c_base->data);
 #else
-- 
1.7.0.4

             reply	other threads:[~2012-02-21  4:49 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-02-21  4:49 tom.rini at gmail.com [this message]
2012-02-21  6:33 ` [U-Boot] [PATCH 1/2] Revert "ARM: AM33XX: Add AM33XX I2C driver support" 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=4f432250.433c440a.6702.ffffaf89@mx.google.com \
    --to=tom.rini@gmail.com \
    --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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox