Skip to contentSkip to conversation

Revert "ARM: AM33XX: Add AM33XX I2C driver support"

PATCH New tom.rini at gmail.com 2 participants 2 messages Feb 21, 2012 I2C

lore
Share & tools
lore

tom.rini at gmail.com

author
#0 lore raw

PATCH 1/2 Revert "ARM: AM33XX: Add AM33XX I2C driver support"

From: Tom Rini <[email protected]>

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

Cc Heiko Schocher <[email protected]>
Cc Patil, Rachna <[email protected]>
Signed-off-by Tom Rini <[email protected]>
---
 drivers/i2c/omap24xx_i2c.c |   20 +++++++-------------
 1 files changed, 7 insertions(+), 13 deletions(-)
drivers/i2c/omap24xx_i2c.c +7 -13
index f06af02..80932ef 100644
@@ -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
Signature · 1 line
1.7.0.4
#1 lore raw

PATCH 1/2 Revert "ARM: AM33XX: Add AM33XX I2C driver support"

Hello Tom,

Quoted 11 lines · tom.rini at gmail.com

From: Tom Rini <[email protected]>

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

Cc Heiko Schocher <[email protected]>
Cc Patil, Rachna <[email protected]>
Signed-off-by Tom Rini <[email protected]>
---
 drivers/i2c/omap24xx_i2c.c |   20 +++++++-------------
 1 files changed, 7 insertions(+), 13 deletions(-)

Applied to u-boot-i2c.git

Thanks!

bye,
Heiko

Signature · 2 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany