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/sbc/sbc-admulti.c | 2 +- arch/arm/mach-uniphier/sbc/sbc-savepin.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'arch/arm/mach-uniphier/sbc') diff --git a/arch/arm/mach-uniphier/sbc/sbc-admulti.c b/arch/arm/mach-uniphier/sbc/sbc-admulti.c index 8e9f8eb..05108dd 100644 --- a/arch/arm/mach-uniphier/sbc/sbc-admulti.c +++ b/arch/arm/mach-uniphier/sbc/sbc-admulti.c @@ -19,7 +19,7 @@ #define SBCTRL1_ADMULTIPLX_MEM_VALUE 0x03005500 #define SBCTRL2_ADMULTIPLX_MEM_VALUE 0x14000010 -int sbc_admulti_init(const struct uniphier_board_data *bd) +int uniphier_sbc_init_admulti(const struct uniphier_board_data *bd) { /* * Only CS1 is connected to support card. diff --git a/arch/arm/mach-uniphier/sbc/sbc-savepin.c b/arch/arm/mach-uniphier/sbc/sbc-savepin.c index e3e3daa..41e9796 100644 --- a/arch/arm/mach-uniphier/sbc/sbc-savepin.c +++ b/arch/arm/mach-uniphier/sbc/sbc-savepin.c @@ -22,7 +22,7 @@ #define SBCTRL2_SAVEPIN_MEM_VALUE 0x34000009 #define SBCTRL4_SAVEPIN_MEM_VALUE 0x02110210 -int sbc_savepin_init(const struct uniphier_board_data *bd) +int uniphier_sbc_init_savepin(const struct uniphier_board_data *bd) { /* * Only CS1 is connected to support card. -- cgit v1.1