Skip to content

Commit df7c71f

Browse files
SamulKyullSamulKyull
SamulKyull
authored and
SamulKyull
committed
[board] add avaota 86box
1 parent 3d67398 commit df7c71f

File tree

1 file changed

+11
-9
lines changed

1 file changed

+11
-9
lines changed

src/drivers/chips/sun8iw20/sys-dram.c

+11-9
Original file line numberDiff line numberDiff line change
@@ -698,7 +698,7 @@ static void mctl_phy_ac_remapping(dram_para_t *para) {
698698
cfg = ac_remapping_tables[0];
699699
} else if (para->dram_tpr13 & 0xc0000) {
700700
printk_debug("DDR Using MAP: 7 \n");
701-
cfg = ac_remapping_tables[10];
701+
cfg = ac_remapping_tables[7];
702702
} else {
703703
switch (fuse) {
704704
case 8:
@@ -731,19 +731,21 @@ static void mctl_phy_ac_remapping(dram_para_t *para) {
731731
}
732732
}
733733

734-
val = (cfg[1] << 10) | (32 * cfg[0]) | 1 | (cfg[2] << 15) | (cfg[3] << 20) |
735-
(cfg[4] << 25);
734+
/* set remapping */
735+
val = (cfg[0] << 5) | (cfg[1] << 10) | (cfg[2] << 15) | (cfg[3] << 20) | (cfg[4] << 25);
736736
writel(val, (MCTL_COM_BASE + MCTL_COM_REMAP0));
737-
val = (cfg[7] << 10) | (32 * cfg[6]) | cfg[5] | (cfg[8] << 15) |
738-
(cfg[9] << 20) | (cfg[10] << 25);
737+
val = (cfg[5] << 0) | (cfg[6] << 5) | (cfg[7] << 10) | (cfg[8] << 15) | (cfg[9] << 20) | (cfg[10] << 25);
739738
writel(val, (MCTL_COM_BASE + MCTL_COM_REMAP1));
740-
val = (cfg[13] << 10) | (32 * cfg[12]) | cfg[11] | (cfg[14] << 15) |
741-
(cfg[15] << 20);
739+
val = (cfg[11] << 0) | (cfg[12] << 5) | (cfg[13] << 10) | (cfg[14] << 15) | (cfg[15] << 20);
742740
writel(val, (MCTL_COM_BASE + MCTL_COM_REMAP2));
743-
val = (cfg[18] << 10) | (32 * cfg[17]) | cfg[16] | (cfg[19] << 15) |
744-
(cfg[20] << 20) | (cfg[21] << 25);
741+
val = (cfg[16] << 0) | (cfg[17] << 5) | (cfg[18] << 10) | (cfg[19] << 15) | (cfg[20] << 20) | (cfg[21] << 25);
745742
writel(val, (MCTL_COM_BASE + MCTL_COM_REMAP3));
746743

744+
/* enable ac remapping */
745+
val = readl(MCTL_COM_BASE + MCTL_COM_REMAP0);
746+
val |= BIT(0);
747+
writel(val, (MCTL_COM_BASE + MCTL_COM_REMAP0));
748+
747749
printk_trace("MCTL_COM_REMAP0 = 0x%x\n",
748750
readl((MCTL_COM_BASE + MCTL_COM_REMAP0)));
749751
printk_trace("MCTL_COM_REMAP1 = 0x%x\n",

0 commit comments

Comments
 (0)