aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-u300
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2013-04-26 15:29:55 +0200
committerOlof Johansson <olof@lixom.net>2013-04-26 17:07:38 -0700
commit0259d9eb30d003af305626db2d8332805696e60d (patch)
treeba5ac0a0442c5b61e83026117c3a5ff5540eff87 /arch/arm/mach-u300
parentARM: OMAP2+: add dependencies on ARCH_MULTI_V6/V7 (diff)
downloadlinux-dev-0259d9eb30d003af305626db2d8332805696e60d.tar.xz
linux-dev-0259d9eb30d003af305626db2d8332805696e60d.zip
ARM: u300: fix ages old copy/paste bug
The UART1 is on the fast AHB bridge, not on the slow bus. Cc: stable@vger.kernel.org Acked-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-u300')
-rw-r--r--arch/arm/mach-u300/include/mach/u300-regs.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-u300/include/mach/u300-regs.h b/arch/arm/mach-u300/include/mach/u300-regs.h
index 1e49d901f2c9..0320495efc4d 100644
--- a/arch/arm/mach-u300/include/mach/u300-regs.h
+++ b/arch/arm/mach-u300/include/mach/u300-regs.h
@@ -95,7 +95,7 @@
#define U300_SPI_BASE (U300_FAST_PER_PHYS_BASE+0x6000)
/* Fast UART1 on U335 only */
-#define U300_UART1_BASE (U300_SLOW_PER_PHYS_BASE+0x7000)
+#define U300_UART1_BASE (U300_FAST_PER_PHYS_BASE+0x7000)
/*
* SLOW peripherals