ARM: uniphier: compute SSCPLL values more precisely

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

diff --git a/arch/arm/mach-uniphier/spl_board_init.c b/arch/arm/mach-uniphier/spl_board_init.c
index f4e1cb9c66a663355ee19915244d563463c14d5e..1272b4e25c08b8d75e182695c08a584f3640dc04 100644 (file)
--- a/arch/arm/mach-uniphier/spl_board_init.c
+++ b/arch/arm/mach-uniphier/spl_board_init.c
@@ -14,7 +14,7 @@
 #include "soc-info.h"
 
 struct uniphier_spl_initdata {
-       enum uniphier_soc_id soc_id;
+       unsigned int soc_id;
        void (*bcu_init)(const struct uniphier_board_data *bd);
        void (*early_clk_init)(void);
        int (*dpll_init)(const struct uniphier_board_data *bd);
@@ -24,53 +24,42 @@ struct uniphier_spl_initdata {
 };
 
 static const struct uniphier_spl_initdata uniphier_spl_initdata[] = {
-#if defined(CONFIG_ARCH_UNIPHIER_SLD3)
-       {
-               .soc_id = SOC_UNIPHIER_SLD3,
-               .bcu_init = uniphier_sld3_bcu_init,
-               .early_clk_init = uniphier_sld3_early_clk_init,
-               .dpll_init = uniphier_sld3_dpll_init,
-               .memconf_init = uniphier_memconf_3ch_no_disbit_init,
-               .dram_clk_init = uniphier_sld3_dram_clk_init,
-               .umc_init = uniphier_sld3_umc_init,
-       },
-#endif
 #if defined(CONFIG_ARCH_UNIPHIER_LD4)
        {
-               .soc_id = SOC_UNIPHIER_LD4,
+               .soc_id = UNIPHIER_LD4_ID,
                .bcu_init = uniphier_ld4_bcu_init,
-               .early_clk_init = uniphier_sld3_early_clk_init,
+               .early_clk_init = uniphier_ld4_early_clk_init,
                .dpll_init = uniphier_ld4_dpll_init,
                .memconf_init = uniphier_memconf_2ch_init,
-               .dram_clk_init = uniphier_sld3_dram_clk_init,
+               .dram_clk_init = uniphier_ld4_dram_clk_init,
                .umc_init = uniphier_ld4_umc_init,
        },
 #endif
 #if defined(CONFIG_ARCH_UNIPHIER_PRO4)
        {
-               .soc_id = SOC_UNIPHIER_PRO4,
-               .early_clk_init = uniphier_sld3_early_clk_init,
+               .soc_id = UNIPHIER_PRO4_ID,
+               .early_clk_init = uniphier_ld4_early_clk_init,
                .dpll_init = uniphier_pro4_dpll_init,
                .memconf_init = uniphier_memconf_2ch_init,
-               .dram_clk_init = uniphier_sld3_dram_clk_init,
+               .dram_clk_init = uniphier_ld4_dram_clk_init,
                .umc_init = uniphier_pro4_umc_init,
        },
 #endif
 #if defined(CONFIG_ARCH_UNIPHIER_SLD8)
        {
-               .soc_id = SOC_UNIPHIER_SLD8,
+               .soc_id = UNIPHIER_SLD8_ID,
                .bcu_init = uniphier_ld4_bcu_init,
-               .early_clk_init = uniphier_sld3_early_clk_init,
+               .early_clk_init = uniphier_ld4_early_clk_init,
                .dpll_init = uniphier_sld8_dpll_init,
                .memconf_init = uniphier_memconf_2ch_init,
-               .dram_clk_init = uniphier_sld3_dram_clk_init,
+               .dram_clk_init = uniphier_ld4_dram_clk_init,
                .umc_init = uniphier_sld8_umc_init,
        },
 #endif
 #if defined(CONFIG_ARCH_UNIPHIER_PRO5)
        {
-               .soc_id = SOC_UNIPHIER_PRO5,
-               .early_clk_init = uniphier_sld3_early_clk_init,
+               .soc_id = UNIPHIER_PRO5_ID,
+               .early_clk_init = uniphier_ld4_early_clk_init,
                .dpll_init = uniphier_pro5_dpll_init,
                .memconf_init = uniphier_memconf_2ch_init,
                .dram_clk_init = uniphier_pro5_dram_clk_init,
@@ -79,8 +68,8 @@ static const struct uniphier_spl_initdata uniphier_spl_initdata[] = {
 #endif
 #if defined(CONFIG_ARCH_UNIPHIER_PXS2)
        {
-               .soc_id = SOC_UNIPHIER_PXS2,
-               .early_clk_init = uniphier_sld3_early_clk_init,
+               .soc_id = UNIPHIER_PXS2_ID,
+               .early_clk_init = uniphier_ld4_early_clk_init,
                .dpll_init = uniphier_pxs2_dpll_init,
                .memconf_init = uniphier_memconf_3ch_init,
                .dram_clk_init = uniphier_pxs2_dram_clk_init,
@@ -89,54 +78,21 @@ static const struct uniphier_spl_initdata uniphier_spl_initdata[] = {
 #endif
 #if defined(CONFIG_ARCH_UNIPHIER_LD6B)
        {
-               .soc_id = SOC_UNIPHIER_LD6B,
-               .early_clk_init = uniphier_sld3_early_clk_init,
+               .soc_id = UNIPHIER_LD6B_ID,
+               .early_clk_init = uniphier_ld4_early_clk_init,
                .dpll_init = uniphier_pxs2_dpll_init,
                .memconf_init = uniphier_memconf_3ch_init,
                .dram_clk_init = uniphier_pxs2_dram_clk_init,
                .umc_init = uniphier_pxs2_umc_init,
        },
 #endif
-#if defined(CONFIG_ARCH_UNIPHIER_LD11)
-       {
-               .soc_id = SOC_UNIPHIER_LD11,
-               .early_clk_init = uniphier_ld11_early_clk_init,
-               .dpll_init = uniphier_ld11_dpll_init,
-               .memconf_init = uniphier_memconf_2ch_init,
-               .dram_clk_init = uniphier_ld11_dram_clk_init,
-               .umc_init = uniphier_ld11_umc_init,
-       },
-#endif
-#if defined(CONFIG_ARCH_UNIPHIER_LD20)
-       {
-               .soc_id = SOC_UNIPHIER_LD20,
-               .early_clk_init = uniphier_ld11_early_clk_init,
-               .dpll_init = uniphier_ld20_dpll_init,
-               .memconf_init = uniphier_memconf_3ch_init,
-               .dram_clk_init = uniphier_ld20_dram_clk_init,
-               .umc_init = uniphier_ld20_umc_init,
-       },
-#endif
 };
-
-static const struct uniphier_spl_initdata *uniphier_get_spl_initdata(
-                                               enum uniphier_soc_id soc_id)
-{
-       int i;
-
-       for (i = 0; i < ARRAY_SIZE(uniphier_spl_initdata); i++) {
-               if (uniphier_spl_initdata[i].soc_id == soc_id)
-                       return &uniphier_spl_initdata[i];
-       }
-
-       return NULL;
-}
+UNIPHIER_DEFINE_SOCDATA_FUNC(uniphier_get_spl_initdata, uniphier_spl_initdata)
 
 void spl_board_init(void)
 {
        const struct uniphier_board_data *bd;
        const struct uniphier_spl_initdata *initdata;
-       enum uniphier_soc_id soc_id;
        int ret;
 
 #ifdef CONFIG_DEBUG_UART
@@ -147,18 +103,15 @@ void spl_board_init(void)
        if (!bd)
                hang();
 
-       soc_id = uniphier_get_soc_type();
-       initdata = uniphier_get_spl_initdata(soc_id);
+       initdata = uniphier_get_spl_initdata();
        if (!initdata)
                hang();
 
        if (initdata->bcu_init)
                initdata->bcu_init(bd);
 
-
        initdata->early_clk_init();
 
-
 #ifdef CONFIG_SPL_SERIAL_SUPPORT
        preloader_console_init();
 #endif