diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2013-04-26 15:29:55 +0200 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2013-05-13 15:02:28 +0100 |
| commit | 17ae25f05e68f0caeddf3590a3e67102a847c8f5 (patch) | |
| tree | f8d4d941d13f28f46268a6b4221935e4cb6e5629 | |
| parent | 61578d6be0c28763af82aa3c137773ac455ee88b (diff) | |
| download | kernel_samsung_smdk4412-17ae25f05e68f0caeddf3590a3e67102a847c8f5.zip kernel_samsung_smdk4412-17ae25f05e68f0caeddf3590a3e67102a847c8f5.tar.gz kernel_samsung_smdk4412-17ae25f05e68f0caeddf3590a3e67102a847c8f5.tar.bz2 | |
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>
| -rw-r--r-- | arch/arm/mach-u300/include/mach/u300-regs.h | 2 |
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 035fdc9..a8b71f2 100644 --- 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 /* |