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/boot-mode/boot-mode.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'arch/arm/mach-uniphier/boot-mode/boot-mode.c') diff --git a/arch/arm/mach-uniphier/boot-mode/boot-mode.c b/arch/arm/mach-uniphier/boot-mode/boot-mode.c index 317a4f126c..b08cd6c404 100644 --- a/arch/arm/mach-uniphier/boot-mode/boot-mode.c +++ b/arch/arm/mach-uniphier/boot-mode/boot-mode.c @@ -21,23 +21,23 @@ u32 spl_boot_device_raw(void) switch (uniphier_get_soc_type()) { #if defined(CONFIG_ARCH_UNIPHIER_SLD3) case SOC_UNIPHIER_SLD3: - return ph1_sld3_boot_device(); + return uniphier_sld3_boot_device(); #endif #if defined(CONFIG_ARCH_UNIPHIER_LD4) || defined(CONFIG_ARCH_UNIPHIER_PRO4) || \ defined(CONFIG_ARCH_UNIPHIER_SLD8) case SOC_UNIPHIER_LD4: case SOC_UNIPHIER_PRO4: case SOC_UNIPHIER_SLD8: - return ph1_ld4_boot_device(); + return uniphier_ld4_boot_device(); #endif #if defined(CONFIG_ARCH_UNIPHIER_PRO5) case SOC_UNIPHIER_PRO5: - return ph1_pro5_boot_device(); + return uniphier_pro5_boot_device(); #endif #if defined(CONFIG_ARCH_UNIPHIER_PXS2) || defined(CONFIG_ARCH_UNIPHIER_LD6B) case SOC_UNIPHIER_PXS2: case SOC_UNIPHIER_LD6B: - return proxstream2_boot_device(); + return uniphier_pxs2_boot_device(); #endif default: return BOOT_DEVICE_NONE; -- cgit v1.2.1