diff options
| author | Olof Johansson <olof@lixom.net> | 2013-06-14 22:18:25 (GMT) |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-06-14 22:18:25 (GMT) |
| commit | 5ae13ef4e1045d6ec5d445947b42c839b9731bec (patch) | |
| tree | 8cc0d1409f254586cfe81fb08de061df45dbfa2e /arch/arm/include | |
| parent | 01758fe655103338ca80b1cdf527d65fd20a4c0c (diff) | |
| parent | 5fb2038d61ce94e7c9224db2aaff5633ca224953 (diff) | |
| download | linux-fsl-qoriq-5ae13ef4e1045d6ec5d445947b42c839b9731bec.tar.xz | |
Merge tag 'regmap-3.11' of git://git.infradead.org/users/jcooper/linux into next/soc
mvebu register map changes for v3.11
This series removes the hardcoded register base address for mvebu.
Depends:
- mvebu/fixes-non-critical (up to tags/fixes-non-3.11-1)
- mvebu/cleanup (up to tags/cleanup-3.11-3)
* tag 'regmap-3.11' of git://git.infradead.org/users/jcooper/linux:
arm: mvebu: disable DEBUG_LL/EARLY_PRINTK in defconfig
arm: mvebu: add another earlyprintk Kconfig option
arm: mvebu: don't hardcode the physical address for mvebu-mbus
arm: mvebu: don't hardcode a physical address in headsmp.S
arm: mvebu: remove hardcoded static I/O mapping
arm: mvebu: move cache and mvebu-mbus initialization later
arm: mvebu: avoid hardcoded virtual address in coherency code
arm: mvebu: remove dependency of SMP init on static I/O mapping
arm: mvebu: fix length of Ethernet registers area in .dtsi
arm: mvebu: fix length of SATA registers area in .dtsi
arm: mvebu: mark functions of armada-370-xp.c as static
ARM: mvebu: Remove init_irq declaration in machine description
ARM: Orion: Remove redundant init_dma_coherent_pool_size()
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/debug/mvebu.S | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/include/debug/mvebu.S b/arch/arm/include/debug/mvebu.S index df191af..6517311 100644 --- a/arch/arm/include/debug/mvebu.S +++ b/arch/arm/include/debug/mvebu.S @@ -11,7 +11,12 @@ * published by the Free Software Foundation. */ +#ifdef CONFIG_DEBUG_MVEBU_UART_ALTERNATE +#define ARMADA_370_XP_REGS_PHYS_BASE 0xf1000000 +#else #define ARMADA_370_XP_REGS_PHYS_BASE 0xd0000000 +#endif + #define ARMADA_370_XP_REGS_VIRT_BASE 0xfec00000 .macro addruart, rp, rv, tmp |