diff options
| author | Tom Rini <trini@konsulko.com> | 2017-05-15 13:01:26 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-05-15 13:01:26 -0400 |
| commit | cb33bda44f4bbf6fb58adf41dced313ca38da6fc (patch) | |
| tree | 8545cfc94e15989b99e587a22296ec7bc428e5b1 /drivers | |
| parent | 50749d2ac30dd7af94d8c9ed64276f92d9d396f5 (diff) | |
| parent | ce3b5d69112b1adc878e06586c1bc819414309be (diff) | |
| download | u-boot-cb33bda44f4bbf6fb58adf41dced313ca38da6fc.zip u-boot-cb33bda44f4bbf6fb58adf41dced313ca38da6fc.tar.gz u-boot-cb33bda44f4bbf6fb58adf41dced313ca38da6fc.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-i2c
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/i2c/fsl_i2c.c | 9 | ||||
| -rw-r--r-- | drivers/i2c/fti2c010.c | 9 | ||||
| -rw-r--r-- | drivers/i2c/mxc_i2c.c | 4 |
3 files changed, 0 insertions, 22 deletions
diff --git a/drivers/i2c/fsl_i2c.c b/drivers/i2c/fsl_i2c.c index a1406ba..ff3dc25 100644 --- a/drivers/i2c/fsl_i2c.c +++ b/drivers/i2c/fsl_i2c.c @@ -284,15 +284,6 @@ static void __i2c_init(const struct fsl_i2c_base *base, int speed, int break; } - -#ifdef CONFIG_SYS_I2C_BOARD_LATE_INIT - /* Call board specific i2c bus reset routine AFTER the bus has been - * initialized. Use either this callpoint or i2c_init_board; - * which is called before i2c_init operations. - * For details about this problem see doc/I2C_Edge_Conditions. - */ - i2c_board_late_init(); -#endif } static int diff --git a/drivers/i2c/fti2c010.c b/drivers/i2c/fti2c010.c index b35d0d2..4da959f 100644 --- a/drivers/i2c/fti2c010.c +++ b/drivers/i2c/fti2c010.c @@ -146,15 +146,6 @@ static void fti2c010_init(struct i2c_adapter *adap, int speed, int slaveaddr) set_i2c_bus_speed(chip, speed); /* slave init, don't care */ - -#ifdef CONFIG_SYS_I2C_BOARD_LATE_INIT - /* Call board specific i2c bus reset routine AFTER the bus has been - * initialized. Use either this callpoint or i2c_init_board; - * which is called before fti2c010_init operations. - * For details about this problem see doc/I2C_Edge_Conditions. - */ - i2c_board_late_init(); -#endif } /* diff --git a/drivers/i2c/mxc_i2c.c b/drivers/i2c/mxc_i2c.c index 13ec0e6..b68e827 100644 --- a/drivers/i2c/mxc_i2c.c +++ b/drivers/i2c/mxc_i2c.c @@ -69,10 +69,6 @@ DECLARE_GLOBAL_DATA_PTR; #define I2SR_IIF_CLEAR (0 << 1) #endif -#if defined(CONFIG_HARD_I2C) && !defined(CONFIG_SYS_I2C_BASE) -#error "define CONFIG_SYS_I2C_BASE to use the mxc_i2c driver" -#endif - #ifdef I2C_QUIRK_REG static u16 i2c_clk_div[60][2] = { { 20, 0x00 }, { 22, 0x01 }, { 24, 0x02 }, { 26, 0x03 }, |