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 <yamada.masahiro@socionext.com>

7 files changed, 42 insertions, 42 deletions

diff --git a/arch/arm/mach-uniphier/init/init-ld4.c b/arch/arm/mach-uniphier/init/init-ld4.c
index 5295cd0316..b1c9b5dcd6 100644
--- a/arch/arm/mach-uniphier/init/init-ld4.c
+++ b/arch/arm/mach-uniphier/init/init-ld4.c
@@ -10,16 +10,16 @@
 #include "../init.h"
 #include "../micro-support-card.h"
 
-int ph1_ld4_init(const struct uniphier_board_data *bd)
+int uniphier_ld4_init(const struct uniphier_board_data *bd)
 {
-	ph1_ld4_bcu_init(bd);
+	uniphier_ld4_bcu_init(bd);
 
-	sbc_savepin_init(bd);
+	uniphier_sbc_init_savepin(bd);
 	uniphier_ld4_sbc_init(bd);
 
 	support_card_reset();
 
-	ph1_ld4_pll_init(bd);
+	uniphier_ld4_pll_init(bd);
 
 	support_card_init();
 
@@ -29,7 +29,7 @@ int ph1_ld4_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");
 
@@ -44,7 +44,7 @@ int ph1_ld4_init(const struct uniphier_board_data *bd)
 	{
 		int res;
 
-		res = ph1_ld4_umc_init(bd);
+		res = uniphier_ld4_umc_init(bd);
 		if (res < 0) {
 			while (1)
 				;
@@ -53,7 +53,7 @@ int ph1_ld4_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");
 
diff --git a/arch/arm/mach-uniphier/init/init-pro4.c b/arch/arm/mach-uniphier/init/init-pro4.c
index 456fb48bd7..3528d84e8d 100644
--- 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");
 
diff --git a/arch/arm/mach-uniphier/init/init-pro5.c b/arch/arm/mach-uniphier/init/init-pro5.c
index c2c68031b4..c809ae740d 100644
--- a/arch/arm/mach-uniphier/init/init-pro5.c
+++ b/arch/arm/mach-uniphier/init/init-pro5.c
@@ -10,9 +10,9 @@
 #include "../init.h"
 #include "../micro-support-card.h"
 
-int ph1_pro5_init(const struct uniphier_board_data *bd)
+int uniphier_pro5_init(const struct uniphier_board_data *bd)
 {
-	sbc_savepin_init(bd);
+	uniphier_sbc_init_savepin(bd);
 
 	support_card_reset();
 
@@ -24,7 +24,7 @@ int ph1_pro5_init(const struct uniphier_board_data *bd)
 
 	led_puts("L1");
 
-	ph1_pro5_early_clk_init(bd);
+	uniphier_pro5_early_clk_init(bd);
 
 	led_puts("L2");
 
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;
 
diff --git a/arch/arm/mach-uniphier/init/init-sld3.c b/arch/arm/mach-uniphier/init/init-sld3.c
index c48126fd1c..473e0c8831 100644
--- a/arch/arm/mach-uniphier/init/init-sld3.c
+++ b/arch/arm/mach-uniphier/init/init-sld3.c
@@ -10,31 +10,31 @@
 #include "../init.h"
 #include "../micro-support-card.h"
 
-int ph1_sld3_init(const struct uniphier_board_data *bd)
+int uniphier_sld3_init(const struct uniphier_board_data *bd)
 {
-	ph1_sld3_bcu_init(bd);
+	uniphier_sld3_bcu_init(bd);
 
-	sbc_admulti_init(bd);
+	uniphier_sbc_init_admulti(bd);
 	uniphier_sld3_sbc_init(bd);
 
 	support_card_reset();
 
-	ph1_sld3_pll_init(bd);
+	uniphier_sld3_pll_init(bd);
 
 	support_card_init();
 
 	led_puts("L0");
 
 	memconf_init(bd);
-	ph1_sld3_memconf_init(bd);
+	uniphier_sld3_memconf_init(bd);
 
 	led_puts("L1");
 
-	ph1_ld4_early_clk_init(bd);
+	uniphier_ld4_early_clk_init(bd);
 
 	led_puts("L2");
 
-	ph1_sld3_early_pin_init(bd);
+	uniphier_sld3_early_pin_init(bd);
 
 	led_puts("L3");
 
@@ -46,7 +46,7 @@ int ph1_sld3_init(const struct uniphier_board_data *bd)
 
 	led_puts("L5");
 
-	ph1_sld3_enable_dpll_ssc(bd);
+	uniphier_sld3_enable_dpll_ssc(bd);
 
 	led_puts("L6");
 
diff --git a/arch/arm/mach-uniphier/init/init-sld8.c b/arch/arm/mach-uniphier/init/init-sld8.c
index 1f31ca697b..07c6d60ad1 100644
--- a/arch/arm/mach-uniphier/init/init-sld8.c
+++ b/arch/arm/mach-uniphier/init/init-sld8.c
@@ -10,16 +10,16 @@
 #include "../init.h"
 #include "../micro-support-card.h"
 
-int ph1_sld8_init(const struct uniphier_board_data *bd)
+int uniphier_sld8_init(const struct uniphier_board_data *bd)
 {
-	ph1_ld4_bcu_init(bd);
+	uniphier_ld4_bcu_init(bd);
 
-	sbc_savepin_init(bd);
+	uniphier_sbc_init_savepin(bd);
 	uniphier_ld4_sbc_init(bd);
 
 	support_card_reset();
 
-	ph1_sld8_pll_init(bd);
+	uniphier_sld8_pll_init(bd);
 
 	support_card_init();
 
@@ -29,7 +29,7 @@ int ph1_sld8_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");
 
@@ -44,7 +44,7 @@ int ph1_sld8_init(const struct uniphier_board_data *bd)
 	{
 		int res;
 
-		res = ph1_sld8_umc_init(bd);
+		res = uniphier_sld8_umc_init(bd);
 		if (res < 0) {
 			while (1)
 				;
@@ -53,7 +53,7 @@ int ph1_sld8_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");
 
diff --git a/arch/arm/mach-uniphier/init/init.c b/arch/arm/mach-uniphier/init/init.c
index 7316d51df5..c56c44c070 100644
--- a/arch/arm/mach-uniphier/init/init.c
+++ b/arch/arm/mach-uniphier/init/init.c
@@ -26,33 +26,33 @@ void spl_board_init(void)
 	switch (uniphier_get_soc_type()) {
 #if defined(CONFIG_ARCH_UNIPHIER_SLD3)
 	case SOC_UNIPHIER_SLD3:
-		ph1_sld3_init(param);
+		uniphier_sld3_init(param);
 		break;
 #endif
 #if defined(CONFIG_ARCH_UNIPHIER_LD4)
 	case SOC_UNIPHIER_LD4:
-		ph1_ld4_init(param);
+		uniphier_ld4_init(param);
 		break;
 #endif
 #if defined(CONFIG_ARCH_UNIPHIER_PRO4)
 	case SOC_UNIPHIER_PRO4:
-		ph1_pro4_init(param);
+		uniphier_pro4_init(param);
 		break;
 #endif
 #if defined(CONFIG_ARCH_UNIPHIER_SLD8)
 	case SOC_UNIPHIER_SLD8:
-		ph1_sld8_init(param);
+		uniphier_sld8_init(param);
 		break;
 #endif
 #if defined(CONFIG_ARCH_UNIPHIER_PRO5)
 	case SOC_UNIPHIER_PRO5:
-		ph1_pro5_init(param);
+		uniphier_pro5_init(param);
 		break;
 #endif
 #if defined(CONFIG_ARCH_UNIPHIER_PXS2) || defined(CONFIG_ARCH_UNIPHIER_LD6B)
 	case SOC_UNIPHIER_PXS2:
 	case SOC_UNIPHIER_LD6B:
-		proxstream2_init(param);
+		uniphier_pxs2_init(param);
 		break;
 #endif
 	default: