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 /include/configs/uc100.h | |
parent | 3f4978c713255c8406875fbdf23ffed1129bc44b (diff) | |
download | u-boot-imx-ea818dbbcd59300b56014ac2d67798a54994eb9b.zip u-boot-imx-ea818dbbcd59300b56014ac2d67798a54994eb9b.tar.gz u-boot-imx-ea818dbbcd59300b56014ac2d67798a54994eb9b.tar.bz2 |
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 'include/configs/uc100.h')
-rw-r--r-- | include/configs/uc100.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/include/configs/uc100.h b/include/configs/uc100.h index 450c98b..ce122b4 100644 --- a/include/configs/uc100.h +++ b/include/configs/uc100.h @@ -464,13 +464,10 @@ */ /* enable I2C and select the hardware/software driver */ -#undef CONFIG_HARD_I2C /* I2C with hardware support */ -#define CONFIG_SOFT_I2C 1 /* I2C bit-banged */ - -#define CONFIG_SYS_I2C_SPEED 93000 /* 93 kHz is supposed to work */ -#define CONFIG_SYS_I2C_SLAVE 0xFE - -#ifdef CONFIG_SOFT_I2C +#define CONFIG_SYS_I2C +#define CONFIG_SYS_I2C_SOFT /* I2C bit-banged */ +#define CONFIG_SYS_I2C_SOFT_SPEED 93000 /* 93 kHz is supposed to work */ +#define CONFIG_SYS_I2C_SOFT_SLAVE 0xFE /* * Software (bit-bang) I2C driver configuration */ @@ -486,7 +483,6 @@ #define I2C_SCL(bit) if(bit) immr->im_cpm.cp_pbdat |= PB_SCL; \ else immr->im_cpm.cp_pbdat &= ~PB_SCL #define I2C_DELAY udelay(2) /* 1/4 I2C clock duration */ -#endif /* CONFIG_SOFT_I2C */ /*----------------------------------------------------------------------- * I2C EEPROM (24C164) |