minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-10 04:26:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

mxc_i2c: place imx_start code inline

Browse Source 
imx_start is only referenced once so
move to that location.

Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
Acked-by: Marek Vasut <marex@denx.de>
This commit is contained in:
Troy Kisky 2012-07-19 08:18:11 +00:00 committed by Heiko Schocher
parent d45e75b10c
commit 71e9f3cbeb
1 changed files with 20 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
drivers/i2c/mxc_i2c.c
View File

@ -200,37 +200,6 @@ static int tx_byte(struct mxc_i2c_regs *i2c_regs, u8 byte)
return 0; return 0;
} }
/*
* Start the controller
*/
int i2c_imx_start(void)
{
struct mxc_i2c_regs *i2c_regs = (struct mxc_i2c_regs *)I2C_BASE;
unsigned int temp = 0;
int result;
/* Enable I2C controller */
writeb(0, &i2c_regs->i2sr);
writeb(I2CR_IEN, &i2c_regs->i2cr);
/* Wait controller to be stable */
udelay(50);
/* Start I2C transaction */
temp = readb(&i2c_regs->i2cr);
temp |= I2CR_MSTA;
writeb(temp, &i2c_regs->i2cr);
result = wait_for_sr_state(i2c_regs, ST_BUS_BUSY);
if (result < 0)
return result;
temp |= I2CR_MTX | I2CR_TX_NO_AK;
writeb(temp, &i2c_regs->i2cr);
return 0;
}
/* /*
* Stop the controller * Stop the controller
*/ */
@ -259,10 +228,28 @@ void i2c_imx_stop(void)
static int i2c_init_transfer(struct mxc_i2c_regs *i2c_regs, static int i2c_init_transfer(struct mxc_i2c_regs *i2c_regs,
uchar chip, uint addr, int alen) uchar chip, uint addr, int alen)
{ {
int ret = i2c_imx_start(); unsigned int temp;
if (ret) int ret;
/* Enable I2C controller */
writeb(0, &i2c_regs->i2sr);
writeb(I2CR_IEN, &i2c_regs->i2cr);
/* Wait for controller to be stable */
udelay(50);
/* Start I2C transaction */
temp = readb(&i2c_regs->i2cr);
temp |= I2CR_MSTA;
writeb(temp, &i2c_regs->i2cr);
ret = wait_for_sr_state(i2c_regs, ST_BUS_BUSY);
if (ret < 0)
goto exit; goto exit;
temp |= I2CR_MTX | I2CR_TX_NO_AK;
writeb(temp, &i2c_regs->i2cr);
/* write slave address */ /* write slave address */
ret = tx_byte(i2c_regs, chip << 1); ret = tx_byte(i2c_regs, chip << 1);
if (ret < 0) if (ret < 0)