diff options
author | Tom Rini <trini@konsulko.com> | 2017-05-15 17:01:26 (GMT) |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2017-05-15 17:01:26 (GMT) |
commit | cb33bda44f4bbf6fb58adf41dced313ca38da6fc (patch) | |
tree | 8545cfc94e15989b99e587a22296ec7bc428e5b1 /arch/arm | |
parent | 50749d2ac30dd7af94d8c9ed64276f92d9d396f5 (diff) | |
parent | ce3b5d69112b1adc878e06586c1bc819414309be (diff) | |
download | u-boot-cb33bda44f4bbf6fb58adf41dced313ca38da6fc.tar.xz |
Merge branch 'master' of git://git.denx.de/u-boot-i2c
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/include/asm/arch-armada100/config.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/arch/arm/include/asm/arch-armada100/config.h b/arch/arm/include/asm/arch-armada100/config.h index 6ebc759..113e1c7 100644 --- a/arch/arm/include/asm/arch-armada100/config.h +++ b/arch/arm/include/asm/arch-armada100/config.h @@ -24,17 +24,5 @@ #define MV_UART_CONSOLE_BASE ARMD1_UART1_BASE #define CONFIG_SYS_NS16550_IER (1 << 6) /* Bit 6 in UART_IER register represents UART Unit Enable */ -/* - * I2C definition - */ -#ifdef CONFIG_CMD_I2C -#define CONFIG_I2C_MV 1 -#define CONFIG_MV_I2C_NUM 2 -#define CONFIG_I2C_MULTI_BUS 1 -#define CONFIG_MV_I2C_REG {0xd4011000, 0xd4025000} -#define CONFIG_HARD_I2C 1 -#define CONFIG_SYS_I2C_SPEED 0 -#define CONFIG_SYS_I2C_SLAVE 0xfe -#endif #endif /* _ARMD1_CONFIG_H */ |