sysmo-bts
/
u-boot
9
0
Fork 0
Code Pull Requests Releases Activity

Merge branch 'master' of /home/wd/git/u-boot/custodians

This commit is contained in:
Wolfgang Denk 2009-07-23 00:57:21 +02:00
parent 05c3734018 49a7720b21
commit faca03ca0e
3 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
board/keymile/common/common.c
View File

@ -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

6
drivers/i2c/fsl_i2c.c
View File

@ -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 */

1
include/configs/kmeter1.h
View File

@ -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