mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-11 15:37:23 +00:00
fc671ed4e3
Commit04cd4e7215
("ARM: uniphier: remove DRAM base address from board parameters") accidentally unset the DRAM_SPARSE flag, and changed the physical map of the DRAM channels. Revive the original behavior. Fixes:04cd4e7215
("ARM: uniphier: remove DRAM base address from board parameters") Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Reported-by: Shunji Sato <sato.shunji@socionext.com>
256 lines
5.1 KiB
C
256 lines
5.1 KiB
C
/*
|
|
* Copyright (C) 2015-2016 Socionext Inc.
|
|
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
|
|
*
|
|
* SPDX-License-Identifier: GPL-2.0+
|
|
*/
|
|
|
|
#include <common.h>
|
|
#include <libfdt.h>
|
|
#include <linux/kernel.h>
|
|
|
|
#include "init.h"
|
|
|
|
DECLARE_GLOBAL_DATA_PTR;
|
|
|
|
#if defined(CONFIG_ARCH_UNIPHIER_SLD3)
|
|
static const struct uniphier_board_data uniphier_sld3_data = {
|
|
.dram_freq = 1600,
|
|
.dram_ch[0] = {
|
|
.size = 0x20000000,
|
|
.width = 32,
|
|
},
|
|
.dram_ch[1] = {
|
|
.size = 0x20000000,
|
|
.width = 16,
|
|
},
|
|
.dram_ch[2] = {
|
|
.size = 0x10000000,
|
|
.width = 16,
|
|
},
|
|
.flags = UNIPHIER_BD_DRAM_SPARSE,
|
|
};
|
|
#endif
|
|
|
|
#if defined(CONFIG_ARCH_UNIPHIER_LD4)
|
|
static const struct uniphier_board_data uniphier_ld4_data = {
|
|
.dram_freq = 1600,
|
|
.dram_ch[0] = {
|
|
.size = 0x10000000,
|
|
.width = 16,
|
|
},
|
|
.dram_ch[1] = {
|
|
.size = 0x10000000,
|
|
.width = 16,
|
|
},
|
|
.flags = UNIPHIER_BD_DDR3PLUS,
|
|
};
|
|
#endif
|
|
|
|
#if defined(CONFIG_ARCH_UNIPHIER_PRO4)
|
|
/* 1GB RAM board */
|
|
static const struct uniphier_board_data uniphier_pro4_data = {
|
|
.dram_freq = 1600,
|
|
.dram_ch[0] = {
|
|
.size = 0x20000000,
|
|
.width = 32,
|
|
},
|
|
.dram_ch[1] = {
|
|
.size = 0x20000000,
|
|
.width = 32,
|
|
},
|
|
};
|
|
|
|
/* 2GB RAM board */
|
|
static const struct uniphier_board_data uniphier_pro4_2g_data = {
|
|
.dram_freq = 1600,
|
|
.dram_ch[0] = {
|
|
.size = 0x40000000,
|
|
.width = 32,
|
|
},
|
|
.dram_ch[1] = {
|
|
.size = 0x40000000,
|
|
.width = 32,
|
|
},
|
|
};
|
|
#endif
|
|
|
|
#if defined(CONFIG_ARCH_UNIPHIER_SLD8)
|
|
static const struct uniphier_board_data uniphier_sld8_data = {
|
|
.dram_freq = 1333,
|
|
.dram_ch[0] = {
|
|
.size = 0x10000000,
|
|
.width = 16,
|
|
},
|
|
.dram_ch[1] = {
|
|
.size = 0x10000000,
|
|
.width = 16,
|
|
},
|
|
.flags = UNIPHIER_BD_DDR3PLUS,
|
|
};
|
|
#endif
|
|
|
|
#if defined(CONFIG_ARCH_UNIPHIER_PRO5)
|
|
static const struct uniphier_board_data uniphier_pro5_data = {
|
|
.dram_freq = 1866,
|
|
.dram_ch[0] = {
|
|
.size = 0x20000000,
|
|
.width = 32,
|
|
},
|
|
.dram_ch[1] = {
|
|
.size = 0x20000000,
|
|
.width = 32,
|
|
},
|
|
};
|
|
#endif
|
|
|
|
#if defined(CONFIG_ARCH_UNIPHIER_PXS2)
|
|
static const struct uniphier_board_data uniphier_pxs2_data = {
|
|
.dram_freq = 2133,
|
|
.dram_ch[0] = {
|
|
.size = 0x40000000,
|
|
.width = 32,
|
|
},
|
|
.dram_ch[1] = {
|
|
.size = 0x20000000,
|
|
.width = 32,
|
|
},
|
|
.dram_ch[2] = {
|
|
.size = 0x20000000,
|
|
.width = 16,
|
|
},
|
|
};
|
|
#endif
|
|
|
|
#if defined(CONFIG_ARCH_UNIPHIER_LD6B)
|
|
static const struct uniphier_board_data uniphier_ld6b_data = {
|
|
.dram_freq = 1866,
|
|
.dram_ch[0] = {
|
|
.size = 0x40000000,
|
|
.width = 32,
|
|
},
|
|
.dram_ch[1] = {
|
|
.size = 0x20000000,
|
|
.width = 32,
|
|
},
|
|
.dram_ch[2] = {
|
|
.size = 0x20000000,
|
|
.width = 16,
|
|
},
|
|
};
|
|
#endif
|
|
|
|
#if defined(CONFIG_ARCH_UNIPHIER_LD11)
|
|
static const struct uniphier_board_data uniphier_ld11_data = {
|
|
.dram_freq = 1600,
|
|
.dram_ch[0] = {
|
|
.size = 0x20000000,
|
|
.width = 16,
|
|
},
|
|
.dram_ch[1] = {
|
|
.size = 0x20000000,
|
|
.width = 16,
|
|
},
|
|
};
|
|
#endif
|
|
|
|
#if defined(CONFIG_ARCH_UNIPHIER_LD20)
|
|
static const struct uniphier_board_data uniphier_ld20_ref_data = {
|
|
.dram_freq = 1866,
|
|
.dram_ch[0] = {
|
|
.size = 0x40000000,
|
|
.width = 32,
|
|
},
|
|
.dram_ch[1] = {
|
|
.size = 0x40000000,
|
|
.width = 32,
|
|
},
|
|
.dram_ch[2] = {
|
|
.size = 0x40000000,
|
|
.width = 32,
|
|
},
|
|
.flags = UNIPHIER_BD_BOARD_LD20_REF,
|
|
};
|
|
|
|
static const struct uniphier_board_data uniphier_ld20_data = {
|
|
.dram_freq = 1866,
|
|
.dram_ch[0] = {
|
|
.size = 0x40000000,
|
|
.width = 32,
|
|
},
|
|
.dram_ch[1] = {
|
|
.size = 0x40000000,
|
|
.width = 32,
|
|
},
|
|
.dram_ch[2] = {
|
|
.size = 0x40000000,
|
|
.width = 32,
|
|
},
|
|
.flags = UNIPHIER_BD_BOARD_LD20_GLOBAL,
|
|
};
|
|
|
|
static const struct uniphier_board_data uniphier_ld21_data = {
|
|
.dram_freq = 1866,
|
|
.dram_ch[0] = {
|
|
.size = 0x20000000,
|
|
.width = 32,
|
|
},
|
|
.dram_ch[1] = {
|
|
.size = 0x40000000,
|
|
.width = 32,
|
|
},
|
|
.flags = UNIPHIER_BD_DRAM_SPARSE | UNIPHIER_BD_BOARD_LD21_GLOBAL,
|
|
};
|
|
#endif
|
|
|
|
struct uniphier_board_id {
|
|
const char *compatible;
|
|
const struct uniphier_board_data *param;
|
|
};
|
|
|
|
static const struct uniphier_board_id uniphier_boards[] = {
|
|
#if defined(CONFIG_ARCH_UNIPHIER_SLD3)
|
|
{ "socionext,uniphier-sld3", &uniphier_sld3_data, },
|
|
#endif
|
|
#if defined(CONFIG_ARCH_UNIPHIER_LD4)
|
|
{ "socionext,uniphier-ld4", &uniphier_ld4_data, },
|
|
#endif
|
|
#if defined(CONFIG_ARCH_UNIPHIER_PRO4)
|
|
{ "socionext,uniphier-pro4-ace", &uniphier_pro4_2g_data, },
|
|
{ "socionext,uniphier-pro4-sanji", &uniphier_pro4_2g_data, },
|
|
{ "socionext,uniphier-pro4", &uniphier_pro4_data, },
|
|
#endif
|
|
#if defined(CONFIG_ARCH_UNIPHIER_SLD8)
|
|
{ "socionext,uniphier-sld8", &uniphier_sld8_data, },
|
|
#endif
|
|
#if defined(CONFIG_ARCH_UNIPHIER_PRO5)
|
|
{ "socionext,uniphier-pro5", &uniphier_pro5_data, },
|
|
#endif
|
|
#if defined(CONFIG_ARCH_UNIPHIER_PXS2)
|
|
{ "socionext,uniphier-pxs2", &uniphier_pxs2_data, },
|
|
#endif
|
|
#if defined(CONFIG_ARCH_UNIPHIER_LD6B)
|
|
{ "socionext,uniphier-ld6b", &uniphier_ld6b_data, },
|
|
#endif
|
|
#if defined(CONFIG_ARCH_UNIPHIER_LD11)
|
|
{ "socionext,uniphier-ld11", &uniphier_ld11_data, },
|
|
#endif
|
|
#if defined(CONFIG_ARCH_UNIPHIER_LD20)
|
|
{ "socionext,uniphier-ld21", &uniphier_ld21_data, },
|
|
{ "socionext,uniphier-ld20-ref", &uniphier_ld20_ref_data, },
|
|
{ "socionext,uniphier-ld20", &uniphier_ld20_data, },
|
|
#endif
|
|
};
|
|
|
|
const struct uniphier_board_data *uniphier_get_board_param(void)
|
|
{
|
|
int i;
|
|
|
|
for (i = 0; i < ARRAY_SIZE(uniphier_boards); i++) {
|
|
if (!fdt_node_check_compatible(gd->fdt_blob, 0,
|
|
uniphier_boards[i].compatible))
|
|
return uniphier_boards[i].param;
|
|
}
|
|
|
|
return NULL;
|
|
}
|