summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorPaul Kocialkowski <contact@paulk.fr>2015-04-10 23:09:51 +0200
committerHans de Goede <hdegoede@redhat.com>2015-04-15 16:33:17 +0200
commitdd82242b4dd7d251ef9ba43563cf9a0017d6f98e (patch)
tree0b34f099304f809a377b1e38e9b7023202337189 /arch
parent1847c1da02be1692441d1bf8998b4a1528b9f868 (diff)
downloadu-boot-imx-dd82242b4dd7d251ef9ba43563cf9a0017d6f98e.zip
u-boot-imx-dd82242b4dd7d251ef9ba43563cf9a0017d6f98e.tar.gz
u-boot-imx-dd82242b4dd7d251ef9ba43563cf9a0017d6f98e.tar.bz2
i2c: mvtwsi: Support for up to 4 different controllers
Orion5x, Kirkwood and Armada XP platforms come with a single TWSI (I2C) MVTWSI controller. However, other platforms using MVTWSI may come with more: this is the case on Allwinner (sunxi) platforms, where up to 4 controllers can be found on the same chip. Signed-off-by: Paul Kocialkowski <contact@paulk.fr> Acked-by: Heiko Schocher <hs@denx.de> Acked-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/include/asm/arch-sunxi/i2c.h2
-rw-r--r--arch/arm/mach-kirkwood/include/mach/config.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/include/asm/arch-sunxi/i2c.h b/arch/arm/include/asm/arch-sunxi/i2c.h
index dc5406b..502e3c6 100644
--- a/arch/arm/include/asm/arch-sunxi/i2c.h
+++ b/arch/arm/include/asm/arch-sunxi/i2c.h
@@ -8,7 +8,7 @@
#include <asm/arch/cpu.h>
-#define CONFIG_I2C_MVTWSI_BASE SUNXI_TWI0_BASE
+#define CONFIG_I2C_MVTWSI_BASE0 SUNXI_TWI0_BASE
/* This is abp0-clk on sun4i/5i/7i / abp1-clk on sun6i/sun8i which is 24MHz */
#define CONFIG_SYS_TCLK 24000000
diff --git a/arch/arm/mach-kirkwood/include/mach/config.h b/arch/arm/mach-kirkwood/include/mach/config.h
index e77ac40..d049395 100644
--- a/arch/arm/mach-kirkwood/include/mach/config.h
+++ b/arch/arm/mach-kirkwood/include/mach/config.h
@@ -44,7 +44,7 @@
#define CONFIG_SYS_INIT_SP_ADDR 0xC8012000
#define CONFIG_NR_DRAM_BANKS_MAX 2
-#define CONFIG_I2C_MVTWSI_BASE KW_TWSI_BASE
+#define CONFIG_I2C_MVTWSI_BASE0 KW_TWSI_BASE
#define MV_UART_CONSOLE_BASE KW_UART0_BASE
#define MV_SATA_BASE KW_SATA_BASE
#define MV_SATA_PORT0_OFFSET KW_SATA_PORT0_OFFSET