Eliminate the "ph1"_ prefixes from function names because "uniphier_"
describes the SoC familiy better.
Signed-off-by: Masahiro Yamada
---
arch/arm/mach-uniphier/arm32/debug_ll.S| 28 +++
arch/arm/mach-uniphier/bcu/bcu-ld4.c | 2 +-
arch/arm/mach-uniphier/bcu/bcu-sld3.c | 2 +-
arch/arm/mach-uniphier/board_early_init_f.c| 28 +++
arch/arm/mach-uniphier/boards.c| 34
arch/arm/mach-uniphier/boot-mode/boot-device.h | 16 ++--
arch/arm/mach-uniphier/boot-mode/boot-mode-ld4.c | 4 +-
arch/arm/mach-uniphier/boot-mode/boot-mode-pro5.c | 4 +-
arch/arm/mach-uniphier/boot-mode/boot-mode-pxs2.c | 4 +-
arch/arm/mach-uniphier/boot-mode/boot-mode-sld3.c | 4 +-
arch/arm/mach-uniphier/boot-mode/boot-mode.c | 8 +-
arch/arm/mach-uniphier/boot-mode/cmd_pinmon.c | 8 +-
arch/arm/mach-uniphier/clk/clk-ld4.c | 2 +-
arch/arm/mach-uniphier/clk/clk-pro4.c | 2 +-
arch/arm/mach-uniphier/clk/clk-pro5.c | 2 +-
arch/arm/mach-uniphier/clk/clk-pxs2.c | 2 +-
arch/arm/mach-uniphier/dram/ddrphy-ld4.c | 3 +-
arch/arm/mach-uniphier/dram/ddrphy-regs.h | 3 +-
arch/arm/mach-uniphier/dram/umc-ld4.c | 4 +-
arch/arm/mach-uniphier/dram/umc-pro4.c | 4 +-
arch/arm/mach-uniphier/dram/umc-pxs2.c | 2 +-
arch/arm/mach-uniphier/dram/umc-sld8.c | 4 +-
arch/arm/mach-uniphier/early-clk/early-clk-ld4.c | 2 +-
arch/arm/mach-uniphier/early-clk/early-clk-pro5.c | 2 +-
arch/arm/mach-uniphier/early-clk/early-clk-pxs2.c | 2 +-
.../early-pinctrl/early-pinctrl-sld3.c | 2 +-
arch/arm/mach-uniphier/init.h | 94 +++---
arch/arm/mach-uniphier/init/init-ld4.c | 14 ++--
arch/arm/mach-uniphier/init/init-pro4.c| 12 +--
arch/arm/mach-uniphier/init/init-pro5.c| 6 +-
arch/arm/mach-uniphier/init/init-pxs2.c| 10 +--
arch/arm/mach-uniphier/init/init-sld3.c| 16 ++--
arch/arm/mach-uniphier/init/init-sld8.c| 14 ++--
arch/arm/mach-uniphier/init/init.c | 12 +--
arch/arm/mach-uniphier/memconf/memconf-pxs2.c | 2 +-
arch/arm/mach-uniphier/memconf/memconf-sld3.c | 2 +-
arch/arm/mach-uniphier/pinctrl/pinctrl-ld4.c | 2 +-
arch/arm/mach-uniphier/pinctrl/pinctrl-ld6b.c | 2 +-
arch/arm/mach-uniphier/pinctrl/pinctrl-pro4.c | 2 +-
arch/arm/mach-uniphier/pinctrl/pinctrl-pro5.c | 2 +-
arch/arm/mach-uniphier/pinctrl/pinctrl-pxs2.c | 2 +-
arch/arm/mach-uniphier/pinctrl/pinctrl-sld3.c | 2 +-
arch/arm/mach-uniphier/pinctrl/pinctrl-sld8.c | 2 +-
arch/arm/mach-uniphier/pll/pll-init-ld4.c | 2 +-
arch/arm/mach-uniphier/pll/pll-init-pro4.c | 2 +-
arch/arm/mach-uniphier/pll/pll-init-sld3.c | 2 +-
arch/arm/mach-uniphier/pll/pll-init-sld8.c | 2 +-
arch/arm/mach-uniphier/pll/pll-spectrum-ld4.c | 2 +-
arch/arm/mach-uniphier/pll/pll-spectrum-sld3.c | 2 +-
arch/arm/mach-uniphier/sbc/sbc-admulti.c | 2 +-
arch/arm/mach-uniphier/sbc/sbc-savepin.c | 2 +-
51 files changed, 197 insertions(+), 193 deletions(-)
diff --git a/arch/arm/mach-uniphier/arm32/debug_ll.S
b/arch/arm/mach-uniphier/arm32/debug_ll.S
index 5db7427..76631f2 100644
--- a/arch/arm/mach-uniphier/arm32/debug_ll.S
+++ b/arch/arm/mach-uniphier/arm32/debug_ll.S
@@ -29,7 +29,7 @@ ENTRY(debug_ll_init)
#if defined(CONFIG_ARCH_UNIPHIER_SLD3)
#define UNIPHIER_SLD3_UART_CLK 36864000
cmp r1, #0x25
- bne ph1_sld3_end
+ bne sld3_end
sg_set_pinsel 64, 1, 4, 4, r0, r1 @ TXD0 -> TXD0
@@ -45,12 +45,12 @@ ENTRY(debug_ll_init)
ldr r3, =DIV_ROUND(UNIPHIER_SLD3_UART_CLK, 16 * BAUDRATE)
b init_uart
-ph1_sld3_end:
+sld3_end:
#endif
#if defined(CONFIG_ARCH_UNIPHIER_LD4)
#define UNIPHIER_LD4_UART_CLK 36864000
cmp r1, #0x26
- bne ph1_ld4_end
+ bne ld4_end
ldr r0, =SG_IECTRL
ldr r1, [r0]
@@ -62,12 +62,12 @@ ph1_sld3_end:
ldr r3, =DIV_ROUND(UNIPHIER_LD4_UART_CLK, 16 * BAUDRATE)
b init_uart
-ph1_ld4_end:
+ld4_end:
#endif
#if defined(CONFIG_ARCH_UNIPHIER_PRO4)
#define UNIPHIER_PRO4_UART_CLK 73728000
cmp r1, #0x28
- bne ph1_pro4_end
+ bne pro4_end
sg_set_pinsel 128, 0, 4, 8, r0, r1@ TXD0 -> TXD0
@@ -83,12 +83,12 @@ ph1_ld4_end:
ldr r3, =DIV_ROUND(UNIPHIER_PRO4_UART_CLK, 16 * BAUDRATE)
b init_uart
-ph1_pro4_end:
+pro4_end:
#endif
#if defined(CONFIG_ARCH_UNIPHIER_SLD8)
#define UNIPHIER_SLD8_UART_CLK 8000
cmp
