| From: Linus Walleij <linus.walleij@linaro.org> |
| Date: Fri, 26 Apr 2013 15:29:55 +0200 |
| Subject: ARM: u300: fix ages old copy/paste bug |
| |
| commit 0259d9eb30d003af305626db2d8332805696e60d upstream. |
| |
| The UART1 is on the fast AHB bridge, not on the slow bus. |
| |
| Acked-by: Arnd Bergmann <arnd@arndb.de> |
| Signed-off-by: Linus Walleij <linus.walleij@linaro.org> |
| Signed-off-by: Olof Johansson <olof@lixom.net> |
| [bwh: Backported to 3.2: adjust context] |
| Signed-off-by: Ben Hutchings <ben@decadent.org.uk> |
| --- |
| arch/arm/mach-u300/include/mach/u300-regs.h | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/arch/arm/mach-u300/include/mach/u300-regs.h |
| +++ b/arch/arm/mach-u300/include/mach/u300-regs.h |
| @@ -102,7 +102,7 @@ |
| |
| #ifdef CONFIG_MACH_U300_BS335 |
| /* 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) |
| #endif |
| |
| /* |
