aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Lowrey <luke@chamsys.co.uk>2012-06-25 06:37:09 +0000
committerPrafulla Wadaskar <prafulla@marvell.com>2013-01-09 04:12:11 +0530
commit3e75e69668bd5be89aad835f1e990badf921f2e4 (patch)
treec7eb10cba072197c610dc907c9f218f85c986c11
parent23c9946a3bfc23e3ede8995437d6b0e3b7b1335c (diff)
downloadu-boot-linaro-stable-3e75e69668bd5be89aad835f1e990badf921f2e4.tar.gz
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> Acked-by: Prafulla Wadaskar <Prafulla@marvell.com> Acked-by: Heiko Schocher <hs@denx.de>
-rw-r--r--arch/arm/include/asm/arch-kirkwood/cpu.h2
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 57bfe8e78..009a6bb8f 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)