summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorSteve Sakoman <steve@sakoman.com>2010-07-19 20:31:55 -0700
committerSandeep Paulraj <s-paulraj@ti.com>2010-08-05 10:11:24 -0400
commitd708395d2f83295fba9d9b18823ce17046793590 (patch)
tree55341b83e3c4ed864af43932aa03d6df3308000c /arch/arm
parent674e0b217f794800048d80de09a71255b890a53e (diff)
ARMV7: Modify i2c driver for more reliable operation on OMAP4
This patch modifies the init routine to follow the TRM recommendations. It also modifies the i2c_read_byte function to reflect subtle differences between the i2c controller in OMAP3 and OMAP4. Signed-off-by: Steve Sakoman <steve@sakoman.com> Acked-by: Nishanth Menon <menon.nishanth@gmail.com> Acked-by: Heiko Schocher <hs@denx.de> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/include/asm/arch-omap3/i2c.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/include/asm/arch-omap3/i2c.h b/arch/arm/include/asm/arch-omap3/i2c.h
index 7a4a73aa91..d2e7488fd1 100644
--- a/arch/arm/include/asm/arch-omap3/i2c.h
+++ b/arch/arm/include/asm/arch-omap3/i2c.h
@@ -34,7 +34,9 @@ struct i2c {
unsigned short stat; /* 0x08 */
unsigned short res3;
unsigned short iv; /* 0x0C */
- unsigned short res4[3];
+ unsigned short res4;
+ unsigned short syss; /* 0x10 */
+ unsigned short res4a;
unsigned short buf; /* 0x14 */
unsigned short res5;
unsigned short cnt; /* 0x18 */