diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-09-07 21:28:20 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-09-07 21:28:20 +0200 |
| commit | 67bd94148e4a728379f7c748f5e101612a92651a (patch) | |
| tree | de924a24827101364af8c9505e2cd5f79ff85fee /include | |
| parent | 359ec4931944adb885882deb9b781e4095eabc94 (diff) | |
| parent | c2ca44c24b77e8f65bd5c564576d8eee1a78b4f5 (diff) | |
| download | u-boot-imx-67bd94148e4a728379f7c748f5e101612a92651a.zip u-boot-imx-67bd94148e4a728379f7c748f5e101612a92651a.tar.gz u-boot-imx-67bd94148e4a728379f7c748f5e101612a92651a.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-i2c
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/edminiv2.h | 11 | ||||
| -rw-r--r-- | include/configs/km_arm.h | 8 |
2 files changed, 11 insertions, 8 deletions
diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h index 57dd165..ccfc660 100644 --- a/include/configs/edminiv2.h +++ b/include/configs/edminiv2.h @@ -132,6 +132,7 @@ */ #include <config_cmd_default.h> #define CONFIG_CMD_IDE +#define CONFIG_CMD_I2C /* * Network @@ -182,6 +183,16 @@ #endif /* CMD_IDE */ /* + * I2C related stuff + */ +#ifdef CONFIG_CMD_I2C +#define CONFIG_I2C_MVTWSI +#define CONFIG_I2C_MVTWSI_BASE ORION5X_TWSI_BASE +#define CONFIG_SYS_I2C_SLAVE 0x0 +#define CONFIG_SYS_I2C_SPEED 100000 +#endif + +/* * Environment variables configurations */ #define CONFIG_ENV_IS_IN_FLASH 1 diff --git a/include/configs/km_arm.h b/include/configs/km_arm.h index 6519c90..1617e69 100644 --- a/include/configs/km_arm.h +++ b/include/configs/km_arm.h @@ -142,16 +142,8 @@ /* * I2C related stuff */ -#undef CONFIG_HARD_I2C /* I2C with hardware support */ #define CONFIG_SOFT_I2C /* I2C bit-banged */ -#if defined(CONFIG_HARD_I2C) -#define CONFIG_I2C_KIRKWOOD -#define CONFIG_I2C_KW_REG_BASE KW_TWSI_BASE -#define CONFIG_SYS_I2C_SLAVE 0x0 -#define CONFIG_SYS_I2C_SPEED 100000 -#endif - #define CONFIG_KIRKWOOD_GPIO /* Enable GPIO Support */ #if defined(CONFIG_SOFT_I2C) #ifndef __ASSEMBLY__ |