diff options
| author | Michal Simek <monstr@monstr.eu> | 2007-08-15 21:06:52 +0200 |
|---|---|---|
| committer | Michal Simek <monstr@monstr.eu> | 2007-08-15 21:06:52 +0200 |
| commit | 19909edb97140a5ea3139705589bb90e023ab5e1 (patch) | |
| tree | 6629766d2355d3c01b96b0c5ee6b9fd73502c943 /drivers/fsl_i2c.c | |
| parent | d1ed28cf36ab6b1d4c479809de7252bf53d2f2d4 (diff) | |
| parent | 210f463c71917b7a4495c2103c228b9c179ae64d (diff) | |
| download | u-boot-imx-19909edb97140a5ea3139705589bb90e023ab5e1.zip u-boot-imx-19909edb97140a5ea3139705589bb90e023ab5e1.tar.gz u-boot-imx-19909edb97140a5ea3139705589bb90e023ab5e1.tar.bz2 | |
Merge git://www.denx.de/git/u-boot into merge
Diffstat (limited to 'drivers/fsl_i2c.c')
| -rw-r--r-- | drivers/fsl_i2c.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/fsl_i2c.c b/drivers/fsl_i2c.c index ebae5af..22485ea 100644 --- a/drivers/fsl_i2c.c +++ b/drivers/fsl_i2c.c @@ -69,9 +69,10 @@ i2c_init(int speed, int slaveadd) dev = (struct fsl_i2c *) (CFG_IMMR + CFG_I2C2_OFFSET); writeb(0, &dev->cr); /* stop I2C controller */ + udelay(5); /* let it shutdown in peace */ writeb(0x3F, &dev->fdr); /* set bus speed */ writeb(0x3F, &dev->dfsrr); /* set default filter */ - writeb(slaveadd, &dev->adr); /* write slave address */ + writeb(slaveadd << 1, &dev->adr); /* write slave address */ writeb(0x0, &dev->sr); /* clear status register */ writeb(I2C_CR_MEN, &dev->cr); /* start I2C controller */ #endif /* CFG_I2C2_OFFSET */ |