ARM: uniphier: reuse uniphier_cache_disable() for lowlevel_init

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

diff --git a/arch/arm/mach-uniphier/init/init-pxs2.c b/arch/arm/mach-uniphier/init/init-pxs2.c
index 2d4b6fbb9bf5feaacb6ad2f11da167979dcfc71e..5e07db18a3d7842a470491c4975971cfbc1ea9b0 100644 (file)
--- a/arch/arm/mach-uniphier/init/init-pxs2.c
+++ b/arch/arm/mach-uniphier/init/init-pxs2.c
@@ -10,11 +10,11 @@
 #include "../init.h"
 #include "../micro-support-card.h"
 
-int proxstream2_init(const struct uniphier_board_data *bd)
+int uniphier_pxs2_init(const struct uniphier_board_data *bd)
 {
        int ret;
 
-       sbc_savepin_init(bd);
+       uniphier_sbc_init_savepin(bd);
        uniphier_pxs2_sbc_init(bd);
 
        support_card_reset();
@@ -24,11 +24,11 @@ int proxstream2_init(const struct uniphier_board_data *bd)
        led_puts("L0");
 
        memconf_init(bd);
-       proxstream2_memconf_init(bd);
+       uniphier_pxs2_memconf_init(bd);
 
        led_puts("L1");
 
-       proxstream2_early_clk_init(bd);
+       uniphier_pxs2_early_clk_init(bd);
 
        led_puts("L2");
 
@@ -40,7 +40,7 @@ int proxstream2_init(const struct uniphier_board_data *bd)
 
        led_puts("L4");
 
-       ret = proxstream2_umc_init(bd);
+       ret = uniphier_pxs2_umc_init(bd);
        if (ret)
                return ret;