diff options
| author | Stefan Roese <[email protected]> | 2014-10-28 12:12:00 +0100 |
|---|---|---|
| committer | Heiko Schocher <[email protected]> | 2014-10-29 08:56:23 +0100 |
| commit | 678398b19ee23ee5227074bc0d0e7c3925af815c (patch) | |
| tree | a6b3fa06c5ba2ddcbf4a272cf6a6d014ec777051 /include | |
| parent | 318a9cea4983260aae6505b2750e78c276a5451b (diff) | |
i2c: designware: Convert driver to multibus/multiadapter framework
In preparation for the SoCFPGA support of the designware I2C driver,
convert this driver to the common CONFIG_SYS_I2C framework.
This patch converts all users of this driver, this is:
- ST spearxxx boards
- AXS101 (ARC700 platform)
I couldn't test this patch on those boards. Only compile tested for all
spear boards. And tested on SoCFPGA.
Signed-off-by: Stefan Roese <[email protected]>
Reviewed-by: Marek Vasut <[email protected]>
Acked-by: Alexey Brodkin <[email protected]>
Tested-by: Alexey Brodkin <[email protected]>
Cc: Heiko Schocher <[email protected]>
Cc: Vipin Kumar <[email protected]>
Cc: Jeroen Hofstee <[email protected]>
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/axs101.h | 9 | ||||
| -rw-r--r-- | include/configs/spear-common.h | 4 | ||||
| -rw-r--r-- | include/configs/x600.h | 4 |
3 files changed, 10 insertions, 7 deletions
diff --git a/include/configs/axs101.h b/include/configs/axs101.h index 1bf83907221..6e8c56c1dde 100644 --- a/include/configs/axs101.h +++ b/include/configs/axs101.h @@ -83,12 +83,15 @@ /* * I2C configuration */ -#define CONFIG_HARD_I2C -#define CONFIG_DW_I2C -#define CONFIG_I2C_MULTI_BUS +#define CONFIG_SYS_I2C +#define CONFIG_SYS_I2C_DW #define CONFIG_I2C_ENV_EEPROM_BUS 2 #define CONFIG_SYS_I2C_SPEED 100000 +#define CONFIG_SYS_I2C_SPEED1 100000 +#define CONFIG_SYS_I2C_SPEED2 100000 #define CONFIG_SYS_I2C_SLAVE 0 +#define CONFIG_SYS_I2C_SLAVE1 0 +#define CONFIG_SYS_I2C_SLAVE2 0 #define CONFIG_SYS_I2C_BASE 0xE001D000 #define CONFIG_SYS_I2C_BASE1 0xE001E000 #define CONFIG_SYS_I2C_BASE2 0xE001F000 diff --git a/include/configs/spear-common.h b/include/configs/spear-common.h index c0eba3721d7..a11f4ed2e18 100644 --- a/include/configs/spear-common.h +++ b/include/configs/spear-common.h @@ -37,8 +37,8 @@ #define CONFIG_EXTRA_ENV_USBTTY "usbtty=cdc_acm\0" /* I2C driver configuration */ -#define CONFIG_HARD_I2C -#define CONFIG_DW_I2C +#define CONFIG_SYS_I2C +#define CONFIG_SYS_I2C_DW #if defined(CONFIG_SPEAR600) #define CONFIG_SYS_I2C_BASE 0xD0200000 #elif defined(CONFIG_SPEAR300) diff --git a/include/configs/x600.h b/include/configs/x600.h index 6214dc480a0..04187c0a312 100644 --- a/include/configs/x600.h +++ b/include/configs/x600.h @@ -83,8 +83,8 @@ #define CONFIG_SPEAR_GPIO /* I2C config options */ -#define CONFIG_HARD_I2C -#define CONFIG_DW_I2C +#define CONFIG_SYS_I2C +#define CONFIG_SYS_I2C_DW #define CONFIG_SYS_I2C_BASE 0xD0200000 #define CONFIG_SYS_I2C_SPEED 400000 #define CONFIG_SYS_I2C_SLAVE 0x02 |
