summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2016-04-12 09:10:54 -0400
committerTom Rini <trini@konsulko.com>2016-04-12 09:10:54 -0400
commit39fbd987164336adc2ff7e5ab7a4268b8dcdee92 (patch)
treef24aa70332c5a6f7c406927c7aed4c966ee145df /arch/arm
parentec770dba89533ca49b1bdc7d2c49c2d01fcdf406 (diff)
parentaca84a214d70953505d56b7c9717d1a7c019902c (diff)
downloadtalos-obmc-uboot-39fbd987164336adc2ff7e5ab7a4268b8dcdee92.tar.gz
talos-obmc-uboot-39fbd987164336adc2ff7e5ab7a4268b8dcdee92.zip
Merge git://www.denx.de/git/u-boot-marvell
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-mvebu/include/mach/soc.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-mvebu/include/mach/soc.h b/arch/arm/mach-mvebu/include/mach/soc.h
index a12be2a4d1..13c9f29c14 100644
--- a/arch/arm/mach-mvebu/include/mach/soc.h
+++ b/arch/arm/mach-mvebu/include/mach/soc.h
@@ -55,6 +55,7 @@
#define MVEBU_L2_CACHE_BASE (MVEBU_REGISTER(0x08000))
#define CONFIG_SYS_PL310_BASE MVEBU_L2_CACHE_BASE
#define MVEBU_TWSI_BASE (MVEBU_REGISTER(0x11000))
+#define MVEBU_TWSI1_BASE (MVEBU_REGISTER(0x11100))
#define MVEBU_MPP_BASE (MVEBU_REGISTER(0x18000))
#define MVEBU_GPIO0_BASE (MVEBU_REGISTER(0x18100))
#define MVEBU_GPIO1_BASE (MVEBU_REGISTER(0x18140))
OpenPOWER on IntegriCloud