Merge branch 'master' of git://git.denx.de/u-boot-arc

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

diff --git a/arch/arm/mach-uniphier/init/init-pro4.c b/arch/arm/mach-uniphier/init/init-pro4.c
index 456fb48bd7136c60353a83500dc64c854f046cb6..3528d84e8d39aab3bea906bb097362d12db0bfdc 100644 (file)
--- a/arch/arm/mach-uniphier/init/init-pro4.c
+++ b/arch/arm/mach-uniphier/init/init-pro4.c
@@ -10,13 +10,13 @@
 #include "../init.h"
 #include "../micro-support-card.h"
 
-int ph1_pro4_init(const struct uniphier_board_data *bd)
+int uniphier_pro4_init(const struct uniphier_board_data *bd)
 {
-       sbc_savepin_init(bd);
+       uniphier_sbc_init_savepin(bd);
 
        support_card_reset();
 
-       ph1_pro4_pll_init(bd);
+       uniphier_pro4_pll_init(bd);
 
        support_card_init();
 
@@ -26,7 +26,7 @@ int ph1_pro4_init(const struct uniphier_board_data *bd)
 
        led_puts("L1");
 
-       ph1_ld4_early_clk_init(bd);
+       uniphier_ld4_early_clk_init(bd);
 
        led_puts("L2");
 
@@ -41,7 +41,7 @@ int ph1_pro4_init(const struct uniphier_board_data *bd)
        {
                int res;
 
-               res = ph1_pro4_umc_init(bd);
+               res = uniphier_pro4_umc_init(bd);
                if (res < 0) {
                        while (1)
                                ;
@@ -50,7 +50,7 @@ int ph1_pro4_init(const struct uniphier_board_data *bd)
 
        led_puts("L5");
 
-       ph1_ld4_enable_dpll_ssc(bd);
+       uniphier_ld4_enable_dpll_ssc(bd);
 
        led_puts("L6");