diff mbox

[01/23] ARM: u300: fix ages old copy/paste bug

Message ID 1366624283-6122-1-git-send-email-linus.walleij@stericsson.com (mailing list archive)
State New, archived
Headers show

Commit Message

Linus Walleij April 22, 2013, 9:51 a.m. UTC
From: Linus Walleij <linus.walleij@linaro.org>

The UART1 is on the fast AHB bridge, not on the slow bus.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
 arch/arm/mach-u300/include/mach/u300-regs.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Arnd Bergmann April 22, 2013, 11:34 a.m. UTC | #1
On Monday 22 April 2013, Linus Walleij wrote:
> From: Linus Walleij <linus.walleij@linaro.org>
> 
> The UART1 is on the fast AHB bridge, not on the slow bus.
> 
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

Do you want to mark this for stable?

While there are not a lot of people that would need the fix, I think 
we should do it by habit in cases that fit the stable rules.

Acked-by: Arnd Bergmann <arnd@arndb.de>
Linus Walleij April 26, 2013, 1:28 p.m. UTC | #2
On Mon, Apr 22, 2013 at 1:34 PM, Arnd Bergmann <arnd@arndb.de> wrote:
> On Monday 22 April 2013, Linus Walleij wrote:
>> From: Linus Walleij <linus.walleij@linaro.org>
>>
>> The UART1 is on the fast AHB bridge, not on the slow bus.
>>
>> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
>
> Do you want to mark this for stable?
>
> While there are not a lot of people that would need the fix, I think
> we should do it by habit in cases that fit the stable rules.

OK you're right. I'm sending this one separately to
arm@kernel.org as a fix and marked as stable.

Yours,
Linus Walleij
diff mbox

Patch

diff --git a/arch/arm/mach-u300/include/mach/u300-regs.h b/arch/arm/mach-u300/include/mach/u300-regs.h
index 1e49d90..0320495 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