projects / profile / ivi / kernel-x86-ivi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 4b0ed69)
ARM: u300: fix ages old copy/paste bug
authorLinus Walleij <linus.walleij@linaro.org>
Fri, 26 Apr 2013 13:29:55 +0000 (15:29 +0200)
committerOlof Johansson <olof@lixom.net>
Sat, 27 Apr 2013 00:07:38 +0000 (17:07 -0700)
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>
arch/arm/mach-u300/include/mach/u300-regs.h patch | blob | history

diff --git a/arch/arm/mach-u300/include/mach/u300-regs.h b/arch/arm/mach-u300/include/mach/u300-regs.h
index 1e49d901f2c9212d665848a13c7d2099f5a8d3a9..0320495efc4d6ac6a3d49d3d96b6fcd9f3f0185f 100644 (file)
--- 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
Domain: System / Uncategorized;