diff options
author | Heiko Schocher <hs@denx.de> | 2012-10-24 13:48:22 +0200 |
---|---|---|
committer | Heiko Schocher <hs@denx.de> | 2013-07-23 08:34:53 +0200 |
commit | 00f792e0df9ae942427e44595a0f4379582accee (patch) | |
tree | 34bfe42e8b720ed412ffa481b916a36fb1adcd60 /include/configs/MERGERBOX.h | |
parent | ea818dbbcd59300b56014ac2d67798a54994eb9b (diff) | |
download | u-boot-imx-00f792e0df9ae942427e44595a0f4379582accee.zip u-boot-imx-00f792e0df9ae942427e44595a0f4379582accee.tar.gz u-boot-imx-00f792e0df9ae942427e44595a0f4379582accee.tar.bz2 |
i2c, fsl_i2c: switch to new multibus/multiadapter support
- added to fsl_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/MERGERBOX.h')
-rw-r--r-- | include/configs/MERGERBOX.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/include/configs/MERGERBOX.h b/include/configs/MERGERBOX.h index 2496639..0f17411 100644 --- a/include/configs/MERGERBOX.h +++ b/include/configs/MERGERBOX.h @@ -224,13 +224,14 @@ #define CONFIG_OF_STDOUT_VIA_ALIAS 1 /* I2C */ -#define CONFIG_HARD_I2C -#define CONFIG_FSL_I2C -#define CONFIG_I2C_MULTI_BUS -#define CONFIG_SYS_I2C_SPEED 120000 -#define CONFIG_SYS_I2C_SLAVE 0x7F -#define CONFIG_SYS_I2C_OFFSET 0x3000 -#define CONFIG_SYS_I2C2_OFFSET 0x3100 +#define CONFIG_SYS_I2C +#define CONFIG_SYS_I2C_FSL +#define CONFIG_SYS_FSL_I2C_SPEED 400000 +#define CONFIG_SYS_FSL_I2C_SLAVE 0x7F +#define CONFIG_SYS_FSL_I2C_OFFSET 0x3000 +#define CONFIG_SYS_FSL_I2C2_SPEED 400000 +#define CONFIG_SYS_FSL_I2C2_SLAVE 0x7F +#define CONFIG_SYS_FSL_I2C2_OFFSET 0x3100 /* * General PCI |