diff options
| author | Heiko Schocher <hs@denx.de> | 2013-01-29 08:53:15 +0100 |
|---|---|---|
| committer | Heiko Schocher <hs@denx.de> | 2013-07-23 05:54:29 +0200 |
| commit | ea818dbbcd59300b56014ac2d67798a54994eb9b (patch) | |
| tree | fbdedc80f785873f96e79893a1a813504af57580 /common | |
| parent | 3f4978c713255c8406875fbdf23ffed1129bc44b (diff) | |
i2c, soft-i2c: switch to new multibus/multiadapter support
- added to soft_i2c driver new multibus/multiadpater support
- adapted all config files, which uses this driver
Signed-off-by: Heiko Schocher <hs@denx.de>
Cc: Simon Glass <sjg@chromium.org>
Cc: Stephen Warren <swarren@wwwdotorg.org>
Diffstat (limited to 'common')
| -rw-r--r-- | common/board_f.c | 6 | ||||
| -rw-r--r-- | common/cmd_eeprom.c | 3 | ||||
| -rw-r--r-- | common/stdio.c | 8 |
3 files changed, 6 insertions, 11 deletions
diff --git a/common/board_f.c b/common/board_f.c index ca9a7603ed..ddac2dfe09 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -261,8 +261,7 @@ void __dram_init_banksize(void) void dram_init_banksize(void) __attribute__((weak, alias("__dram_init_banksize"))); -#if defined(CONFIG_HARD_I2C) || defined(CONFIG_SOFT_I2C) || \ - defined(CONFIG_SYS_I2C) +#if defined(CONFIG_HARD_I2C) || defined(CONFIG_SYS_I2C) static int init_func_i2c(void) { puts("I2C: "); @@ -920,8 +919,7 @@ static init_fnc_t init_sequence_f[] = { misc_init_f, #endif INIT_FUNC_WATCHDOG_RESET -#if defined(CONFIG_HARD_I2C) || defined(CONFIG_SOFT_I2C) || \ - defined(CONFIG_SYS_I2C) +#if defined(CONFIG_HARD_I2C) || defined(CONFIG_SYS_I2C) init_func_i2c, #endif #if defined(CONFIG_HARD_SPI) diff --git a/common/cmd_eeprom.c b/common/cmd_eeprom.c index 4a43116e92..511d8b6022 100644 --- a/common/cmd_eeprom.c +++ b/common/cmd_eeprom.c @@ -406,8 +406,7 @@ void eeprom_init (void) #if defined(CONFIG_SPI) && !defined(CONFIG_ENV_EEPROM_IS_ON_I2C) spi_init_f (); #endif -#if defined(CONFIG_HARD_I2C) || \ - defined(CONFIG_SOFT_I2C) +#if defined(CONFIG_HARD_I2C) || defined(CONFIG_SYS_I2C_SOFT) i2c_init (CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE); #endif } diff --git a/common/stdio.c b/common/stdio.c index 2011880549..39eef5aa2e 100644 --- a/common/stdio.c +++ b/common/stdio.c @@ -34,8 +34,8 @@ #ifdef CONFIG_LOGBUFFER #include <logbuff.h> #endif -#if defined(CONFIG_HARD_I2C) || defined(CONFIG_SOFT_I2C) || \ - defined(CONFIG_SYS_I2C_ADAPTERS) + +#if defined(CONFIG_HARD_I2C) || defined(CONFIG_SYS_I2C) #include <i2c.h> #endif @@ -216,11 +216,9 @@ int stdio_init (void) drv_arm_dcc_init (); #endif #ifdef CONFIG_SYS_I2C -#ifdef CONFIG_SYS_I2C_ADAPTERS i2c_init_all(); -#endif #else -#if defined(CONFIG_HARD_I2C) || defined(CONFIG_SOFT_I2C) +#if defined(CONFIG_HARD_I2C) i2c_init (CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE); #endif #endif |