diff options
| author | Simon Glass <sjg@chromium.org> | 2017-05-12 21:09:58 -0600 |
|---|---|---|
| committer | Heiko Schocher <hs@denx.de> | 2017-05-15 06:18:51 +0200 |
| commit | b0103f33b45286eef53239d3c80e21d7eafd9cb4 (patch) | |
| tree | 77f9fde1527940cce3c4c34e6171bc1646dfbbdb | |
| parent | b238c9dce5e487092531fb6e61c4d9f334f86686 (diff) | |
| download | u-boot-b0103f33b45286eef53239d3c80e21d7eafd9cb4.zip u-boot-b0103f33b45286eef53239d3c80e21d7eafd9cb4.tar.gz u-boot-b0103f33b45286eef53239d3c80e21d7eafd9cb4.tar.bz2 | |
i2c: Drop CONFIG_SYS_I2C_BOARD_LATE_INIT
This option is not used by any boards. Drop it.
Signed-off-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | README | 11 | ||||
| -rw-r--r-- | drivers/i2c/fsl_i2c.c | 9 | ||||
| -rw-r--r-- | drivers/i2c/fti2c010.c | 9 | ||||
| -rw-r--r-- | include/i2c.h | 3 | ||||
| -rw-r--r-- | scripts/config_whitelist.txt | 1 |
5 files changed, 0 insertions, 33 deletions
@@ -2323,17 +2323,6 @@ The following options need to be configured: custom i2c_init_board() routine in boards/xxx/board.c is run early in the boot sequence. - CONFIG_SYS_I2C_BOARD_LATE_INIT - - An alternative to CONFIG_SYS_I2C_INIT_BOARD. If this option is - defined a custom i2c_board_late_init() routine in - boards/xxx/board.c is run AFTER the operations in i2c_init() - is completed. This callpoint can be used to unreset i2c bus - using CPU i2c controller register accesses for CPUs whose i2c - controller provide such a method. It is called at the end of - i2c_init() to allow i2c_init operations to setup the i2c bus - controller on the CPU (e.g. setting bus speed & slave address). - CONFIG_I2CFAST (PPC405GP|PPC405EP only) This option enables configuration of bi_iic_fast[] flags 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/include/i2c.h b/include/i2c.h index cd7f61e..a88cc7c 100644 --- a/include/i2c.h +++ b/include/i2c.h @@ -706,9 +706,6 @@ void i2c_early_init_f(void); #endif void i2c_init(int speed, int slaveaddr); void i2c_init_board(void); -#ifdef CONFIG_SYS_I2C_BOARD_LATE_INIT -void i2c_board_late_init(void); -#endif #ifdef CONFIG_SYS_I2C /* diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index da37e49..5cdca33 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -4222,7 +4222,6 @@ CONFIG_SYS_I2C_BASE2 CONFIG_SYS_I2C_BASE3 CONFIG_SYS_I2C_BASE4 CONFIG_SYS_I2C_BASE5 -CONFIG_SYS_I2C_BOARD_LATE_INIT CONFIG_SYS_I2C_BOOT_EEPROM_ADDR CONFIG_SYS_I2C_BUSES CONFIG_SYS_I2C_BUS_MAX |