Patchwork [U-Boot] arch-kirkwood: Ethernet port macro returning incorrect address

login
register
mail settings
Submitter Luke Lowrey
Date June 25, 2012, 4:37 p.m.
Message ID <1340642229-13511-1-git-send-email-luke@chamsys.co.uk>
Download mbox | patch
Permalink /patch/167207/
State Accepted
Delegated to: Prafulla Wadaskar
Headers show

Comments

Luke Lowrey - June 25, 2012, 4:37 p.m.
Modified the arch-kirkwood header so KWGBE_PORT_SERIAL_CONTROL1_REG(x)
returns the correct address.

Originally calling KWGBE_PORT_SERIAL_CONTROL1_REG(1) returned the 
address for port 0 and vice versa.

Doesn't have any knock on effects to the u-boot code as the only 
time they're used is to do the same function to both addresses

Signed-off-by: Luke Lowrey <luke@chamsys.co.uk>
---
 arch/arm/include/asm/arch-kirkwood/cpu.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Prafulla Wadaskar - June 26, 2012, 6:37 a.m.
> -----Original Message-----
> From: u-boot-bounces@lists.denx.de [mailto:u-boot-
> bounces@lists.denx.de] On Behalf Of Luke Lowrey
> Sent: 25 June 2012 22:07
> To: u-boot@lists.denx.de
> Subject: [U-Boot] [PATCH] arch-kirkwood: Ethernet port macro returning
> incorrect address
> 
> Modified the arch-kirkwood header so KWGBE_PORT_SERIAL_CONTROL1_REG(x)
> returns the correct address.
> 
> Originally calling KWGBE_PORT_SERIAL_CONTROL1_REG(1) returned the
> address for port 0 and vice versa.
> 
> Doesn't have any knock on effects to the u-boot code as the only
> time they're used is to do the same function to both addresses
> 
> Signed-off-by: Luke Lowrey <luke@chamsys.co.uk>
> ---
>  arch/arm/include/asm/arch-kirkwood/cpu.h |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/arch/arm/include/asm/arch-kirkwood/cpu.h
> b/arch/arm/include/asm/arch-kirkwood/cpu.h
> index d28c51a..784ba87 100644
> --- a/arch/arm/include/asm/arch-kirkwood/cpu.h
> +++ b/arch/arm/include/asm/arch-kirkwood/cpu.h
> @@ -33,7 +33,7 @@
>  			| (attr << 8) | (kw_winctrl_calcsize(size) << 16))
> 
>  #define KWGBE_PORT_SERIAL_CONTROL1_REG(_x)	\
> -		((_x ? KW_EGIGA0_BASE : KW_EGIGA1_BASE) + 0x44c)
> +		((_x ? KW_EGIGA1_BASE : KW_EGIGA0_BASE) + 0x44c)
> 
>  #define KW_REG_PCIE_DEVID		(KW_REG_PCIE_BASE + 0x00)
>  #define KW_REG_PCIE_REVID		(KW_REG_PCIE_BASE + 0x08)
> --

Acked-by: Prafulla Wadaskar <Prafulla@marvell.com>

Regards..
Prafulla . . .
Heiko Schocher - July 3, 2012, 10:45 a.m.
Hello Luke,

On 25.06.2012 18:37, Luke Lowrey wrote:
> Modified the arch-kirkwood header so KWGBE_PORT_SERIAL_CONTROL1_REG(x)
> returns the correct address.
>
> Originally calling KWGBE_PORT_SERIAL_CONTROL1_REG(1) returned the
> address for port 0 and vice versa.
>
> Doesn't have any knock on effects to the u-boot code as the only
> time they're used is to do the same function to both addresses
>
> Signed-off-by: Luke Lowrey<luke@chamsys.co.uk>
> ---
>   arch/arm/include/asm/arch-kirkwood/cpu.h |    2 +-
>   1 files changed, 1 insertions(+), 1 deletions(-)

Acked-by: Heiko Schocher <hs@denx.de>

bye,
Heiko

Patch

diff --git a/arch/arm/include/asm/arch-kirkwood/cpu.h b/arch/arm/include/asm/arch-kirkwood/cpu.h
index d28c51a..784ba87 100644
--- a/arch/arm/include/asm/arch-kirkwood/cpu.h
+++ b/arch/arm/include/asm/arch-kirkwood/cpu.h
@@ -33,7 +33,7 @@ 
 			| (attr << 8) | (kw_winctrl_calcsize(size) << 16))
 
 #define KWGBE_PORT_SERIAL_CONTROL1_REG(_x)	\
-		((_x ? KW_EGIGA0_BASE : KW_EGIGA1_BASE) + 0x44c)
+		((_x ? KW_EGIGA1_BASE : KW_EGIGA0_BASE) + 0x44c)
 
 #define KW_REG_PCIE_DEVID		(KW_REG_PCIE_BASE + 0x00)
 #define KW_REG_PCIE_REVID		(KW_REG_PCIE_BASE + 0x08)