Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-25 23:06:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

I2C: mxc_i2c: get rid of __REG access

Browse source 
This driver accesses to processor's register
via __REG macros, that are removed (or are planned
to be removed) and replaced by C structures.
This patches replaces all occurrencies of __REG macros.

Signed-off-by: Stefano Babic <sbabic@denx.de>
CC: Heiko Schocher <hs@denx.de>
Acked-by: Heiko Schocher <hs@denx.de>
This commit is contained in:
Stefano Babic 2011-01-20 07:50:44 +00:00 • committed by Albert Aribaud
parent 04220612f6
commit 1d549ade61
1 changed files with 44 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
drivers/i2c/mxc_i2c.c
View file

@ -23,6 +23,7 @@
*/ */
#include <common.h> #include <common.h>
#include <asm/io.h>
#if defined(CONFIG_HARD_I2C) #if defined(CONFIG_HARD_I2C)
@ -81,15 +82,26 @@ static u16 div[] = { 30, 32, 36, 42, 48, 52, 60, 72, 80, 88, 104, 128, 144,
160, 192, 240, 288, 320, 384, 480, 576, 640, 768, 960, 160, 192, 240, 288, 320, 384, 480, 576, 640, 768, 960,
1152, 1280, 1536, 1920, 2304, 2560, 3072, 3840}; 1152, 1280, 1536, 1920, 2304, 2560, 3072, 3840};
static inline void i2c_reset(void)
{
writew(0, I2C_BASE + I2CR); /* Reset module */
writew(0, I2C_BASE + I2SR);
writew(I2CR_IEN, I2C_BASE + I2CR);
}
void i2c_init(int speed, int unused) void i2c_init(int speed, int unused)
{ {
int freq; int freq;
int i; int i;
#if defined(CONFIG_MX31) #if defined(CONFIG_MX31)
struct clock_control_regs *sc_regs =
(struct clock_control_regs *)CCM_BASE;
freq = mx31_get_ipg_clk(); freq = mx31_get_ipg_clk();
/* start the required I2C clock */ /* start the required I2C clock */
__REG(CCM_CGR0) = __REG(CCM_CGR0) | (3 << I2C_CLK_OFFSET); writel(readl(&sc_regs->cgr0) | (3 << I2C_CLK_OFFSET),
&sc_regs->cgr0);
#else #else
freq = mxc_get_clock(MXC_IPG_PERCLK); freq = mxc_get_clock(MXC_IPG_PERCLK);
#endif #endif
@ -98,30 +110,28 @@ void i2c_init(int speed, int unused)
if (freq / div[i] <= speed) if (freq / div[i] <= speed)
break; break;
DPRINTF("%s: speed: %d\n",__FUNCTION__, speed); debug("%s: speed: %d\n", __func__, speed);
__REG16(I2C_BASE + I2CR) = 0; /* Reset module */ writew(i, I2C_BASE + IFDR);
__REG16(I2C_BASE + IFDR) = i; i2c_reset();
__REG16(I2C_BASE + I2CR) = I2CR_IEN;
__REG16(I2C_BASE + I2SR) = 0;
} }
static int wait_busy(void) static int wait_busy(void)
{ {
int timeout = 10000; int timeout = 10000;
while (!(__REG16(I2C_BASE + I2SR) & I2SR_IIF) && --timeout) while (!(readw(I2C_BASE + I2SR) & I2SR_IIF) && --timeout)
udelay(1); udelay(1);
__REG16(I2C_BASE + I2SR) = 0; /* clear interrupt */ writew(0, I2C_BASE + I2SR); /* clear interrupt */
return timeout; return timeout;
} }
static int tx_byte(u8 byte) static int tx_byte(u8 byte)
{ {
__REG16(I2C_BASE + I2DR) = byte; writew(byte, I2C_BASE + I2DR);
if (!wait_busy() || __REG16(I2C_BASE + I2SR) & I2SR_RX_NO_AK) if (!wait_busy() || readw(I2C_BASE + I2SR) & I2SR_RX_NO_AK)
return -1; return -1;
return 0; return 0;
} }
@ -131,27 +141,27 @@ static int rx_byte(void)
if (!wait_busy()) if (!wait_busy())
return -1; return -1;
return __REG16(I2C_BASE + I2DR); return readw(I2C_BASE + I2DR);
} }
int i2c_probe(uchar chip) int i2c_probe(uchar chip)
{ {
int ret; int ret;
__REG16(I2C_BASE + I2CR) = 0; /* Reset module */ writew(0, I2C_BASE + I2CR); /* Reset module */
__REG16(I2C_BASE + I2CR) = I2CR_IEN; writew(I2CR_IEN, I2C_BASE + I2CR);
__REG16(I2C_BASE + I2CR) = I2CR_IEN | I2CR_MSTA | I2CR_MTX; writew(I2CR_IEN | I2CR_MSTA | I2CR_MTX, I2C_BASE + I2CR);
ret = tx_byte(chip << 1); ret = tx_byte(chip << 1);
__REG16(I2C_BASE + I2CR) = I2CR_IEN | I2CR_MTX; writew(I2CR_IEN | I2CR_MTX, I2C_BASE + I2CR);
return ret; return ret;
} }
static int i2c_addr(uchar chip, uint addr, int alen) static int i2c_addr(uchar chip, uint addr, int alen)
{ {
__REG16(I2C_BASE + I2SR) = 0; /* clear interrupt */ writew(0, I2C_BASE + I2SR);
__REG16(I2C_BASE + I2CR) = I2CR_IEN | I2CR_MSTA | I2CR_MTX; writew(I2CR_IEN | I2CR_MSTA | I2CR_MTX, I2C_BASE + I2CR);
if (tx_byte(chip << 1)) if (tx_byte(chip << 1))
return -1; return -1;
@ -167,35 +177,40 @@ int i2c_read(uchar chip, uint addr, int alen, uchar *buf, int len)
int timeout = 10000; int timeout = 10000;
int ret; int ret;
DPRINTF("%s chip: 0x%02x addr: 0x%04x alen: %d len: %d\n",__FUNCTION__, chip, addr, alen, len); debug("%s chip: 0x%02x addr: 0x%04x alen: %d len: %d\n",
__func__, chip, addr, alen, len);
if (i2c_addr(chip, addr, alen)) { if (i2c_addr(chip, addr, alen)) {
printf("i2c_addr failed\n"); printf("i2c_addr failed\n");
return -1; return -1;
} }
__REG16(I2C_BASE + I2CR) = I2CR_IEN | I2CR_MSTA | I2CR_MTX | I2CR_RSTA; writew(I2CR_IEN | I2CR_MSTA | I2CR_MTX | I2CR_RSTA, I2C_BASE + I2CR);
if (tx_byte(chip << 1 | 1)) if (tx_byte(chip << 1 | 1))
return -1; return -1;
__REG16(I2C_BASE + I2CR) = I2CR_IEN | I2CR_MSTA | ((len == 1) ? I2CR_TX_NO_AK : 0); writew(I2CR_IEN | I2CR_MSTA |
((len == 1) ? I2CR_TX_NO_AK : 0),
I2C_BASE + I2CR);
ret = __REG16(I2C_BASE + I2DR); ret = readw(I2C_BASE + I2DR);
while (len--) { while (len--) {
if ((ret = rx_byte()) < 0) if ((ret = rx_byte()) < 0)
return -1; return -1;
*buf++ = ret; *buf++ = ret;
if (len <= 1) if (len <= 1)
__REG16(I2C_BASE + I2CR) = I2CR_IEN | I2CR_MSTA | I2CR_TX_NO_AK; writew(I2CR_IEN | I2CR_MSTA |
I2CR_TX_NO_AK,
I2C_BASE + I2CR);
} }
wait_busy(); wait_busy();
__REG16(I2C_BASE + I2CR) = I2CR_IEN; writew(I2CR_IEN, I2C_BASE + I2CR);
while (__REG16(I2C_BASE + I2SR) & I2SR_IBB && --timeout) while (readw(I2C_BASE + I2SR) & I2SR_IBB && --timeout)
udelay(1); udelay(1);
return 0; return 0;
@ -203,8 +218,9 @@ int i2c_read(uchar chip, uint addr, int alen, uchar *buf, int len)
int i2c_write(uchar chip, uint addr, int alen, uchar *buf, int len) int i2c_write(uchar chip, uint addr, int alen, uchar *buf, int len)
{ {
int timeout = 10000; int timeout = I2C_MAX_TIMEOUT;
DPRINTF("%s chip: 0x%02x addr: 0x%04x alen: %d len: %d\n",__FUNCTION__, chip, addr, alen, len); debug("%s chip: 0x%02x addr: 0x%04x alen: %d len: %d\n",
__func__, chip, addr, alen, len);
if (i2c_addr(chip, addr, alen)) if (i2c_addr(chip, addr, alen))
return -1; return -1;
@ -213,9 +229,9 @@ int i2c_write(uchar chip, uint addr, int alen, uchar *buf, int len)
if (tx_byte(*buf++)) if (tx_byte(*buf++))
return -1; return -1;
__REG16(I2C_BASE + I2CR) = I2CR_IEN; writew(I2CR_IEN, I2C_BASE + I2CR);
while (__REG16(I2C_BASE + I2SR) & I2SR_IBB && --timeout) while (readw(I2C_BASE + I2SR) & I2SR_IBB && --timeout)
udelay(1); udelay(1);
return 0; return 0;