thunderx: Calculate TCR dynamically

[u-boot] / arch / arm / mach-uniphier / boards.c

diff --git a/arch/arm/mach-uniphier/boards.c b/arch/arm/mach-uniphier/boards.c
index d075a11ca2092fb06d31a2cc0723f63bdef72e82..408aff0cd0bbb268877274b6c82a89509f90b3d1 100644 (file)
--- a/arch/arm/mach-uniphier/boards.c
+++ b/arch/arm/mach-uniphier/boards.c
@@ -7,100 +7,161 @@
 #include <common.h>
 #include <libfdt.h>
 #include <linux/kernel.h>
-#include <mach/init.h>
+
+#include "init.h"
 
 DECLARE_GLOBAL_DATA_PTR;
 
 #if defined(CONFIG_ARCH_UNIPHIER_PH1_SLD3)
 static const struct uniphier_board_data ph1_sld3_data = {
-       .dram_ch0_base  = 0x80000000,
-       .dram_ch0_size  = 0x20000000,
-       .dram_ch0_width = 32,
-       .dram_ch1_base  = 0xc0000000,
-       .dram_ch1_size  = 0x20000000,
-       .dram_ch1_width = 16,
-       .dram_ch2_base  = 0xc0000000,
-       .dram_ch2_size  = 0x10000000,
-       .dram_ch2_width = 16,
-       .dram_freq      = 1600,
+       .dram_freq = 1600,
+       .dram_nr_ch = 3,
+       .dram_ch[0] = {
+               .base = 0x80000000,
+               .size = 0x20000000,
+               .width = 32,
+       },
+       .dram_ch[1] = {
+               .base = 0xc0000000,
+               .size = 0x20000000,
+               .width = 16,
+       },
+       .dram_ch[2] = {
+               .base = 0xc0000000,
+               .size = 0x10000000,
+               .width = 16,
+       },
 };
 #endif
 
 #if defined(CONFIG_ARCH_UNIPHIER_PH1_LD4)
 static const struct uniphier_board_data ph1_ld4_data = {
-       .dram_ch0_base  = 0x80000000,
-       .dram_ch0_size  = 0x10000000,
-       .dram_ch0_width = 16,
-       .dram_ch1_base  = 0x90000000,
-       .dram_ch1_size  = 0x10000000,
-       .dram_ch1_width = 16,
-       .dram_freq      = 1600,
+       .dram_freq = 1600,
+       .dram_nr_ch = 2,
+       .dram_ddr3plus = true,
+       .dram_ch[0] = {
+               .base = 0x80000000,
+               .size = 0x10000000,
+               .width = 16,
+       },
+       .dram_ch[1] = {
+               .base = 0x90000000,
+               .size = 0x10000000,
+               .width = 16,
+       },
 };
 #endif
 
 #if defined(CONFIG_ARCH_UNIPHIER_PH1_PRO4)
