Commit 89677b27 authored by Michael Jones's avatar Michael Jones Committed by Albert ARIBAUD
Browse files

ARMV7: OMAP: I2C driver: cosmetic: make checkpatch-compatible


Signed-off-by: default avatarMichael Jones <michael.jones@matrix-vision.de>
Acked-by: default avatarHeiko Schocher <hs@denx.de>
Signed-off-by: default avatarSandeep Paulraj <s-paulraj@ti.com>
parent 0607e2b9
...@@ -31,8 +31,8 @@ DECLARE_GLOBAL_DATA_PTR; ...@@ -31,8 +31,8 @@ DECLARE_GLOBAL_DATA_PTR;
#define I2C_TIMEOUT 1000 #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);
static void flush_fifo(void); static void flush_fifo(void);
static struct i2c *i2c_base = (struct i2c *)I2C_DEFAULT_BASE; static struct i2c *i2c_base = (struct i2c *)I2C_DEFAULT_BASE;
...@@ -40,7 +40,7 @@ static struct i2c *i2c_base = (struct i2c *)I2C_DEFAULT_BASE; ...@@ -40,7 +40,7 @@ static struct i2c *i2c_base = (struct i2c *)I2C_DEFAULT_BASE;
static unsigned int bus_initialized[I2C_BUS_MAX]; static unsigned int bus_initialized[I2C_BUS_MAX];
static unsigned int current_bus; static unsigned int current_bus;
void i2c_init (int speed, int slaveadd) void i2c_init(int speed, int slaveadd)
{ {
int psc, fsscll, fssclh; int psc, fsscll, fssclh;
int hsscll = 0, hssclh = 0; int hsscll = 0, hssclh = 0;
...@@ -107,9 +107,9 @@ void i2c_init (int speed, int slaveadd) ...@@ -107,9 +107,9 @@ void i2c_init (int speed, int slaveadd)
sclh = (unsigned int)fssclh; sclh = (unsigned int)fssclh;
} }
if (readw (&i2c_base->con) & I2C_CON_EN) { if (readw(&i2c_base->con) & I2C_CON_EN) {
writew (0, &i2c_base->con); writew(0, &i2c_base->con);
udelay (50000); udelay(50000);
} }
writew(0x2, &i2c_base->sysc); /* for ES2 after soft reset */ writew(0x2, &i2c_base->sysc); /* for ES2 after soft reset */
...@@ -130,35 +130,36 @@ void i2c_init (int speed, int slaveadd) ...@@ -130,35 +130,36 @@ void i2c_init (int speed, int slaveadd)
writew(sclh, &i2c_base->sclh); writew(sclh, &i2c_base->sclh);
/* own address */ /* own address */
writew (slaveadd, &i2c_base->oa); writew(slaveadd, &i2c_base->oa);
writew (I2C_CON_EN, &i2c_base->con); writew(I2C_CON_EN, &i2c_base->con);
/* have to enable intrrupts or OMAP i2c module doesn't work */ /* have to enable intrrupts or OMAP i2c module doesn't work */
writew (I2C_IE_XRDY_IE | I2C_IE_RRDY_IE | I2C_IE_ARDY_IE | writew(I2C_IE_XRDY_IE | I2C_IE_RRDY_IE | I2C_IE_ARDY_IE |
I2C_IE_NACK_IE | I2C_IE_AL_IE, &i2c_base->ie); I2C_IE_NACK_IE | I2C_IE_AL_IE, &i2c_base->ie);
udelay (1000); udelay(1000);
flush_fifo(); flush_fifo();
writew (0xFFFF, &i2c_base->stat); writew(0xFFFF, &i2c_base->stat);
writew (0, &i2c_base->cnt); writew(0, &i2c_base->cnt);
if (gd->flags & GD_FLG_RELOC) if (gd->flags & GD_FLG_RELOC)
bus_initialized[current_bus] = 1; bus_initialized[current_bus] = 1;
} }
static int i2c_read_byte (u8 devaddr, u8 regoffset, u8 * value) static int i2c_read_byte(u8 devaddr, u8 regoffset, u8 *value)
{ {
int i2c_error = 0; int i2c_error = 0;
u16 status; u16 status;
/* wait until bus not busy */ /* wait until bus not busy */
wait_for_bb (); wait_for_bb();
/* one byte only */ /* one byte only */
writew (1, &i2c_base->cnt); writew(1, &i2c_base->cnt);
/* set slave address */ /* set slave address */
writew (devaddr, &i2c_base->sa); writew(devaddr, &i2c_base->sa);
/* 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);
/* send register offset */ /* send register offset */
while (1) { while (1) {
...@@ -196,7 +197,7 @@ static int i2c_read_byte (u8 devaddr, u8 regoffset, u8 * value) ...@@ -196,7 +197,7 @@ static int i2c_read_byte (u8 devaddr, u8 regoffset, u8 * value)
} }
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);
...@@ -211,8 +212,8 @@ static int i2c_read_byte (u8 devaddr, u8 regoffset, u8 * value) ...@@ -211,8 +212,8 @@ static int i2c_read_byte (u8 devaddr, u8 regoffset, u8 * value)
read_exit: 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);
return i2c_error; return i2c_error;
} }
...@@ -222,38 +223,37 @@ static void flush_fifo(void) ...@@ -222,38 +223,37 @@ static void flush_fifo(void)
/* note: if you try and read data when its not there or ready /* note: if you try and read data when its not there or ready
* you get a bus error * you get a bus error
*/ */
while(1){ while (1) {
stat = readw(&i2c_base->stat); stat = readw(&i2c_base->stat);
if(stat == I2C_STAT_RRDY){ if (stat == I2C_STAT_RRDY) {
#if defined(CONFIG_OMAP243X) || defined(CONFIG_OMAP34XX) || \ #if defined(CONFIG_OMAP243X) || defined(CONFIG_OMAP34XX) || \
defined(CONFIG_OMAP44XX) defined(CONFIG_OMAP44XX)
readb(&i2c_base->data); readb(&i2c_base->data);
#else #else
readw(&i2c_base->data); readw(&i2c_base->data);
#endif #endif
writew(I2C_STAT_RRDY,&i2c_base->stat); writew(I2C_STAT_RRDY, &i2c_base->stat);
udelay(1000); udelay(1000);
}else } else
break; break;
} }
} }
int i2c_probe (uchar chip) int i2c_probe(uchar chip)
{ {
u16 status; u16 status;
int res = 1; /* default = fail */ int res = 1; /* default = fail */
if (chip == readw (&i2c_base->oa)) { if (chip == readw(&i2c_base->oa))
return res; return res;
}
/* wait until bus not busy */ /* wait until bus not busy */
wait_for_bb (); wait_for_bb();
/* try to write one byte */ /* try to write one byte */
writew (1, &i2c_base->cnt); writew(1, &i2c_base->cnt);
/* set slave address */ /* set slave address */
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_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);
...@@ -268,29 +268,30 @@ int i2c_probe (uchar chip) ...@@ -268,29 +268,30 @@ int i2c_probe (uchar chip)
writew(0, &i2c_base->con); writew(0, &i2c_base->con);
flush_fifo(); flush_fifo();
writew (0, &i2c_base->cnt); /* don't allow any more data in...we don't want it.*/ /* don't allow any more data in... we don't want it. */
writew(0, &i2c_base->cnt);
writew(0xFFFF, &i2c_base->stat); writew(0xFFFF, &i2c_base->stat);
return res; return res;
} }
int i2c_read (uchar chip, uint addr, int alen, uchar * buffer, int len) int i2c_read(uchar chip, uint addr, int alen, uchar *buffer, int len)
{ {
int i; int i;
if (alen > 1) { if (alen > 1) {
printf ("I2C read: addr len %d not supported\n", alen); printf("I2C read: addr len %d not supported\n", alen);
return 1; return 1;
} }
if (addr + len > 256) { if (addr + len > 256) {
printf ("I2C read: address out of range\n"); printf("I2C read: address out of range\n");
return 1; return 1;
} }
for (i = 0; i < len; i++) { for (i = 0; i < len; i++) {
if (i2c_read_byte (chip, addr + i, &buffer[i])) { if (i2c_read_byte(chip, addr + i, &buffer[i])) {
printf ("I2C read: I/O error\n"); printf("I2C read: I/O error\n");
i2c_init (CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE); i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
return 1; return 1;
} }
} }
...@@ -298,7 +299,7 @@ int i2c_read (uchar chip, uint addr, int alen, uchar * buffer, int len) ...@@ -298,7 +299,7 @@ int i2c_read (uchar chip, uint addr, int alen, uchar * buffer, int len)
return 0; return 0;
} }
int i2c_write (uchar chip, uint addr, int alen, uchar * buffer, int len) int i2c_write(uchar chip, uint addr, int alen, uchar *buffer, int len)
{ {
int i; int i;
u16 status; u16 status;
...@@ -374,40 +375,40 @@ write_exit: ...@@ -374,40 +375,40 @@ write_exit:
return i2c_error; return i2c_error;
} }
static void wait_for_bb (void) static void wait_for_bb(void)
{ {
int timeout = I2C_TIMEOUT; int timeout = I2C_TIMEOUT;
u16 stat; u16 stat;
writew(0xFFFF, &i2c_base->stat); /* clear current interrupts...*/ writew(0xFFFF, &i2c_base->stat); /* clear current interrupts...*/
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(1000); udelay(1000);
} }
if (timeout <= 0) { if (timeout <= 0) {
printf ("timed out in wait_for_bb: I2C_STAT=%x\n", printf("timed out in wait_for_bb: I2C_STAT=%x\n",
readw (&i2c_base->stat)); readw(&i2c_base->stat));
} }
writew(0xFFFF, &i2c_base->stat); /* clear delayed stuff*/ writew(0xFFFF, &i2c_base->stat); /* clear delayed stuff*/
} }
static u16 wait_for_pin (void) static u16 wait_for_pin(void)
{ {
u16 status; u16 status;
int timeout = I2C_TIMEOUT; int timeout = I2C_TIMEOUT;
do { do {
udelay (1000); udelay(1000);
status = readw (&i2c_base->stat); status = readw(&i2c_base->stat);
} while ( !(status & } while (!(status &
(I2C_STAT_ROVR | I2C_STAT_XUDF | I2C_STAT_XRDY | (I2C_STAT_ROVR | I2C_STAT_XUDF | I2C_STAT_XRDY |
I2C_STAT_RRDY | I2C_STAT_ARDY | I2C_STAT_NACK | I2C_STAT_RRDY | I2C_STAT_ARDY | I2C_STAT_NACK |
I2C_STAT_AL)) && timeout--); I2C_STAT_AL)) && timeout--);
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; status = 0;
} }
...@@ -422,7 +423,7 @@ int i2c_set_bus_num(unsigned int bus) ...@@ -422,7 +423,7 @@ int i2c_set_bus_num(unsigned int bus)
return -1; return -1;
} }
#if I2C_BUS_MAX==3 #if I2C_BUS_MAX == 3
if (bus == 2) if (bus == 2)
i2c_base = (struct i2c *)I2C_BASE3; i2c_base = (struct i2c *)I2C_BASE3;
else else
...@@ -434,7 +435,7 @@ int i2c_set_bus_num(unsigned int bus) ...@@ -434,7 +435,7 @@ int i2c_set_bus_num(unsigned int bus)
current_bus = bus; current_bus = bus;
if(!bus_initialized[current_bus]) if (!bus_initialized[current_bus])
i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE); i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
return 0; return 0;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment