Merge git://git.denx.de/u-boot-fsl-qoriq

[oweals/u-boot.git] / board / ti / ks2_evm / board_k2l.c

diff --git a/board/ti/ks2_evm/board_k2l.c b/board/ti/ks2_evm/board_k2l.c
index d750ad3c0b057d6159775f387569478d548ed81d..c65f33131da0cf21f4a654fac81188004b7581fc 100644 (file)
--- a/board/ti/ks2_evm/board_k2l.c
+++ b/board/ti/ks2_evm/board_k2l.c
@@ -14,13 +14,33 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-unsigned int external_clk[ext_clk_count] = {
-       [sys_clk]       = 122880000,
-       [alt_core_clk]  = 100000000,
-       [pa_clk]        = 122880000,
-       [tetris_clk]    = 122880000,
-       [ddr3a_clk]     = 100000000,
-};
+unsigned int get_external_clk(u32 clk)
+{
+       unsigned int clk_freq;
+
+       switch (clk) {
+       case sys_clk:
+               clk_freq = 122880000;
+               break;
+       case alt_core_clk:
+               clk_freq = 100000000;
+               break;
+       case pa_clk:
+               clk_freq = 122880000;
+               break;
+       case tetris_clk:
+               clk_freq = 122880000;
+               break;
+       case ddr3a_clk:
+               clk_freq = 100000000;
+               break;
+       default:
+               clk_freq = 0;
+               break;
+       }
+
+       return clk_freq;
+}
 
 static struct pll_init_data core_pll_config[NUM_SPDS] = {
        [SPD800]        = CORE_PLL_799,
@@ -50,11 +70,11 @@ struct pll_init_data *get_pll_init_data(int pll)
 
        switch (pll) {
        case MAIN_PLL:
-               speed = get_max_dev_speed();
+               speed = get_max_dev_speed(speeds);
                data = &core_pll_config[speed];
                break;
        case TETRIS_PLL:
-               speed = get_max_arm_speed();
+               speed = get_max_arm_speed(speeds);
                data = &tetris_pll_config[speed];
                break;
        case PASS_PLL:
@@ -118,6 +138,16 @@ int board_early_init_f(void)
 }
 #endif
 
+#if defined(CONFIG_MULTI_DTB_FIT)
+int board_fit_config_name_match(const char *name)
+{
+       if (!strcmp(name, "keystone-k2l-evm"))
+               return 0;
+
+       return -1;
+}
+#endif
+
 #ifdef CONFIG_SPL_BUILD
 void spl_init_keystone_plls(void)
 {