From mboxrd@z Thu Jan 1 00:00:00 1970 From: Heiko Schocher Date: Mon, 15 May 2017 06:25:40 +0200 Subject: [U-Boot] [PATCH v3 10/12] i2c: Drop CONFIG_SYS_I2C_BOARD_LATE_INIT In-Reply-To: <20170513031000.5429-11-sjg@chromium.org> References: <20170513031000.5429-1-sjg@chromium.org> <20170513031000.5429-11-sjg@chromium.org> Message-ID: <59192DC4.7090207@denx.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hello Simon, Am 13.05.2017 um 05:09 schrieb Simon Glass: > This option is not used by any boards. Drop it. > > Signed-off-by: Simon Glass > --- > > Changes in v3: None > Changes in v2: None > > README | 11 ----------- > drivers/i2c/fsl_i2c.c | 9 --------- > drivers/i2c/fti2c010.c | 9 --------- > include/i2c.h | 3 --- > scripts/config_whitelist.txt | 1 - > 5 files changed, 33 deletions(-) Thanks! Applied to u-boot-i2c.git master u-boot-i2c master just testing on travis: https://travis-ci.org/hsdenx/u-boot-i2c/builds/232288665 bye, Heiko > > diff --git a/README b/README > index 9f9265dc6d..96ce6289ea 100644 > --- a/README > +++ b/README > @@ -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 a1406baa87..ff3dc25927 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 b35d0d2d9c..4da959fa53 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 cd7f61e1c1..a88cc7cddf 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 da37e49c83..5cdca33f87 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 > -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany