summaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorAlbert Aribaud <albert.aribaud@free.fr>2010-07-05 20:15:25 +0200
committerBen Warren <biggerbadderben@gmail.com>2010-07-12 00:11:27 -0700
commit49fa6ed8c9f9665bee01645b7186b8d9e074634b (patch)
tree97ac6feb960d2342926afde0180059589c0c5451 /drivers/net
parent5b1b1883ffcb75de71a0b4e66b279c88ae1e15fc (diff)
downloadu-boot-imx-49fa6ed8c9f9665bee01645b7186b8d9e074634b.zip
u-boot-imx-49fa6ed8c9f9665bee01645b7186b8d9e074634b.tar.gz
u-boot-imx-49fa6ed8c9f9665bee01645b7186b8d9e074634b.tar.bz2
kirkwood_egiga: updates: fix DRAM mapping and typo
DRAM window mapping uses kirkwood-provided functions instead of global gd as do other drivers--fix this. Also, fix a typo in a comment Signed-off-by: Albert Aribaud <albert.aribaud@free.fr> Acked-by: Prafulla Wadaskar <prafulla@marvell.com> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/kirkwood_egiga.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/net/kirkwood_egiga.c b/drivers/net/kirkwood_egiga.c
index ea0c522..dca9f11 100644
--- a/drivers/net/kirkwood_egiga.c
+++ b/drivers/net/kirkwood_egiga.c
@@ -38,6 +38,8 @@
#include <asm/arch/kirkwood.h>
#include "kirkwood_egiga.h"
+DECLARE_GLOBAL_DATA_PTR;
+
#define KIRKWOOD_PHY_ADR_REQUEST 0xee
#define KWGBE_SMI_REG (((struct kwgbe_registers *)KW_EGIGA0_BASE)->smi)
@@ -245,9 +247,9 @@ static void set_dram_access(struct kwgbe_registers *regs)
/* Enable full access */
win_param.access_ctrl = EWIN_ACCESS_FULL;
win_param.high_addr = 0;
- /* Get bank base */
- win_param.base_addr = kw_sdram_bar(i);
- win_param.size = kw_sdram_bs(i); /* Get bank size */
+ /* Get bank base and size */
+ win_param.base_addr = gd->bd->bi_dram[i].start;
+ win_param.size = gd->bd->bi_dram[i].size;
if (win_param.size == 0)
win_param.enable = 0;
else
@@ -268,7 +270,7 @@ static void set_dram_access(struct kwgbe_registers *regs)
win_param.attrib = EBAR_DRAM_CS3;
break;
default:
- /* invalide bank, disable access */
+ /* invalid bank, disable access */
win_param.enable = 0;
win_param.attrib = 0;
break;