[U-Boot] [PATCH 19/31] i2c, mpc83xx: add CONFIG_SYS_I2C_INIT_BOARD for fsl_i2c

Heiko Schocher
2009-01-28T09:40:11Z

This patch adds the possibility to call a board specific
i2c bus reset routine for the fsl_i2c bus driver, and adds
this option for the keymile kmeter1 board.

Signed-off-by: Heiko Schocher <hs@denx.de>
---
board/keymile/common/common.c | 14 ++++++++++++++
drivers/i2c/fsl_i2c.c | 6 ++++++
include/configs/kmeter1.h | 1 +
3 files changed, 21 insertions(+), 0 deletions(-)

diff --git a/board/keymile/common/common.c b/board/keymile/common/common.c
index 17312b5..a282421 100644
--- a/board/keymile/common/common.c
+++ b/board/keymile/common/common.c
@@ -421,6 +421,7 @@ static int get_scl (void)

#endif

+#if !defined(CONFIG_KMETER1)
static void writeStartSeq (void)
{
set_sda (1);
@@ -471,6 +472,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
@@ -478,6 +480,17 @@ 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);
+ 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;
@@ -497,6 +510,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 5242884..7ba5ab1 100644
--- a/drivers/i2c/fsl_i2c.c
+++ b/drivers/i2c/fsl_i2c.c
@@ -176,6 +176,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 17ddcec..31e5cd6 100644
--- a/include/configs/kmeter1.h
+++ b/include/configs/kmeter1.h
@@ -316,6 +316,7 @@
#define CONFIG_SYS_I2C_OFFSET 0x3000

#define CONFIG_SYS_MAX_I2C_BUS 2
+#define CONFIG_SYS_I2C_INIT_BOARD 1
#define CONFIG_I2C_MUX 1

/* EEprom support */
--
1.6.0.6