V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge branch 'master' of git://git.denx.de/u-boot-i2c

This commit is contained in:
Wolfgang Denk 2010-10-20 21:23:22 +02:00
parent d9d47d18e8 fbad355562
commit b76335178e
1 changed files with 117 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

209
drivers/i2c/omap24xx_i2c.c
View File

@ -27,7 +27,7 @@
#include "omap24xx_i2c.h" #include "omap24xx_i2c.h"
#define I2C_TIMEOUT 10 #define I2C_TIMEOUT 1000
static void wait_for_bb (void); static void wait_for_bb (void);
static u16 wait_for_pin (void); static u16 wait_for_pin (void);
@ -159,58 +159,56 @@ static int i2c_read_byte (u8 devaddr, u8 regoffset, u8 * value)
/* no stop bit needed here */ /* no stop bit needed here */
writew (I2C_CON_EN | I2C_CON_MST | I2C_CON_STT | I2C_CON_TRX, &i2c_base->con); writew (I2C_CON_EN | I2C_CON_MST | I2C_CON_STT | I2C_CON_TRX, &i2c_base->con);
status = wait_for_pin (); /* send register offset */
while (1) {
if (status & I2C_STAT_XRDY) { status = wait_for_pin();
/* Important: have to use byte access */ if (status == 0 || status & I2C_STAT_NACK) {
writeb (regoffset, &i2c_base->data);
udelay (20000);
if (readw (&i2c_base->stat) & I2C_STAT_NACK) {
i2c_error = 1; i2c_error = 1;
goto read_exit;
}
if (status & I2C_STAT_XRDY) {
/* Important: have to use byte access */
writeb(regoffset, &i2c_base->data);
writew(I2C_STAT_XRDY, &i2c_base->stat);
}
if (status & I2C_STAT_ARDY) {
writew(I2C_STAT_ARDY, &i2c_base->stat);
break;
} }
} else {
i2c_error = 1;
} }
if (!i2c_error) { /* set slave address */
writew (I2C_CON_EN, &i2c_base->con); writew(devaddr, &i2c_base->sa);
while (readw(&i2c_base->stat) & /* read one byte from slave */
(I2C_STAT_XRDY | I2C_STAT_ARDY)) { writew(1, &i2c_base->cnt);
udelay (10000); /* need stop bit here */
/* Have to clear pending interrupt to clear I2C_STAT */ writew(I2C_CON_EN | I2C_CON_MST |
writew (0xFFFF, &i2c_base->stat); I2C_CON_STT | I2C_CON_STP,
&i2c_base->con);
/* receive data */
while (1) {
status = wait_for_pin();
if (status == 0 || status & I2C_STAT_NACK) {
i2c_error = 1;
goto read_exit;
} }
/* set slave address */
writew (devaddr, &i2c_base->sa);
/* read one byte from slave */
writew (1, &i2c_base->cnt);
/* need stop bit here */
writew (I2C_CON_EN | I2C_CON_MST | I2C_CON_STT | I2C_CON_STP,
&i2c_base->con);
status = wait_for_pin ();
if (status & I2C_STAT_RRDY) { if (status & I2C_STAT_RRDY) {
#if defined(CONFIG_OMAP243X) || defined(CONFIG_OMAP34XX) || \ #if defined(CONFIG_OMAP243X) || defined(CONFIG_OMAP34XX) || \
defined(CONFIG_OMAP44XX) defined(CONFIG_OMAP44XX)
*value = readb (&i2c_base->data); *value = readb(&i2c_base->data);
#else #else
*value = readw (&i2c_base->data); *value = readw(&i2c_base->data);
#endif #endif
udelay (20000); writew(I2C_STAT_RRDY, &i2c_base->stat);
} else {
i2c_error = 1;
} }
if (status & I2C_STAT_ARDY) {
if (!i2c_error) { writew(I2C_STAT_ARDY, &i2c_base->stat);
writew (I2C_CON_EN, &i2c_base->con); break;
while (readw (&i2c_base->stat) &
(I2C_STAT_RRDY | I2C_STAT_ARDY)) {
udelay (10000);
writew (0xFFFF, &i2c_base->stat);
}
} }
} }
read_exit:
flush_fifo(); flush_fifo();
writew (0xFFFF, &i2c_base->stat); writew (0xFFFF, &i2c_base->stat);
writew (0, &i2c_base->cnt); writew (0, &i2c_base->cnt);
@ -220,7 +218,7 @@ static int i2c_read_byte (u8 devaddr, u8 regoffset, u8 * value)
static int i2c_write_byte (u8 devaddr, u8 regoffset, u8 value) static int i2c_write_byte (u8 devaddr, u8 regoffset, u8 value)
{ {
int i2c_error = 0; int i2c_error = 0;
u16 status, stat; u16 status;
/* wait until bus not busy */ /* wait until bus not busy */
wait_for_bb (); wait_for_bb ();
@ -233,49 +231,55 @@ static int i2c_write_byte (u8 devaddr, u8 regoffset, u8 value)
writew (I2C_CON_EN | I2C_CON_MST | I2C_CON_STT | I2C_CON_TRX | writew (I2C_CON_EN | I2C_CON_MST | I2C_CON_STT | I2C_CON_TRX |
I2C_CON_STP, &i2c_base->con); I2C_CON_STP, &i2c_base->con);
/* wait until state change */ while (1) {
status = wait_for_pin (); status = wait_for_pin();
if (status == 0 || status & I2C_STAT_NACK) {
if (status & I2C_STAT_XRDY) { i2c_error = 1;
goto write_exit;
}
if (status & I2C_STAT_XRDY) {
#if defined(CONFIG_OMAP243X) || defined(CONFIG_OMAP34XX) || \ #if defined(CONFIG_OMAP243X) || defined(CONFIG_OMAP34XX) || \
defined(CONFIG_OMAP44XX) defined(CONFIG_OMAP44XX)
/* send out 1 byte */ /* send register offset */
writeb (regoffset, &i2c_base->data); writeb(regoffset, &i2c_base->data);
writew (I2C_STAT_XRDY, &i2c_base->stat); writew(I2C_STAT_XRDY, &i2c_base->stat);
status = wait_for_pin (); while (1) {
if ((status & I2C_STAT_XRDY)) { status = wait_for_pin();
/* send out next 1 byte */ if (status == 0 || status & I2C_STAT_NACK) {
writeb (value, &i2c_base->data); i2c_error = 1;
writew (I2C_STAT_XRDY, &i2c_base->stat); goto write_exit;
} else { }
i2c_error = 1; if (status & I2C_STAT_XRDY) {
} /* send data */
writeb(value, &i2c_base->data);
writew(I2C_STAT_XRDY, &i2c_base->stat);
}
if (status & I2C_STAT_ARDY) {
writew(I2C_STAT_ARDY, &i2c_base->stat);
break;
}
}
break;
#else #else
/* send out two bytes */ /* send out two bytes */
writew ((value << 8) + regoffset, &i2c_base->data); writew((value << 8) + regoffset, &i2c_base->data);
writew(I2C_STAT_XRDY, &i2c_base->stat);
#endif #endif
/* must have enough delay to allow BB bit to go low */
udelay (50000);
if (readw (&i2c_base->stat) & I2C_STAT_NACK) {
i2c_error = 1;
} }
} else { if (status & I2C_STAT_ARDY) {
writew(I2C_STAT_ARDY, &i2c_base->stat);
break;
}
}
wait_for_bb();
status = readw(&i2c_base->stat);
if (status & I2C_STAT_NACK)
i2c_error = 1; i2c_error = 1;
}
if (!i2c_error) { write_exit:
int eout = 200;
writew (I2C_CON_EN, &i2c_base->con);
while ((stat = readw (&i2c_base->stat)) || (readw (&i2c_base->con) & I2C_CON_MST)) {
udelay (1000);
/* have to read to clear intrrupt */
writew (0xFFFF, &i2c_base->stat);
if(--eout == 0) /* better leave with error than hang */
break;
}
}
flush_fifo(); flush_fifo();
writew (0xFFFF, &i2c_base->stat); writew (0xFFFF, &i2c_base->stat);
writew (0, &i2c_base->cnt); writew (0, &i2c_base->cnt);
@ -306,6 +310,7 @@ static void flush_fifo(void)
int i2c_probe (uchar chip) int i2c_probe (uchar chip)
{ {
u16 status;
int res = 1; /* default = fail */ int res = 1; /* default = fail */
if (chip == readw (&i2c_base->oa)) { if (chip == readw (&i2c_base->oa)) {
@ -321,19 +326,37 @@ int i2c_probe (uchar chip)
writew (chip, &i2c_base->sa); writew (chip, &i2c_base->sa);
/* stop bit needed here */ /* stop bit needed here */
writew (I2C_CON_EN | I2C_CON_MST | I2C_CON_STT | I2C_CON_STP, &i2c_base->con); writew (I2C_CON_EN | I2C_CON_MST | I2C_CON_STT | I2C_CON_STP, &i2c_base->con);
/* enough delay for the NACK bit set */
udelay (50000);
if (!(readw (&i2c_base->stat) & I2C_STAT_NACK)) { while (1) {
res = 0; /* success case */ status = wait_for_pin();
flush_fifo(); if (status == 0) {
writew(0xFFFF, &i2c_base->stat); res = 1;
} else { goto probe_exit;
writew(0xFFFF, &i2c_base->stat); /* failue, clear sources*/ }
writew (readw (&i2c_base->con) | I2C_CON_STP, &i2c_base->con); /* finish up xfer */ if (status & I2C_STAT_NACK) {
udelay(20000); res = 1;
wait_for_bb (); writew(0xff, &i2c_base->stat);
writew (readw (&i2c_base->con) | I2C_CON_STP, &i2c_base->con);
wait_for_bb ();
break;
}
if (status & I2C_STAT_ARDY) {
writew(I2C_STAT_ARDY, &i2c_base->stat);
break;
}
if (status & I2C_STAT_RRDY) {
res = 0;
#if defined(CONFIG_OMAP243X) || defined(CONFIG_OMAP34XX) || \
defined(CONFIG_OMAP44XX)
readb(&i2c_base->data);
#else
readw(&i2c_base->data);
#endif
writew(I2C_STAT_RRDY, &i2c_base->stat);
}
} }
probe_exit:
flush_fifo(); flush_fifo();
writew (0, &i2c_base->cnt); /* don't allow any more data in...we don't want it.*/ writew (0, &i2c_base->cnt); /* don't allow any more data in...we don't want it.*/
writew(0xFFFF, &i2c_base->stat); writew(0xFFFF, &i2c_base->stat);
@ -392,13 +415,13 @@ int i2c_write (uchar chip, uint addr, int alen, uchar * buffer, int len)
static void wait_for_bb (void) static void wait_for_bb (void)
{ {
int timeout = 10; int timeout = I2C_TIMEOUT;
u16 stat; u16 stat;
writew(0xFFFF, &i2c_base->stat); /* clear current interruts...*/ writew(0xFFFF, &i2c_base->stat); /* clear current interruts...*/
while ((stat = readw (&i2c_base->stat) & I2C_STAT_BB) && timeout--) { while ((stat = readw (&i2c_base->stat) & I2C_STAT_BB) && timeout--) {
writew (stat, &i2c_base->stat); writew (stat, &i2c_base->stat);
udelay (50000); udelay(1000);
} }
if (timeout <= 0) { if (timeout <= 0) {
@ -411,7 +434,7 @@ static void wait_for_bb (void)
static u16 wait_for_pin (void) static u16 wait_for_pin (void)
{ {
u16 status; u16 status;
int timeout = 10; int timeout = I2C_TIMEOUT;
do { do {
udelay (1000); udelay (1000);
@ -424,8 +447,10 @@ static u16 wait_for_pin (void)
if (timeout <= 0) { if (timeout <= 0) {
printf ("timed out in wait_for_pin: I2C_STAT=%x\n", printf ("timed out in wait_for_pin: I2C_STAT=%x\n",
readw (&i2c_base->stat)); readw (&i2c_base->stat));
writew(0xFFFF, &i2c_base->stat); writew(0xFFFF, &i2c_base->stat);
} status = 0;
}
return status; return status;
} }