From 69153988a6f4eda44257c6bc5afac484f8f95930 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Fri, 12 May 2017 21:09:56 -0600 Subject: i2c: Finish dropping use of CONFIG_I2C_HARD Drop use of this long-deprecated option. Signed-off-by: Simon Glass Reviewed-by: Tom Rini --- common/board_f.c | 4 ++-- common/stdio.c | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) (limited to 'common') diff --git a/common/board_f.c b/common/board_f.c index d9431ee79a..eed3e7be2a 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -184,7 +184,7 @@ __weak int dram_init_banksize(void) return 0; } -#if defined(CONFIG_HARD_I2C) || defined(CONFIG_SYS_I2C) +#if defined(CONFIG_SYS_I2C) static int init_func_i2c(void) { puts("I2C: "); @@ -765,7 +765,7 @@ static const init_fnc_t init_sequence_f[] = { misc_init_f, #endif INIT_FUNC_WATCHDOG_RESET -#if defined(CONFIG_HARD_I2C) || defined(CONFIG_SYS_I2C) +#if defined(CONFIG_SYS_I2C) init_func_i2c, #endif #if defined(CONFIG_HARD_SPI) diff --git a/common/stdio.c b/common/stdio.c index 4d30017530..ee4f0bda9e 100644 --- a/common/stdio.c +++ b/common/stdio.c @@ -21,7 +21,7 @@ #include #endif -#if defined(CONFIG_HARD_I2C) || defined(CONFIG_SYS_I2C) +#if defined(CONFIG_SYS_I2C) #include #endif @@ -346,9 +346,6 @@ int stdio_add_devices(void) #ifdef CONFIG_SYS_I2C i2c_init_all(); #else -#if defined(CONFIG_HARD_I2C) - i2c_init (CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE); -#endif #endif #ifdef CONFIG_DM_VIDEO /* -- cgit v1.2.1 From 213f27f3f9c89dbf32e38cb031b303193e6e8627 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Fri, 12 May 2017 21:09:59 -0600 Subject: Drop CONFIG_I2CFAST This option is not used in U-Boot. Drop it. Signed-off-by: Simon Glass --- common/board_r.c | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'common') diff --git a/common/board_r.c b/common/board_r.c index d69a33c4a3..dba2102b18 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -485,24 +485,7 @@ static int initr_env(void) /* Initialize from environment */ load_addr = getenv_ulong("loadaddr", 16, load_addr); -#if defined(CONFIG_SYS_EXTBDINFO) -#if defined(CONFIG_405GP) || defined(CONFIG_405EP) -#if defined(CONFIG_I2CFAST) - /* - * set bi_iic_fast for linux taking environment variable - * "i2cfast" into account - */ - { - char *s = getenv("i2cfast"); - if (s && ((*s == 'y') || (*s == 'Y'))) { - gd->bd->bi_iic_fast[0] = 1; - gd->bd->bi_iic_fast[1] = 1; - } - } -#endif /* CONFIG_I2CFAST */ -#endif /* CONFIG_405GP, CONFIG_405EP */ -#endif /* CONFIG_SYS_EXTBDINFO */ return 0; } -- cgit v1.2.1