Skip to content
Snippets Groups Projects
Commit 49fa6ed8 authored by Albert Aribaud's avatar Albert Aribaud Committed by Ben Warren
Browse files

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: default avatarAlbert Aribaud <albert.aribaud@free.fr>
Acked-by: default avatarPrafulla Wadaskar <prafulla@marvell.com>
Signed-off-by: default avatarBen Warren <biggerbadderben@gmail.com>
parent 5b1b1883
No related branches found
No related tags found
No related merge requests found
...@@ -38,6 +38,8 @@ ...@@ -38,6 +38,8 @@
#include <asm/arch/kirkwood.h> #include <asm/arch/kirkwood.h>
#include "kirkwood_egiga.h" #include "kirkwood_egiga.h"
DECLARE_GLOBAL_DATA_PTR;
#define KIRKWOOD_PHY_ADR_REQUEST 0xee #define KIRKWOOD_PHY_ADR_REQUEST 0xee
#define KWGBE_SMI_REG (((struct kwgbe_registers *)KW_EGIGA0_BASE)->smi) #define KWGBE_SMI_REG (((struct kwgbe_registers *)KW_EGIGA0_BASE)->smi)
...@@ -245,9 +247,9 @@ static void set_dram_access(struct kwgbe_registers *regs) ...@@ -245,9 +247,9 @@ static void set_dram_access(struct kwgbe_registers *regs)
/* Enable full access */ /* Enable full access */
win_param.access_ctrl = EWIN_ACCESS_FULL; win_param.access_ctrl = EWIN_ACCESS_FULL;
win_param.high_addr = 0; win_param.high_addr = 0;
/* Get bank base */ /* Get bank base and size */
win_param.base_addr = kw_sdram_bar(i); win_param.base_addr = gd->bd->bi_dram[i].start;
win_param.size = kw_sdram_bs(i); /* Get bank size */ win_param.size = gd->bd->bi_dram[i].size;
if (win_param.size == 0) if (win_param.size == 0)
win_param.enable = 0; win_param.enable = 0;
else else
...@@ -268,7 +270,7 @@ static void set_dram_access(struct kwgbe_registers *regs) ...@@ -268,7 +270,7 @@ static void set_dram_access(struct kwgbe_registers *regs)
win_param.attrib = EBAR_DRAM_CS3; win_param.attrib = EBAR_DRAM_CS3;
break; break;
default: default:
/* invalide bank, disable access */ /* invalid bank, disable access */
win_param.enable = 0; win_param.enable = 0;
win_param.attrib = 0; win_param.attrib = 0;
break; break;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment