From 5b660066464e3270e5b9c236bf15829df868176c Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Wed, 30 Mar 2016 20:17:02 +0900 Subject: ARM: uniphier: rename function names ph1_* to uniphier_* Eliminate the "ph1"_ prefixes from function names because "uniphier_" describes the SoC familiy better. Signed-off-by: Masahiro Yamada --- arch/arm/mach-uniphier/init/init-pxs2.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to '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 2d4b6fbb9b..5e07db18a3 100644 --- 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; -- cgit v1.2.1