diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-07-23 00:57:21 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-07-23 00:57:21 +0200 |
| commit | faca03ca0e7b16f551f10fa895cb8d4bbe0122a0 (patch) | |
| tree | 7ff0f0dbb7c7b354371a4259d53b8f670146c2e7 | |
| parent | 05c37340183ff097b29d66e8d7862fc21162bc6e (diff) | |
| parent | 49a7720b215aa3da24bb13266c4c194012f499a6 (diff) | |
Merge branch 'master' of /home/wd/git/u-boot/custodians
| -rw-r--r-- | board/keymile/common/common.c | 20 | ||||
| -rw-r--r-- | drivers/i2c/fsl_i2c.c | 6 | ||||
| -rw-r--r-- | include/configs/kmeter1.h | 1 |
3 files changed, 26 insertions, 1 deletions
diff --git a/board/keymile/common/common.c b/board/keymile/common/common.c index 259462360c..ec27bdae22 100644 --- a/board/keymile/common/common.c +++ b/board/keymile/common/common.c @@ -424,6 +424,7 @@ static int get_scl (void) #endif +#if !defined(CONFIG_KMETER1) static void writeStartSeq (void) { set_sda (1); @@ -474,6 +475,7 @@ static int i2c_make_abort (void) get_sda (); return ret; } +#endif /** * i2c_init_board - reset i2c bus. When the board is powercycled during a @@ -481,6 +483,23 @@ static int i2c_make_abort (void) */ void i2c_init_board(void) { +#if defined(CONFIG_KMETER1) + struct fsl_i2c *dev; + dev = (struct fsl_i2c *) (CONFIG_SYS_IMMR + CONFIG_SYS_I2C_OFFSET); + uchar dummy; + + out_8 (&dev->cr, (I2C_CR_MSTA)); + out_8 (&dev->cr, (I2C_CR_MEN | I2C_CR_MSTA)); + dummy = in_8(&dev->dr); + dummy = in_8(&dev->dr); + if (dummy != 0xff) { + dummy = in_8(&dev->dr); + } + out_8 (&dev->cr, (I2C_CR_MEN)); + out_8 (&dev->cr, 0x00); + out_8 (&dev->cr, (I2C_CR_MEN)); + +#else #if defined(CONFIG_HARD_I2C) volatile immap_t *immap = (immap_t *)CONFIG_SYS_IMMR ; volatile i2c8260_t *i2c = (i2c8260_t *)&immap->im_i2c; @@ -500,6 +519,7 @@ void i2c_init_board(void) /* Set the PortPins back to use for I2C */ setports (0); #endif +#endif } #endif #endif diff --git a/drivers/i2c/fsl_i2c.c b/drivers/i2c/fsl_i2c.c index 6ab7d3d9fc..ce0f301e13 100644 --- a/drivers/i2c/fsl_i2c.c +++ b/drivers/i2c/fsl_i2c.c @@ -178,6 +178,12 @@ i2c_init(int speed, int slaveadd) struct fsl_i2c *dev; unsigned int temp; +#ifdef CONFIG_SYS_I2C_INIT_BOARD + /* call board specific i2c bus reset routine before accessing the */ + /* environment, which might be in a chip on that bus. For details */ + /* about this problem see doc/I2C_Edge_Conditions. */ + i2c_init_board(); +#endif dev = (struct fsl_i2c *) (CONFIG_SYS_IMMR + CONFIG_SYS_I2C_OFFSET); writeb(0, &dev->cr); /* stop I2C controller */ diff --git a/include/configs/kmeter1.h b/include/configs/kmeter1.h index 7e16c56f2b..869fd4ca1a 100644 --- a/include/configs/kmeter1.h +++ b/include/configs/kmeter1.h @@ -33,7 +33,6 @@ /* include common defines/options for all Keymile boards */ #include "keymile-common.h" -#undef CONFIG_SYS_I2C_INIT_BOARD #define CONFIG_MISC_INIT_R 1 /* * System Clock Setup |