LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i2c: mxs: Consolidate hard-coded bus address 

This patch prepares the MXS I2C driver for the conversion to the
new I2C driver framework by pulling out the hard-coded I2C0 address
from all the places.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Heiko Schocher <hs@denx.de>
This commit is contained in:
Marek Vasut 2014-10-20 00:23:40 +02:00 committed by Heiko Schocher
parent d58a9451e7
commit 9536099d50
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/i2c/mxs_i2c.c
View File

@ -24,9 +24,14 @@
#define MXS_I2C_MAX_TIMEOUT 1000000 #define MXS_I2C_MAX_TIMEOUT 1000000
static struct mxs_i2c_regs *mxs_i2c_get_base(struct i2c_adapter *adap)
{
return (struct mxs_i2c_regs *)MXS_I2C0_BASE;
}
static void mxs_i2c_reset(void) static void mxs_i2c_reset(void)
{ {
struct mxs_i2c_regs *i2c_regs = (struct mxs_i2c_regs *)MXS_I2C0_BASE; struct mxs_i2c_regs *i2c_regs = mxs_i2c_get_base(NULL);
int ret; int ret;
int speed = i2c_get_bus_speed(); int speed = i2c_get_bus_speed();
@ -48,7 +53,7 @@ static void mxs_i2c_reset(void)
static void mxs_i2c_setup_read(uint8_t chip, int len) static void mxs_i2c_setup_read(uint8_t chip, int len)
{ {
struct mxs_i2c_regs *i2c_regs = (struct mxs_i2c_regs *)MXS_I2C0_BASE; struct mxs_i2c_regs *i2c_regs = mxs_i2c_get_base(NULL);
writel(I2C_QUEUECMD_RETAIN_CLOCK | I2C_QUEUECMD_PRE_SEND_START | writel(I2C_QUEUECMD_RETAIN_CLOCK | I2C_QUEUECMD_PRE_SEND_START |
I2C_QUEUECMD_MASTER_MODE | I2C_QUEUECMD_DIRECTION | I2C_QUEUECMD_MASTER_MODE | I2C_QUEUECMD_DIRECTION |
@ -67,7 +72,7 @@ static void mxs_i2c_setup_read(uint8_t chip, int len)
static int mxs_i2c_write(uchar chip, uint addr, int alen, static int mxs_i2c_write(uchar chip, uint addr, int alen,
uchar *buf, int blen, int stop) uchar *buf, int blen, int stop)
{ {
struct mxs_i2c_regs *i2c_regs = (struct mxs_i2c_regs *)MXS_I2C0_BASE; struct mxs_i2c_regs *i2c_regs = mxs_i2c_get_base(NULL);
uint32_t data, tmp; uint32_t data, tmp;
int i, remain, off; int i, remain, off;
int timeout = MXS_I2C_MAX_TIMEOUT; int timeout = MXS_I2C_MAX_TIMEOUT;
@ -124,7 +129,7 @@ static int mxs_i2c_write(uchar chip, uint addr, int alen,
static int mxs_i2c_wait_for_ack(void) static int mxs_i2c_wait_for_ack(void)
{ {
struct mxs_i2c_regs *i2c_regs = (struct mxs_i2c_regs *)MXS_I2C0_BASE; struct mxs_i2c_regs *i2c_regs = mxs_i2c_get_base(NULL);
uint32_t tmp; uint32_t tmp;
int timeout = MXS_I2C_MAX_TIMEOUT; int timeout = MXS_I2C_MAX_TIMEOUT;
@ -162,7 +167,7 @@ err:
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)
{ {
struct mxs_i2c_regs *i2c_regs = (struct mxs_i2c_regs *)MXS_I2C0_BASE; struct mxs_i2c_regs *i2c_regs = mxs_i2c_get_base(NULL);
uint32_t tmp = 0; uint32_t tmp = 0;
int timeout = MXS_I2C_MAX_TIMEOUT; int timeout = MXS_I2C_MAX_TIMEOUT;
int ret; int ret;
@ -237,7 +242,7 @@ int i2c_probe(uchar chip)
int i2c_set_bus_speed(unsigned int speed) int i2c_set_bus_speed(unsigned int speed)
{ {
struct mxs_i2c_regs *i2c_regs = (struct mxs_i2c_regs *)MXS_I2C0_BASE; struct mxs_i2c_regs *i2c_regs = mxs_i2c_get_base(NULL);
/* /*
* The timing derivation algorithm. There is no documentation for this * The timing derivation algorithm. There is no documentation for this
* algorithm available, it was derived by using the scope and fiddling * algorithm available, it was derived by using the scope and fiddling
@ -278,7 +283,7 @@ int i2c_set_bus_speed(unsigned int speed)
unsigned int i2c_get_bus_speed(void) unsigned int i2c_get_bus_speed(void)
{ {
struct mxs_i2c_regs *i2c_regs = (struct mxs_i2c_regs *)MXS_I2C0_BASE; struct mxs_i2c_regs *i2c_regs = mxs_i2c_get_base(NULL);
uint32_t clk = mxc_get_clock(MXC_XTAL_CLK); uint32_t clk = mxc_get_clock(MXC_XTAL_CLK);
uint32_t timing0; uint32_t timing0;