diff options
| author | Valentin Longchamp <valentin.longchamp@keymile.com> | 2013-10-18 11:47:17 +0200 |
|---|---|---|
| committer | York Sun <yorksun@freescale.com> | 2013-10-24 09:35:33 -0700 |
| commit | 0a4f88b98c098532bfe0a4a5f874e6e05708c4f3 (patch) | |
| tree | 08e58ce9f0b5740bd7f3c05fbf2901b88c2452e1 /include/configs | |
| parent | 7c3d6a29cd1ed315185068fd8384d150ef5f967b (diff) | |
| download | u-boot-imx-0a4f88b98c098532bfe0a4a5f874e6e05708c4f3.zip u-boot-imx-0a4f88b98c098532bfe0a4a5f874e6e05708c4f3.tar.gz u-boot-imx-0a4f88b98c098532bfe0a4a5f874e6e05708c4f3.tar.bz2 | |
KM: define CONFIG_SYS_I2C_INIT_BOARD only for concerned board
This must be defined for all the keymile boards that use the common
i2c_abort function that is used to "reset" the I2C bus. These are
currently km82xx and km_arm boards.
The km83xx boards use other functions and thus do not need this.
This patch removes the CONFIG_SYS_I2C_INIT_BOARD from keymile-common.h
and defines it for km_arm.h and km82xx.h.
Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com>
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/km/keymile-common.h | 2 | ||||
| -rw-r--r-- | include/configs/km/km_arm.h | 4 | ||||
| -rw-r--r-- | include/configs/km82xx.h | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h index 2524ceb..f62fdf6 100644 --- a/include/configs/km/keymile-common.h +++ b/include/configs/km/keymile-common.h @@ -63,8 +63,6 @@ #define CONFIG_LOADS_ECHO #define CONFIG_SYS_LOADS_BAUD_CHANGE -#define CONFIG_SYS_I2C_INIT_BOARD - /* Support the IVM EEprom */ #define CONFIG_SYS_IVM_EEPROM_ADR 0x50 #define CONFIG_SYS_IVM_EEPROM_MAX_LEN 0x400 diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h index 75b6250..36c2fba 100644 --- a/include/configs/km/km_arm.h +++ b/include/configs/km/km_arm.h @@ -176,10 +176,9 @@ #undef CONFIG_I2C_MVTWSI #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_SOFT /* I2C bit-banged */ +#define CONFIG_SYS_I2C_INIT_BOARD #define CONFIG_KIRKWOOD_GPIO /* Enable GPIO Support */ -#if defined(CONFIG_SYS_I2C_SOFT) - #define CONFIG_SYS_NUM_I2C_BUSES 6 #define CONFIG_SYS_I2C_MAX_HOPS 1 #define CONFIG_SYS_I2C_BUSES { {0, {I2C_NULL_HOP} }, \ @@ -214,7 +213,6 @@ int get_scl(void); #define CONFIG_SYS_I2C_SOFT_SLAVE 0x0 #define CONFIG_SYS_I2C_SOFT_SPEED 100000 -#endif /* EEprom support 24C128, 24C256 valid for environment eeprom */ #define CONFIG_SYS_I2C_MULTI_EEPROMS diff --git a/include/configs/km82xx.h b/include/configs/km82xx.h index 986c65f..029c348 100644 --- a/include/configs/km82xx.h +++ b/include/configs/km82xx.h @@ -227,6 +227,7 @@ /* enable I2C and select the hardware/software driver */ #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_SOFT /* I2C bit-banged */ +#define CONFIG_SYS_I2C_INIT_BOARD #define CONFIG_SYS_NUM_I2C_BUSES 3 #define CONFIG_SYS_I2C_MAX_HOPS 1 #define CONFIG_SYS_I2C_SOFT_SPEED 50000 @@ -237,6 +238,7 @@ {0, {{I2C_MUX_PCA9542, 0x70, 1} } } } #define CONFIG_KM_IVM_BUS 1 /* I2C2 (Mux-Port 1)*/ +#define CONFIG_KM_I2C_ABORT /* * Software (bit-bang) I2C driver configuration |