+/* 1GB RAM board */
 static const struct uniphier_board_data ph1_pro4_data = {
-       .dram_ch0_base  = 0x80000000,
-       .dram_ch0_size  = 0x20000000,
-       .dram_ch0_width = 32,
-       .dram_ch1_base  = 0xa0000000,
-       .dram_ch1_size  = 0x20000000,
-       .dram_ch1_width = 32,
-       .dram_freq      = 1600,
+       .dram_freq = 1600,
+       .dram_nr_ch = 2,
+       .dram_ch[0] = {
+               .base = 0x80000000,
+               .size = 0x20000000,
+               .width = 32,
+       },
+       .dram_ch[1] = {
+               .base = 0xa0000000,
+               .size = 0x20000000,
+               .width = 32,
+       },
+};
+
+/* 2GB RAM board */
+static const struct uniphier_board_data ph1_pro4_2g_data = {
+       .dram_freq = 1600,
+       .dram_nr_ch = 2,
+       .dram_ch[0] = {
+               .base = 0x80000000,
+               .size = 0x40000000,
+               .width = 32,
+       },
+       .dram_ch[1] = {
+               .base = 0xc0000000,
+               .size = 0x40000000,
+               .width = 32,
+       },
 };
 #endif
 
 #if defined(CONFIG_ARCH_UNIPHIER_PH1_SLD8)
 static const struct uniphier_board_data ph1_sld8_data = {
-       .dram_ch0_base  = 0x80000000,
-       .dram_ch0_size  = 0x10000000,
-       .dram_ch0_width = 16,
-       .dram_ch1_base  = 0x90000000,
-       .dram_ch1_size  = 0x10000000,
-       .dram_ch1_width = 16,
-       .dram_freq      = 1333,
+       .dram_freq = 1333,
+       .dram_nr_ch = 2,
+       .dram_ddr3plus = true,
+       .dram_ch[0] = {
+               .base = 0x80000000,
+               .size = 0x10000000,
+               .width = 16,
+       },
+       .dram_ch[1] = {
+               .base = 0x90000000,
+               .size = 0x10000000,
+               .width = 16,
+       },
 };
 #endif
 
 #if defined(CONFIG_ARCH_UNIPHIER_PH1_PRO5)
 static const struct uniphier_board_data ph1_pro5_data = {
-       .dram_ch0_base  = 0x80000000,
-       .dram_ch0_size  = 0x20000000,
-       .dram_ch0_width = 32,
-       .dram_ch1_base  = 0xa0000000,
-       .dram_ch1_size  = 0x20000000,
-       .dram_ch1_width = 32,
-       .dram_freq      = 1866,
+       .dram_freq = 1866,
+       .dram_nr_ch = 2,
+       .dram_ch[0] = {
+               .base = 0x80000000,
+               .size = 0x20000000,
+               .width = 32,
+       },
+       .dram_ch[1] = {
+               .base = 0xa0000000,
+               .size = 0x20000000,
+               .width = 32,
+       },
 };
 #endif
 
 #if defined(CONFIG_ARCH_UNIPHIER_PROXSTREAM2)
 static const struct uniphier_board_data proxstream2_data = {
-       .dram_ch0_base  = 0x80000000,
-       .dram_ch0_size  = 0x40000000,
-       .dram_ch0_width = 32,
-       .dram_ch1_base  = 0xc0000000,
-       .dram_ch1_size  = 0x20000000,
-       .dram_ch1_width = 32,
-       .dram_ch2_base  = 0xe0000000,
-       .dram_ch2_size  = 0x20000000,
-       .dram_ch2_width = 16,
-       .dram_freq      = 2133,
+       .dram_freq = 2133,
+       .dram_nr_ch = 3,
+       .dram_ch[0] = {
+               .base = 0x80000000,
+               .size = 0x40000000,
+               .width = 32,
+       },
+       .dram_ch[1] = {
+               .base = 0xc0000000,
+               .size = 0x20000000,
+               .width = 32,
+       },
+       .dram_ch[2] = {
+               .base = 0xe0000000,
+               .size = 0x20000000,
+               .width = 16,
+       },
 };
 #endif
 
 #if defined(CONFIG_ARCH_UNIPHIER_PH1_LD6B)
 static const struct uniphier_board_data ph1_ld6b_data = {
-       .dram_ch0_base  = 0x80000000,
-       .dram_ch0_size  = 0x40000000,
-       .dram_ch0_width = 32,
-       .dram_ch1_base  = 0xc0000000,
-       .dram_ch1_size  = 0x20000000,
-       .dram_ch1_width = 32,
-       .dram_ch2_base  = 0xe0000000,
-       .dram_ch2_size  = 0x20000000,
-       .dram_ch2_width = 16,
-       .dram_freq      = 1866,
+       .dram_freq = 1866,
+       .dram_nr_ch = 3,
+       .dram_ch[0] = {
+               .base = 0x80000000,
+               .size = 0x40000000,
+               .width = 32,
+       },
+       .dram_ch[1] = {
+               .base = 0xc0000000,
+               .size = 0x20000000,
+               .width = 32,
+       },
+       .dram_ch[2] = {
+               .base = 0xe0000000,
+               .size = 0x20000000,
+               .width = 16,
+       },
 };
 #endif
 
@@ -117,6 +178,8 @@ static const struct uniphier_board_id uniphier_boards[] = {
        { "socionext,ph1-ld4", &ph1_ld4_data, },
 #endif
 #if defined(CONFIG_ARCH_UNIPHIER_PH1_PRO4)
+       { "socionext,ph1-pro4-ace", &ph1_pro4_2g_data, },
+       { "socionext,ph1-pro4-sanji", &ph1_pro4_2g_data, },
        { "socionext,ph1-pro4", &ph1_pro4_data, },
 #endif
 #if defined(CONFIG_ARCH_UNIPHIER_PH1_SLD8)