diff --git a/arch/arm/mach-uniphier/Kconfig b/arch/arm/mach-uniphier/Kconfig
index 660f83c..8dc6f98 100644
--- a/arch/arm/mach-uniphier/Kconfig
+++ b/arch/arm/mach-uniphier/Kconfig
@@ -5,9 +5,9 @@ config SYS_CONFIG_NAME
 
 choice
         prompt "UniPhier SoC select"
-        default ARCH_UNIPHIER_PH1_PRO4
+        default ARCH_UNIPHIER_PRO4
 
-config ARCH_UNIPHIER_PH1_SLD3
+config ARCH_UNIPHIER_SLD3
 	bool "UniPhier PH1-sLD3 SoC"
 	select CPU_V7
 
@@ -15,7 +15,7 @@ config ARCH_UNIPHIER_LD4_SLD8
 	bool "UniPhier PH1-LD4/PH1-sLD8 SoC"
 	select CPU_V7
 
-config ARCH_UNIPHIER_PH1_PRO4
+config ARCH_UNIPHIER_PRO4
 	bool "UniPhier PH1-Pro4 SoC"
 	select CPU_V7
 
@@ -25,27 +25,27 @@ config ARCH_UNIPHIER_PRO5_PXS2_LD6B
 
 endchoice
 
-config ARCH_UNIPHIER_PH1_LD4
+config ARCH_UNIPHIER_LD4
 	bool "Enable UniPhier PH1-LD4 SoC support"
 	depends on ARCH_UNIPHIER_LD4_SLD8
 	default y
 
-config ARCH_UNIPHIER_PH1_SLD8
+config ARCH_UNIPHIER_SLD8
 	bool "Enable UniPhier PH1-sLD8 SoC support"
 	depends on ARCH_UNIPHIER_LD4_SLD8
 	default y
 
-config ARCH_UNIPHIER_PH1_PRO5
+config ARCH_UNIPHIER_PRO5
 	bool "Enable UniPhier PH1-Pro5 SoC support"
 	depends on ARCH_UNIPHIER_PRO5_PXS2_LD6B
 	default y
 
-config ARCH_UNIPHIER_PROXSTREAM2
+config ARCH_UNIPHIER_PXS2
 	bool "Enable UniPhier ProXstream2 SoC support"
 	depends on ARCH_UNIPHIER_PRO5_PXS2_LD6B
 	default y
 
-config ARCH_UNIPHIER_PH1_LD6B
+config ARCH_UNIPHIER_LD6B
 	bool "Enable UniPhier PH1-LD6b SoC support"
 	depends on ARCH_UNIPHIER_PRO5_PXS2_LD6B
 	default y
@@ -68,15 +68,14 @@ config CMD_PINMON
 
 config CMD_DDRPHY_DUMP
 	bool "Enable dump command of DDR PHY parameters"
-	depends on ARCH_UNIPHIER_PH1_LD4 || ARCH_UNIPHIER_PH1_PRO4 || \
-		   ARCH_UNIPHIER_PH1_SLD8
+	depends on ARCH_UNIPHIER_LD4 || ARCH_UNIPHIER_PRO4 || ARCH_UNIPHIER_SLD8
 	help
 	  The command "ddrphy" shows the resulting parameters of DDR PHY
 	  training; it is useful for the evaluation of DDR PHY training.
 
 config CMD_DDRMPHY_DUMP
 	bool "Enable dump command of DDR Multi PHY parameters"
-	depends on ARCH_UNIPHIER_PROXSTREAM2 || ARCH_UNIPHIER_PH1_LD6B
+	depends on ARCH_UNIPHIER_PXS2 || ARCH_UNIPHIER_LD6B
 	help
 	  The command "ddrmphy" shows the resulting parameters of DDR Multi PHY
 	  training; it is useful for the evaluation of DDR Multi PHY training.
diff --git a/arch/arm/mach-uniphier/arm32/debug_ll.S b/arch/arm/mach-uniphier/arm32/debug_ll.S
index 8e4943c..5db7427 100644
--- a/arch/arm/mach-uniphier/arm32/debug_ll.S
+++ b/arch/arm/mach-uniphier/arm32/debug_ll.S
@@ -26,8 +26,8 @@ ENTRY(debug_ll_init)
 	and		r1, r1, #SG_REVISION_TYPE_MASK
 	mov		r1, r1, lsr #SG_REVISION_TYPE_SHIFT
 
-#if defined(CONFIG_ARCH_UNIPHIER_PH1_SLD3)
-#define PH1_SLD3_UART_CLK		36864000
+#if defined(CONFIG_ARCH_UNIPHIER_SLD3)
+#define UNIPHIER_SLD3_UART_CLK		36864000
 	cmp		r1, #0x25
 	bne		ph1_sld3_end
 
@@ -42,13 +42,13 @@ ENTRY(debug_ll_init)
 	orr		r1, r1, #SC_CLKCTRL_CEN_PERI
 	str		r1, [r0]
 
-	ldr		r3, =DIV_ROUND(PH1_SLD3_UART_CLK, 16 * BAUDRATE)
+	ldr		r3, =DIV_ROUND(UNIPHIER_SLD3_UART_CLK, 16 * BAUDRATE)
 
 	b		init_uart
 ph1_sld3_end:
 #endif
-#if defined(CONFIG_ARCH_UNIPHIER_PH1_LD4)
-#define PH1_LD4_UART_CLK		36864000
+#if defined(CONFIG_ARCH_UNIPHIER_LD4)
+#define UNIPHIER_LD4_UART_CLK		36864000
 	cmp		r1, #0x26
 	bne		ph1_ld4_end
 
@@ -59,13 +59,13 @@ ph1_sld3_end:
 
 	sg_set_pinsel	88, 1, 8, 4, r0, r1	@ HSDOUT6 -> TXD0
 
-	ldr		r3, =DIV_ROUND(PH1_LD4_UART_CLK, 16 * BAUDRATE)
+	ldr		r3, =DIV_ROUND(UNIPHIER_LD4_UART_CLK, 16 * BAUDRATE)
 
 	b		init_uart
 ph1_ld4_end:
 #endif
-#if defined(CONFIG_ARCH_UNIPHIER_PH1_PRO4)
-#define PH1_PRO4_UART_CLK		73728000
+#if defined(CONFIG_ARCH_UNIPHIER_PRO4)
+#define UNIPHIER_PRO4_UART_CLK		73728000
 	cmp		r1, #0x28
 	bne		ph1_pro4_end
 
@@ -80,13 +80,13 @@ ph1_ld4_end:
 	orr		r1, r1, #SC_CLKCTRL_CEN_PERI
 	str		r1, [r0]
 
-	ldr		r3, =DIV_ROUND(PH1_PRO4_UART_CLK, 16 * BAUDRATE)
+	ldr		r3, =DIV_ROUND(UNIPHIER_PRO4_UART_CLK, 16 * BAUDRATE)
 
 	b		init_uart
 ph1_pro4_end:
 #endif
-#if defined(CONFIG_ARCH_UNIPHIER_PH1_SLD8)
-#define PH1_SLD8_UART_CLK		80000000
+#if defined(CONFIG_ARCH_UNIPHIER_SLD8)
+#define UNIPHIER_SLD8_UART_CLK		80000000
 	cmp		r1, #0x29
 	bne		ph1_sld8_end
 
@@ -97,13 +97,13 @@ ph1_pro4_end:
 
 	sg_set_pinsel	70, 3, 8, 4, r0, r1	@ HSDOUT0 -> TXD0
 
-	ldr		r3, =DIV_ROUND(PH1_SLD8_UART_CLK, 16 * BAUDRATE)
+	ldr		r3, =DIV_ROUND(UNIPHIER_SLD8_UART_CLK, 16 * BAUDRATE)
 
 	b		init_uart
 ph1_sld8_end:
 #endif
-#if defined(CONFIG_ARCH_UNIPHIER_PH1_PRO5)
-#define PH1_PRO5_UART_CLK		73728000
+#if defined(CONFIG_ARCH_UNIPHIER_PRO5)
+#define UNIPHIER_PRO5_UART_CLK		73728000
 	cmp		r1, #0x2A
 	bne		ph1_pro5_end
 
@@ -121,13 +121,13 @@ ph1_sld8_end:
 	orr		r1, r1, #SC_CLKCTRL_CEN_PERI
 	str		r1, [r0]
 
-	ldr		r3, =DIV_ROUND(PH1_PRO5_UART_CLK, 16 * BAUDRATE)
+	ldr		r3, =DIV_ROUND(UNIPHIER_PRO5_UART_CLK, 16 * BAUDRATE)
 
 	b		init_uart
 ph1_pro5_end:
 #endif
-#if defined(CONFIG_ARCH_UNIPHIER_PROXSTREAM2)
-#define PROXSTREAM2_UART_CLK		88900000
+#if defined(CONFIG_ARCH_UNIPHIER_PXS2)
+#define UNIPHIER_PXS2_UART_CLK		88900000
 	cmp		r1, #0x2E
 	bne		proxstream2_end
 
@@ -146,13 +146,13 @@ ph1_pro5_end:
 	orr		r1, r1, #SC_CLKCTRL_CEN_PERI
 	str		r1, [r0]
 
-	ldr		r3, =DIV_ROUND(PROXSTREAM2_UART_CLK, 16 * BAUDRATE)
+	ldr		r3, =DIV_ROUND(UNIPHIER_PXS2_UART_CLK, 16 * BAUDRATE)
 
 	b		init_uart
 proxstream2_end:
 #endif
-#if defined(CONFIG_ARCH_UNIPHIER_PH1_LD6B)
-#define PH1_LD6B_UART_CLK		88900000
+#if defined(CONFIG_ARCH_UNIPHIER_LD6B)
+#define UNIPHIER_LD6B_UART_CLK		88900000
 	cmp		r1, #0x2F
 	bne		ph1_ld6b_end
 
@@ -170,7 +170,7 @@ proxstream2_end:
 	orr		r1, r1, #SC_CLKCTRL_CEN_PERI
 	str		r1, [r0]
 
-	ldr		r3, =DIV_ROUND(PH1_LD6B_UART_CLK, 16 * BAUDRATE)
+	ldr		r3, =DIV_ROUND(UNIPHIER_LD6B_UART_CLK, 16 * BAUDRATE)
 
 	b		init_uart
 ph1_ld6b_end:
diff --git a/arch/arm/mach-uniphier/bcu/Makefile b/arch/arm/mach-uniphier/bcu/Makefile
index b8b0323..02107b3 100644
--- a/arch/arm/mach-uniphier/bcu/Makefile
+++ b/arch/arm/mach-uniphier/bcu/Makefile
@@ -2,6 +2,6 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-obj-$(CONFIG_ARCH_UNIPHIER_PH1_SLD3)	+= bcu-ph1-sld3.o
-obj-$(CONFIG_ARCH_UNIPHIER_PH1_LD4)	+= bcu-ph1-ld4.o
-obj-$(CONFIG_ARCH_UNIPHIER_PH1_SLD8)	+= bcu-ph1-ld4.o
+obj-$(CONFIG_ARCH_UNIPHIER_SLD3)	+= bcu-sld3.o
+obj-$(CONFIG_ARCH_UNIPHIER_LD4)		+= bcu-ld4.o
+obj-$(CONFIG_ARCH_UNIPHIER_SLD8)	+= bcu-ld4.o
diff --git a/arch/arm/mach-uniphier/bcu/bcu-ph1-ld4.c b/arch/arm/mach-uniphier/bcu/bcu-ld4.c
similarity index 100%
rename from arch/arm/mach-uniphier/bcu/bcu-ph1-ld4.c
rename to arch/arm/mach-uniphier/bcu/bcu-ld4.c
diff --git a/arch/arm/mach-uniphier/bcu/bcu-ph1-sld3.c b/arch/arm/mach-uniphier/bcu/bcu-sld3.c
similarity index 100%
rename from arch/arm/mach-uniphier/bcu/bcu-ph1-sld3.c
rename to arch/arm/mach-uniphier/bcu/bcu-sld3.c
diff --git a/arch/arm/mach-uniphier/board_early_init_f.c b/arch/arm/mach-uniphier/board_early_init_f.c
index 824da25..8e568ee 100644
--- a/arch/arm/mach-uniphier/board_early_init_f.c
+++ b/arch/arm/mach-uniphier/board_early_init_f.c
@@ -13,50 +13,50 @@ int board_early_init_f(void)
 	led_puts("U0");
 
 	switch (uniphier_get_soc_type()) {
-#if defined(CONFIG_ARCH_UNIPHIER_PH1_SLD3)
-	case SOC_UNIPHIER_PH1_SLD3:
+#if defined(CONFIG_ARCH_UNIPHIER_SLD3)
+	case SOC_UNIPHIER_SLD3:
 		ph1_sld3_pin_init();
 		led_puts("U1");
 		ph1_ld4_clk_init();
 		break;
 #endif
-#if defined(CONFIG_ARCH_UNIPHIER_PH1_LD4)
-	case SOC_UNIPHIER_PH1_LD4:
+#if defined(CONFIG_ARCH_UNIPHIER_LD4)
+	case SOC_UNIPHIER_LD4:
 		ph1_ld4_pin_init();
 		led_puts("U1");
 		ph1_ld4_clk_init();
 		break;
 #endif
-#if defined(CONFIG_ARCH_UNIPHIER_PH1_PRO4)
-	case SOC_UNIPHIER_PH1_PRO4:
+#if defined(CONFIG_ARCH_UNIPHIER_PRO4)
+	case SOC_UNIPHIER_PRO4:
 		ph1_pro4_pin_init();
 		led_puts("U1");
 		ph1_pro4_clk_init();
 		break;
 #endif
-#if defined(CONFIG_ARCH_UNIPHIER_PH1_SLD8)
-	case SOC_UNIPHIER_PH1_SLD8:
+#if defined(CONFIG_ARCH_UNIPHIER_SLD8)
+	case SOC_UNIPHIER_SLD8:
 		ph1_sld8_pin_init();
 		led_puts("U1");
 		ph1_ld4_clk_init();
 		break;
 #endif
-#if defined(CONFIG_ARCH_UNIPHIER_PH1_PRO5)
-	case SOC_UNIPHIER_PH1_PRO5:
+#if defined(CONFIG_ARCH_UNIPHIER_PRO5)
+	case SOC_UNIPHIER_PRO5:
 		ph1_pro5_pin_init();
 		led_puts("U1");
 		ph1_pro5_clk_init();
 		break;
 #endif
-#if defined(CONFIG_ARCH_UNIPHIER_PROXSTREAM2)
-	case SOC_UNIPHIER_PROXSTREAM2:
+#if defined(CONFIG_ARCH_UNIPHIER_PXS2)
+	case SOC_UNIPHIER_PXS2:
 		proxstream2_pin_init();
 		led_puts("U1");
 		proxstream2_clk_init();
 		break;
 #endif
-#if defined(CONFIG_ARCH_UNIPHIER_PH1_LD6B)
-	case SOC_UNIPHIER_PH1_LD6B:
+#if defined(CONFIG_ARCH_UNIPHIER_LD6B)
+	case SOC_UNIPHIER_LD6B:
 		ph1_ld6b_pin_init();
 		led_puts("U1");
 		proxstream2_clk_init();
diff --git a/arch/arm/mach-uniphier/boards.c b/arch/arm/mach-uniphier/boards.c
index 408aff0..5e98c3f 100644
--- a/arch/arm/mach-uniphier/boards.c
+++ b/arch/arm/mach-uniphier/boards.c
@@ -12,7 +12,7 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#if defined(CONFIG_ARCH_UNIPHIER_PH1_SLD3)
+#if defined(CONFIG_ARCH_UNIPHIER_SLD3)
 static const struct uniphier_board_data ph1_sld3_data = {
 	.dram_freq = 1600,
 	.dram_nr_ch = 3,
@@ -34,7 +34,7 @@ static const struct uniphier_board_data ph1_sld3_data = {
 };
 #endif
 
-#if defined(CONFIG_ARCH_UNIPHIER_PH1_LD4)
+#if defined(CONFIG_ARCH_UNIPHIER_LD4)
 static const struct uniphier_board_data ph1_ld4_data = {
 	.dram_freq = 1600,
 	.dram_nr_ch = 2,
@@ -52,7 +52,7 @@ static const struct uniphier_board_data ph1_ld4_data = {
 };
 #endif
 
-#if defined(CONFIG_ARCH_UNIPHIER_PH1_PRO4)
+#if defined(CONFIG_ARCH_UNIPHIER_PRO4)
 /* 1GB RAM board */
 static const struct uniphier_board_data ph1_pro4_data = {
 	.dram_freq = 1600,
@@ -86,7 +86,7 @@ static const struct uniphier_board_data ph1_pro4_2g_data = {
 };
 #endif
 
-#if defined(CONFIG_ARCH_UNIPHIER_PH1_SLD8)
+#if defined(CONFIG_ARCH_UNIPHIER_SLD8)
 static const struct uniphier_board_data ph1_sld8_data = {
 	.dram_freq = 1333,
 	.dram_nr_ch = 2,
@@ -104,7 +104,7 @@ static const struct uniphier_board_data ph1_sld8_data = {
 };
 #endif
 
-#if defined(CONFIG_ARCH_UNIPHIER_PH1_PRO5)
+#if defined(CONFIG_ARCH_UNIPHIER_PRO5)
 static const struct uniphier_board_data ph1_pro5_data = {
 	.dram_freq = 1866,
 	.dram_nr_ch = 2,
@@ -121,7 +121,7 @@ static const struct uniphier_board_data ph1_pro5_data = {
 };
 #endif
 
-#if defined(CONFIG_ARCH_UNIPHIER_PROXSTREAM2)
+#if defined(CONFIG_ARCH_UNIPHIER_PXS2)
 static const struct uniphier_board_data proxstream2_data = {
 	.dram_freq = 2133,
 	.dram_nr_ch = 3,
@@ -143,7 +143,7 @@ static const struct uniphier_board_data proxstream2_data = {
 };
 #endif
 
-#if defined(CONFIG_ARCH_UNIPHIER_PH1_LD6B)
+#if defined(CONFIG_ARCH_UNIPHIER_LD6B)
 static const struct uniphier_board_data ph1_ld6b_data = {
 	.dram_freq = 1866,
 	.dram_nr_ch = 3,
@@ -171,27 +171,27 @@ struct uniphier_board_id {
 };
 
 static const struct uniphier_board_id uniphier_boards[] = {
-#if defined(CONFIG_ARCH_UNIPHIER_PH1_SLD3)
+#if defined(CONFIG_ARCH_UNIPHIER_SLD3)
 	{ "socionext,ph1-sld3", &ph1_sld3_data, },
 #endif
-#if defined(CONFIG_ARCH_UNIPHIER_PH1_LD4)
+#if defined(CONFIG_ARCH_UNIPHIER_LD4)
 	{ "socionext,ph1-ld4", &ph1_ld4_data, },
 #endif
-#if defined(CONFIG_ARCH_UNIPHIER_PH1_PRO4)
+#if defined(CONFIG_ARCH_UNIPHIER_PRO4)
 	{ "socionext,ph1-pro4-ace", &ph1_pro4_2g_data, },
 	{ "socionext,ph1-pro4-sanji", &ph1_pro4_2g_data, },
 	{ "socionext,ph1-pro4", &ph1_pro4_data, },
 #endif
-#if defined(CONFIG_ARCH_UNIPHIER_PH1_SLD8)
+#if defined(CONFIG_ARCH_UNIPHIER_SLD8)
 	{ "socionext,ph1-sld8", &ph1_sld8_data, },
 #endif
-#if defined(CONFIG_ARCH_UNIPHIER_PH1_PRO5)
+#if defined(CONFIG_ARCH_UNIPHIER_PRO5)
 	{ "socionext,ph1-pro5", &ph1_pro5_data, },
 #endif
-#if defined(CONFIG_ARCH_UNIPHIER_PROXSTREAM2)
+#if defined(CONFIG_ARCH_UNIPHIER_PXS2)
 	{ "socionext,proxstream2", &proxstream2_data, },
 #endif
-#if defined(CONFIG_ARCH_UNIPHIER_PH1_LD6B)
+#if defined(CONFIG_ARCH_UNIPHIER_LD6B)
 	{ "socionext,ph1-ld6b", &ph1_ld6b_data, },
 #endif
 };
diff --git a/arch/arm/mach-uniphier/boot-mode/Makefile b/arch/arm/mach-uniphier/boot-mode/Makefile
index be0de8f..278df64 100644
--- a/arch/arm/mach-uniphier/boot-mode/Makefile
+++ b/arch/arm/mach-uniphier/boot-mode/Makefile
@@ -4,12 +4,12 @@
 
 obj-y					+= boot-mode.o
 
-obj-$(CONFIG_ARCH_UNIPHIER_PH1_SLD3)	+= boot-mode-ph1-sld3.o
-obj-$(CONFIG_ARCH_UNIPHIER_PH1_LD4)	+= boot-mode-ph1-ld4.o
-obj-$(CONFIG_ARCH_UNIPHIER_PH1_PRO4)	+= boot-mode-ph1-ld4.o
-obj-$(CONFIG_ARCH_UNIPHIER_PH1_SLD8)	+= boot-mode-ph1-ld4.o
-obj-$(CONFIG_ARCH_UNIPHIER_PH1_PRO5)	+= boot-mode-ph1-pro5.o
-obj-$(CONFIG_ARCH_UNIPHIER_PROXSTREAM2)	+= boot-mode-proxstream2.o
-obj-$(CONFIG_ARCH_UNIPHIER_PH1_LD6B)	+= boot-mode-proxstream2.o
+obj-$(CONFIG_ARCH_UNIPHIER_SLD3)	+= boot-mode-sld3.o
+obj-$(CONFIG_ARCH_UNIPHIER_LD4)		+= boot-mode-ld4.o
+obj-$(CONFIG_ARCH_UNIPHIER_PRO4)	+= boot-mode-ld4.o
+obj-$(CONFIG_ARCH_UNIPHIER_SLD8)	+= boot-mode-ld4.o
+obj-$(CONFIG_ARCH_UNIPHIER_PRO5)	+= boot-mode-pro5.o
+obj-$(CONFIG_ARCH_UNIPHIER_PXS2)	+= boot-mode-pxs2.o
+obj-$(CONFIG_ARCH_UNIPHIER_LD6B)	+= boot-mode-pxs2.o
 
 obj-$(CONFIG_CMD_PINMON) += cmd_pinmon.o
diff --git a/arch/arm/mach-uniphier/boot-mode/boot-mode-ph1-ld4.c b/arch/arm/mach-uniphier/boot-mode/boot-mode-ld4.c
similarity index 100%
rename from arch/arm/mach-uniphier/boot-mode/boot-mode-ph1-ld4.c
rename to arch/arm/mach-uniphier/boot-mode/boot-mode-ld4.c
diff --git a/arch/arm/mach-uniphier/boot-mode/boot-mode-ph1-pro5.c b/arch/arm/mach-uniphier/boot-mode/boot-mode-pro5.c
similarity index 100%
rename from arch/arm/mach-uniphier/boot-mode/boot-mode-ph1-pro5.c
rename to arch/arm/mach-uniphier/boot-mode/boot-mode-pro5.c
diff --git a/arch/arm/mach-uniphier/boot-mode/boot-mode-proxstream2.c b/arch/arm/mach-uniphier/boot-mode/boot-mode-pxs2.c
similarity index 100%
rename from arch/arm/mach-uniphier/boot-mode/boot-mode-proxstream2.c
rename to arch/arm/mach-uniphier/boot-mode/boot-mode-pxs2.c
diff --git a/arch/arm/mach-uniphier/boot-mode/boot-mode-ph1-sld3.c b/arch/arm/mach-uniphier/boot-mode/boot-mode-sld3.c
similarity index 100%
rename from arch/arm/mach-uniphier/boot-mode/boot-mode-ph1-sld3.c
rename to arch/arm/mach-uniphier/boot-mode/boot-mode-sld3.c
diff --git a/arch/arm/mach-uniphier/boot-mode/boot-mode.c b/arch/arm/mach-uniphier/boot-mode/boot-mode.c
index cf39bf5..317a4f1 100644
--- a/arch/arm/mach-uniphier/boot-mode/boot-mode.c
+++ b/arch/arm/mach-uniphier/boot-mode/boot-mode.c
@@ -19,26 +19,24 @@ u32 spl_boot_device_raw(void)
 		return BOOT_DEVICE_NOR;
 
 	switch (uniphier_get_soc_type()) {
-#if defined(CONFIG_ARCH_UNIPHIER_PH1_SLD3)
-	case SOC_UNIPHIER_PH1_SLD3:
+#if defined(CONFIG_ARCH_UNIPHIER_SLD3)
+	case SOC_UNIPHIER_SLD3:
 		return ph1_sld3_boot_device();
 #endif
-#if defined(CONFIG_ARCH_UNIPHIER_PH1_LD4) || \
-	defined(CONFIG_ARCH_UNIPHIER_PH1_PRO4) || \
-	defined(CONFIG_ARCH_UNIPHIER_PH1_SLD8)
-	case SOC_UNIPHIER_PH1_LD4:
-	case SOC_UNIPHIER_PH1_PRO4:
-	case SOC_UNIPHIER_PH1_SLD8:
+#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();
 #endif
-#if defined(CONFIG_ARCH_UNIPHIER_PH1_PRO5)
-	case SOC_UNIPHIER_PH1_PRO5:
+#if defined(CONFIG_ARCH_UNIPHIER_PRO5)
+	case SOC_UNIPHIER_PRO5:
 		return ph1_pro5_boot_device();
 #endif
-#if defined(CONFIG_ARCH_UNIPHIER_PROXSTREAM2) || \
-	defined(CONFIG_ARCH_UNIPHIER_PH1_LD6B)
-	case SOC_UNIPHIER_PROXSTREAM2:
-	case SOC_UNIPHIER_PH1_LD6B:
+#if defined(CONFIG_ARCH_UNIPHIER_PXS2) || defined(CONFIG_ARCH_UNIPHIER_LD6B)
+	case SOC_UNIPHIER_PXS2:
+	case SOC_UNIPHIER_LD6B:
 		return proxstream2_boot_device();
 #endif
 	default:
diff --git a/arch/arm/mach-uniphier/boot-mode/cmd_pinmon.c b/arch/arm/mach-uniphier/boot-mode/cmd_pinmon.c
index 3ff756b..3a66e2b 100644
--- a/arch/arm/mach-uniphier/boot-mode/cmd_pinmon.c
+++ b/arch/arm/mach-uniphier/boot-mode/cmd_pinmon.c
@@ -15,29 +15,27 @@ static int do_pinmon(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 	printf("Boot Swap: %s\n\n", boot_is_swapped() ? "ON" : "OFF");
 
 	switch (uniphier_get_soc_type()) {
-#if defined(CONFIG_ARCH_UNIPHIER_PH1_SLD3)
-	case SOC_UNIPHIER_PH1_SLD3:
+#if defined(CONFIG_ARCH_UNIPHIER_SLD3)
+	case SOC_UNIPHIER_SLD3:
 		ph1_sld3_boot_mode_show();
 		break;
 #endif
-#if defined(CONFIG_ARCH_UNIPHIER_PH1_LD4) || \
-	defined(CONFIG_ARCH_UNIPHIER_PH1_PRO4) || \
-	defined(CONFIG_ARCH_UNIPHIER_PH1_SLD8)
-	case SOC_UNIPHIER_PH1_LD4:
-	case SOC_UNIPHIER_PH1_PRO4:
-	case SOC_UNIPHIER_PH1_SLD8:
+#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:
 		ph1_ld4_boot_mode_show();
 		break;
 #endif
-#if defined(CONFIG_ARCH_UNIPHIER_PH1_PRO5)
-	case SOC_UNIPHIER_PH1_PRO5:
+#if defined(CONFIG_ARCH_UNIPHIER_PRO5)
+	case SOC_UNIPHIER_PRO5:
 		ph1_pro5_boot_mode_show();
 		break;
 #endif
-#if defined(CONFIG_ARCH_UNIPHIER_PROXSTREAM2) || \
-	defined(CONFIG_ARCH_UNIPHIER_PH1_LD6B)
-	case SOC_UNIPHIER_PROXSTREAM2:
-	case SOC_UNIPHIER_PH1_LD6B:
+#if defined(CONFIG_ARCH_UNIPHIER_PXS2) || defined(CONFIG_ARCH_UNIPHIER_LD6B)
+	case SOC_UNIPHIER_PXS2:
+	case SOC_UNIPHIER_LD6B:
 		proxstream2_boot_mode_show();
 		break;
 #endif
diff --git a/arch/arm/mach-uniphier/clk/Makefile b/arch/arm/mach-uniphier/clk/Makefile
index bc0f27c..1d736a5 100644
--- a/arch/arm/mach-uniphier/clk/Makefile
+++ b/arch/arm/mach-uniphier/clk/Makefile
@@ -2,10 +2,10 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-obj-$(CONFIG_ARCH_UNIPHIER_PH1_SLD3)	+= clk-ph1-ld4.o
-obj-$(CONFIG_ARCH_UNIPHIER_PH1_LD4)	+= clk-ph1-ld4.o
-obj-$(CONFIG_ARCH_UNIPHIER_PH1_PRO4)	+= clk-ph1-pro4.o
-obj-$(CONFIG_ARCH_UNIPHIER_PH1_SLD8)	+= clk-ph1-ld4.o
-obj-$(CONFIG_ARCH_UNIPHIER_PH1_PRO5)	+= clk-ph1-pro5.o
-obj-$(CONFIG_ARCH_UNIPHIER_PROXSTREAM2)	+= clk-proxstream2.o
-obj-$(CONFIG_ARCH_UNIPHIER_PH1_LD6B)	+= clk-proxstream2.o
+obj-$(CONFIG_ARCH_UNIPHIER_SLD3)	+= clk-ld4.o
+obj-$(CONFIG_ARCH_UNIPHIER_LD4)		+= clk-ld4.o
+obj-$(CONFIG_ARCH_UNIPHIER_PRO4)	+= clk-pro4.o
+obj-$(CONFIG_ARCH_UNIPHIER_SLD8)	+= clk-ld4.o
+obj-$(CONFIG_ARCH_UNIPHIER_PRO5)	+= clk-pro5.o
+obj-$(CONFIG_ARCH_UNIPHIER_PXS2)	+= clk-pxs2.o
+obj-$(CONFIG_ARCH_UNIPHIER_LD6B)	+= clk-pxs2.o
diff --git a/arch/arm/mach-uniphier/clk/clk-ph1-ld4.c b/arch/arm/mach-uniphier/clk/clk-ld4.c
similarity index 100%
rename from arch/arm/mach-uniphier/clk/clk-ph1-ld4.c
rename to arch/arm/mach-uniphier/clk/clk-ld4.c
diff --git a/arch/arm/mach-uniphier/clk/clk-ph1-pro4.c b/arch/arm/mach-uniphier/clk/clk-pro4.c
similarity index 100%
rename from arch/arm/mach-uniphier/clk/clk-ph1-pro4.c
rename to arch/arm/mach-uniphier/clk/clk-pro4.c
diff --git a/arch/arm/mach-uniphier/clk/clk-ph1-pro5.c b/arch/arm/mach-uniphier/clk/clk-pro5.c
similarity index 100%
rename from arch/arm/mach-uniphier/clk/clk-ph1-pro5.c
rename to arch/arm/mach-uniphier/clk/clk-pro5.c
diff --git a/arch/arm/mach-uniphier/clk/clk-proxstream2.c b/arch/arm/mach-uniphier/clk/clk-pxs2.c
similarity index 100%
rename from arch/arm/mach-uniphier/clk/clk-proxstream2.c
rename to arch/arm/mach-uniphier/clk/clk-pxs2.c
diff --git a/arch/arm/mach-uniphier/dram/Makefile b/arch/arm/mach-uniphier/dram/Makefile
index 3d1553c..615ba2c 100644
--- a/arch/arm/mach-uniphier/dram/Makefile
+++ b/arch/arm/mach-uniphier/dram/Makefile
@@ -4,14 +4,14 @@
 
 ifdef CONFIG_SPL_BUILD
 
-obj-$(CONFIG_ARCH_UNIPHIER_PH1_LD4)	+= umc-ph1-ld4.o \
-					   ddrphy-training.o ddrphy-ph1-ld4.o
-obj-$(CONFIG_ARCH_UNIPHIER_PH1_PRO4)	+= umc-ph1-pro4.o \
-					   ddrphy-training.o ddrphy-ph1-ld4.o
-obj-$(CONFIG_ARCH_UNIPHIER_PH1_SLD8)	+= umc-ph1-sld8.o \
-					   ddrphy-training.o ddrphy-ph1-ld4.o
-obj-$(CONFIG_ARCH_UNIPHIER_PROXSTREAM2)	+= umc-proxstream2.o
-obj-$(CONFIG_ARCH_UNIPHIER_PH1_LD6B)	+= umc-proxstream2.o
+obj-$(CONFIG_ARCH_UNIPHIER_LD4)		+= umc-ld4.o \
+					   ddrphy-training.o ddrphy-ld4.o
+obj-$(CONFIG_ARCH_UNIPHIER_PRO4)	+= umc-pro4.o \
+					   ddrphy-training.o ddrphy-ld4.o
+obj-$(CONFIG_ARCH_UNIPHIER_SLD8)	+= umc-sld8.o \
+					   ddrphy-training.o ddrphy-ld4.o
+obj-$(CONFIG_ARCH_UNIPHIER_PXS2)	+= umc-pxs2.o
+obj-$(CONFIG_ARCH_UNIPHIER_LD6B)	+= umc-pxs2.o
 
 else
 
diff --git a/arch/arm/mach-uniphier/dram/ddrphy-ph1-ld4.c b/arch/arm/mach-uniphier/dram/ddrphy-ld4.c
similarity index 100%
rename from arch/arm/mach-uniphier/dram/ddrphy-ph1-ld4.c
rename to arch/arm/mach-uniphier/dram/ddrphy-ld4.c
diff --git a/arch/arm/mach-uniphier/dram/ddrphy-regs.h b/arch/arm/mach-uniphier/dram/ddrphy-regs.h
index 87f6d0d..2bcfc1e 100644
--- a/arch/arm/mach-uniphier/dram/ddrphy-regs.h
+++ b/arch/arm/mach-uniphier/dram/ddrphy-regs.h
@@ -158,8 +158,7 @@ struct ddrphy {
 /* SoC-specific parameters */
 #define NR_DATX8_PER_DDRPHY	2
 
-#if defined(CONFIG_ARCH_UNIPHIER_PH1_LD4) || \
-	defined(CONFIG_ARCH_UNIPHIER_PH1_SLD8)
+#if defined(CONFIG_ARCH_UNIPHIER_LD4) || defined(CONFIG_ARCH_UNIPHIER_SLD8)
 #define NR_DDRPHY_PER_CH		1
 #else
 #define NR_DDRPHY_PER_CH		2
diff --git a/arch/arm/mach-uniphier/dram/umc-ph1-ld4.c b/arch/arm/mach-uniphier/dram/umc-ld4.c
similarity index 100%
rename from arch/arm/mach-uniphier/dram/umc-ph1-ld4.c
rename to arch/arm/mach-uniphier/dram/umc-ld4.c
diff --git a/arch/arm/mach-uniphier/dram/umc-ph1-pro4.c b/arch/arm/mach-uniphier/dram/umc-pro4.c
similarity index 100%
rename from arch/arm/mach-uniphier/dram/umc-ph1-pro4.c
rename to arch/arm/mach-uniphier/dram/umc-pro4.c
diff --git a/arch/arm/mach-uniphier/dram/umc-proxstream2.c b/arch/arm/mach-uniphier/dram/umc-pxs2.c
similarity index 100%
rename from arch/arm/mach-uniphier/dram/umc-proxstream2.c
rename to arch/arm/mach-uniphier/dram/umc-pxs2.c
diff --git a/arch/arm/mach-uniphier/dram/umc-ph1-sld8.c b/arch/arm/mach-uniphier/dram/umc-sld8.c
similarity index 100%
rename from arch/arm/mach-uniphier/dram/umc-ph1-sld8.c
rename to arch/arm/mach-uniphier/dram/umc-sld8.c
diff --git a/arch/arm/mach-uniphier/early-clk/Makefile b/arch/arm/mach-uniphier/early-clk/Makefile
index 3e1e1b2..59058cd 100644
--- a/arch/arm/mach-uniphier/early-clk/Makefile
+++ b/arch/arm/mach-uniphier/early-clk/Makefile
@@ -2,10 +2,10 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-obj-$(CONFIG_ARCH_UNIPHIER_PH1_SLD3)	+= early-clk-ph1-ld4.o
-obj-$(CONFIG_ARCH_UNIPHIER_PH1_LD4)	+= early-clk-ph1-ld4.o
-obj-$(CONFIG_ARCH_UNIPHIER_PH1_PRO4)	+= early-clk-ph1-ld4.o
-obj-$(CONFIG_ARCH_UNIPHIER_PH1_SLD8)	+= early-clk-ph1-ld4.o
-obj-$(CONFIG_ARCH_UNIPHIER_PH1_PRO5)	+= early-clk-ph1-pro5.o
-obj-$(CONFIG_ARCH_UNIPHIER_PROXSTREAM2)	+= early-clk-proxstream2.o
-obj-$(CONFIG_ARCH_UNIPHIER_PH1_LD6B)	+= early-clk-proxstream2.o
+obj-$(CONFIG_ARCH_UNIPHIER_SLD3)	+= early-clk-ld4.o
+obj-$(CONFIG_ARCH_UNIPHIER_LD4)		+= early-clk-ld4.o
+obj-$(CONFIG_ARCH_UNIPHIER_PRO4)	+= early-clk-ld4.o
+obj-$(CONFIG_ARCH_UNIPHIER_SLD8)	+= early-clk-ld4.o
+obj-$(CONFIG_ARCH_UNIPHIER_PRO5)	+= early-clk-pro5.o
+obj-$(CONFIG_ARCH_UNIPHIER_PXS2)	+= early-clk-pxs2.o
+obj-$(CONFIG_ARCH_UNIPHIER_LD6B)	+= early-clk-pxs2.o
diff --git a/arch/arm/mach-uniphier/early-clk/early-clk-ph1-ld4.c b/arch/arm/mach-uniphier/early-clk/early-clk-ld4.c
similarity index 100%
rename from arch/arm/mach-uniphier/early-clk/early-clk-ph1-ld4.c
rename to arch/arm/mach-uniphier/early-clk/early-clk-ld4.c
diff --git a/arch/arm/mach-uniphier/early-clk/early-clk-ph1-pro5.c b/arch/arm/mach-uniphier/early-clk/early-clk-pro5.c
similarity index 100%
rename from arch/arm/mach-uniphier/early-clk/early-clk-ph1-pro5.c
rename to arch/arm/mach-uniphier/early-clk/early-clk-pro5.c
diff --git a/arch/arm/mach-uniphier/early-clk/early-clk-proxstream2.c b/arch/arm/mach-uniphier/early-clk/early-clk-pxs2.c
similarity index 100%
rename from arch/arm/mach-uniphier/early-clk/early-clk-proxstream2.c
rename to arch/arm/mach-uniphier/early-clk/early-clk-pxs2.c
diff --git a/arch/arm/mach-uniphier/early-pinctrl/Makefile b/arch/arm/mach-uniphier/early-pinctrl/Makefile
index 3be71fb..dc4064c 100644
--- a/arch/arm/mach-uniphier/early-pinctrl/Makefile
+++ b/arch/arm/mach-uniphier/early-pinctrl/Makefile
@@ -2,4 +2,4 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-obj-$(CONFIG_ARCH_UNIPHIER_PH1_SLD3)	+= early-pinctrl-ph1-sld3.o
+obj-$(CONFIG_ARCH_UNIPHIER_SLD3)	+= early-pinctrl-sld3.o
diff --git a/arch/arm/mach-uniphier/early-pinctrl/early-pinctrl-ph1-sld3.c b/arch/arm/mach-uniphier/early-pinctrl/early-pinctrl-sld3.c
similarity index 100%
rename from arch/arm/mach-uniphier/early-pinctrl/early-pinctrl-ph1-sld3.c
rename to arch/arm/mach-uniphier/early-pinctrl/early-pinctrl-sld3.c
diff --git a/arch/arm/mach-uniphier/init/Makefile b/arch/arm/mach-uniphier/init/Makefile
index ef80953..34b15e3 100644
--- a/arch/arm/mach-uniphier/init/Makefile
+++ b/arch/arm/mach-uniphier/init/Makefile
@@ -4,10 +4,10 @@
 
 obj-y					+= init.o
 
-obj-$(CONFIG_ARCH_UNIPHIER_PH1_SLD3)	+= init-ph1-sld3.o
-obj-$(CONFIG_ARCH_UNIPHIER_PH1_LD4)	+= init-ph1-ld4.o
-obj-$(CONFIG_ARCH_UNIPHIER_PH1_PRO4)	+= init-ph1-pro4.o
-obj-$(CONFIG_ARCH_UNIPHIER_PH1_SLD8)	+= init-ph1-sld8.o
-obj-$(CONFIG_ARCH_UNIPHIER_PH1_PRO5)	+= init-ph1-pro5.o
-obj-$(CONFIG_ARCH_UNIPHIER_PROXSTREAM2)	+= init-proxstream2.o
-obj-$(CONFIG_ARCH_UNIPHIER_PH1_LD6B)	+= init-proxstream2.o
+obj-$(CONFIG_ARCH_UNIPHIER_SLD3)	+= init-sld3.o
+obj-$(CONFIG_ARCH_UNIPHIER_LD4)		+= init-ld4.o
+obj-$(CONFIG_ARCH_UNIPHIER_PRO4)	+= init-pro4.o
+obj-$(CONFIG_ARCH_UNIPHIER_SLD8)	+= init-sld8.o
+obj-$(CONFIG_ARCH_UNIPHIER_PRO5)	+= init-pro5.o
+obj-$(CONFIG_ARCH_UNIPHIER_PXS2)	+= init-pxs2.o
+obj-$(CONFIG_ARCH_UNIPHIER_LD6B)	+= init-pxs2.o
diff --git a/arch/arm/mach-uniphier/init/init-ph1-ld4.c b/arch/arm/mach-uniphier/init/init-ld4.c
similarity index 100%
rename from arch/arm/mach-uniphier/init/init-ph1-ld4.c
rename to arch/arm/mach-uniphier/init/init-ld4.c
diff --git a/arch/arm/mach-uniphier/init/init-ph1-pro4.c b/arch/arm/mach-uniphier/init/init-pro4.c
similarity index 100%
rename from arch/arm/mach-uniphier/init/init-ph1-pro4.c
rename to arch/arm/mach-uniphier/init/init-pro4.c
diff --git a/arch/arm/mach-uniphier/init/init-ph1-pro5.c b/arch/arm/mach-uniphier/init/init-pro5.c
similarity index 100%
rename from arch/arm/mach-uniphier/init/init-ph1-pro5.c
rename to arch/arm/mach-uniphier/init/init-pro5.c
diff --git a/arch/arm/mach-uniphier/init/init-proxstream2.c b/arch/arm/mach-uniphier/init/init-pxs2.c
similarity index 100%
rename from arch/arm/mach-uniphier/init/init-proxstream2.c
rename to arch/arm/mach-uniphier/init/init-pxs2.c
diff --git a/arch/arm/mach-uniphier/init/init-ph1-sld3.c b/arch/arm/mach-uniphier/init/init-sld3.c
similarity index 100%
rename from arch/arm/mach-uniphier/init/init-ph1-sld3.c
rename to arch/arm/mach-uniphier/init/init-sld3.c
diff --git a/arch/arm/mach-uniphier/init/init-ph1-sld8.c b/arch/arm/mach-uniphier/init/init-sld8.c
similarity index 100%
rename from arch/arm/mach-uniphier/init/init-ph1-sld8.c
rename to arch/arm/mach-uniphier/init/init-sld8.c
diff --git a/arch/arm/mach-uniphier/init/init.c b/arch/arm/mach-uniphier/init/init.c
index b30f3bd..d5d1018 100644
--- a/arch/arm/mach-uniphier/init/init.c
+++ b/arch/arm/mach-uniphier/init/init.c
@@ -19,35 +19,34 @@ void spl_board_init(void)
 		hang();
 
 	switch (uniphier_get_soc_type()) {
-#if defined(CONFIG_ARCH_UNIPHIER_PH1_SLD3)
-	case SOC_UNIPHIER_PH1_SLD3:
+#if defined(CONFIG_ARCH_UNIPHIER_SLD3)
+	case SOC_UNIPHIER_SLD3:
 		ph1_sld3_init(param);
 		break;
 #endif
-#if defined(CONFIG_ARCH_UNIPHIER_PH1_LD4)
-	case SOC_UNIPHIER_PH1_LD4:
+#if defined(CONFIG_ARCH_UNIPHIER_LD4)
+	case SOC_UNIPHIER_LD4:
 		ph1_ld4_init(param);
 		break;
 #endif
-#if defined(CONFIG_ARCH_UNIPHIER_PH1_PRO4)
-	case SOC_UNIPHIER_PH1_PRO4:
+#if defined(CONFIG_ARCH_UNIPHIER_PRO4)
+	case SOC_UNIPHIER_PRO4:
 		ph1_pro4_init(param);
 		break;
 #endif
-#if defined(CONFIG_ARCH_UNIPHIER_PH1_SLD8)
-	case SOC_UNIPHIER_PH1_SLD8:
+#if defined(CONFIG_ARCH_UNIPHIER_SLD8)
+	case SOC_UNIPHIER_SLD8:
 		ph1_sld8_init(param);
 		break;
 #endif
-#if defined(CONFIG_ARCH_UNIPHIER_PH1_PRO5)
-	case SOC_UNIPHIER_PH1_PRO5:
+#if defined(CONFIG_ARCH_UNIPHIER_PRO5)
+	case SOC_UNIPHIER_PRO5:
 		ph1_pro5_init(param);
 		break;
 #endif
-#if defined(CONFIG_ARCH_UNIPHIER_PROXSTREAM2) || \
-	defined(CONFIG_ARCH_UNIPHIER_PH1_LD6B)
-	case SOC_UNIPHIER_PROXSTREAM2:
-	case SOC_UNIPHIER_PH1_LD6B:
+#if defined(CONFIG_ARCH_UNIPHIER_PXS2) || defined(CONFIG_ARCH_UNIPHIER_LD6B)
+	case SOC_UNIPHIER_PXS2:
+	case SOC_UNIPHIER_LD6B:
 		proxstream2_init(param);
 		break;
 #endif
diff --git a/arch/arm/mach-uniphier/memconf/Makefile b/arch/arm/mach-uniphier/memconf/Makefile
index a152f61..78bb677 100644
--- a/arch/arm/mach-uniphier/memconf/Makefile
+++ b/arch/arm/mach-uniphier/memconf/Makefile
@@ -3,6 +3,6 @@
 #
 
 obj-y					+= memconf.o
-obj-$(CONFIG_ARCH_UNIPHIER_PH1_SLD3)	+= memconf-ph1-sld3.o
-obj-$(CONFIG_ARCH_UNIPHIER_PROXSTREAM2)	+= memconf-proxstream2.o
-obj-$(CONFIG_ARCH_UNIPHIER_PH1_LD6B)	+= memconf-proxstream2.o
+obj-$(CONFIG_ARCH_UNIPHIER_SLD3)	+= memconf-sld3.o
+obj-$(CONFIG_ARCH_UNIPHIER_PXS2)	+= memconf-pxs2.o
+obj-$(CONFIG_ARCH_UNIPHIER_LD6B)	+= memconf-pxs2.o
diff --git a/arch/arm/mach-uniphier/memconf/memconf-proxstream2.c b/arch/arm/mach-uniphier/memconf/memconf-pxs2.c
similarity index 100%
rename from arch/arm/mach-uniphier/memconf/memconf-proxstream2.c
rename to arch/arm/mach-uniphier/memconf/memconf-pxs2.c
diff --git a/arch/arm/mach-uniphier/memconf/memconf-ph1-sld3.c b/arch/arm/mach-uniphier/memconf/memconf-sld3.c
similarity index 100%
rename from arch/arm/mach-uniphier/memconf/memconf-ph1-sld3.c
rename to arch/arm/mach-uniphier/memconf/memconf-sld3.c
diff --git a/arch/arm/mach-uniphier/pinctrl/Makefile b/arch/arm/mach-uniphier/pinctrl/Makefile
index 80a9cda..5504c24 100644
--- a/arch/arm/mach-uniphier/pinctrl/Makefile
+++ b/arch/arm/mach-uniphier/pinctrl/Makefile
@@ -2,10 +2,10 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-obj-$(CONFIG_ARCH_UNIPHIER_PH1_SLD3)	+= pinctrl-ph1-sld3.o
-obj-$(CONFIG_ARCH_UNIPHIER_PH1_LD4)	+= pinctrl-ph1-ld4.o
-obj-$(CONFIG_ARCH_UNIPHIER_PH1_PRO4)	+= pinctrl-ph1-pro4.o
-obj-$(CONFIG_ARCH_UNIPHIER_PH1_SLD8)	+= pinctrl-ph1-sld8.o
-obj-$(CONFIG_ARCH_UNIPHIER_PH1_PRO5)	+= pinctrl-ph1-pro5.o
-obj-$(CONFIG_ARCH_UNIPHIER_PROXSTREAM2)	+= pinctrl-proxstream2.o
-obj-$(CONFIG_ARCH_UNIPHIER_PH1_LD6B)	+= pinctrl-ph1-ld6b.o
+obj-$(CONFIG_ARCH_UNIPHIER_SLD3)	+= pinctrl-sld3.o
+obj-$(CONFIG_ARCH_UNIPHIER_LD4)		+= pinctrl-ld4.o
+obj-$(CONFIG_ARCH_UNIPHIER_PRO4)	+= pinctrl-pro4.o
+obj-$(CONFIG_ARCH_UNIPHIER_SLD8)	+= pinctrl-sld8.o
+obj-$(CONFIG_ARCH_UNIPHIER_PRO5)	+= pinctrl-pro5.o
+obj-$(CONFIG_ARCH_UNIPHIER_PXS2)	+= pinctrl-pxs2.o
+obj-$(CONFIG_ARCH_UNIPHIER_LD6B)	+= pinctrl-ld6b.o
diff --git a/arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-ld4.c b/arch/arm/mach-uniphier/pinctrl/pinctrl-ld4.c
similarity index 100%
rename from arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-ld4.c
rename to arch/arm/mach-uniphier/pinctrl/pinctrl-ld4.c
diff --git a/arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-ld6b.c b/arch/arm/mach-uniphier/pinctrl/pinctrl-ld6b.c
similarity index 100%
rename from arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-ld6b.c
rename to arch/arm/mach-uniphier/pinctrl/pinctrl-ld6b.c
diff --git a/arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-pro4.c b/arch/arm/mach-uniphier/pinctrl/pinctrl-pro4.c
similarity index 100%
rename from arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-pro4.c
rename to arch/arm/mach-uniphier/pinctrl/pinctrl-pro4.c
diff --git a/arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-pro5.c b/arch/arm/mach-uniphier/pinctrl/pinctrl-pro5.c
similarity index 100%
rename from arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-pro5.c
rename to arch/arm/mach-uniphier/pinctrl/pinctrl-pro5.c
diff --git a/arch/arm/mach-uniphier/pinctrl/pinctrl-proxstream2.c b/arch/arm/mach-uniphier/pinctrl/pinctrl-pxs2.c
similarity index 100%
rename from arch/arm/mach-uniphier/pinctrl/pinctrl-proxstream2.c
rename to arch/arm/mach-uniphier/pinctrl/pinctrl-pxs2.c
diff --git a/arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-sld3.c b/arch/arm/mach-uniphier/pinctrl/pinctrl-sld3.c
similarity index 100%
rename from arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-sld3.c
rename to arch/arm/mach-uniphier/pinctrl/pinctrl-sld3.c
diff --git a/arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-sld8.c b/arch/arm/mach-uniphier/pinctrl/pinctrl-sld8.c
similarity index 100%
rename from arch/arm/mach-uniphier/pinctrl/pinctrl-ph1-sld8.c
rename to arch/arm/mach-uniphier/pinctrl/pinctrl-sld8.c
diff --git a/arch/arm/mach-uniphier/pll/Makefile b/arch/arm/mach-uniphier/pll/Makefile
index ca88521..63f169c 100644
--- a/arch/arm/mach-uniphier/pll/Makefile
+++ b/arch/arm/mach-uniphier/pll/Makefile
@@ -2,11 +2,7 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-obj-$(CONFIG_ARCH_UNIPHIER_PH1_SLD3)	+= pll-init-ph1-sld3.o \
-					   pll-spectrum-ph1-sld3.o
-obj-$(CONFIG_ARCH_UNIPHIER_PH1_LD4)	+= pll-init-ph1-ld4.o \
-					   pll-spectrum-ph1-ld4.o
-obj-$(CONFIG_ARCH_UNIPHIER_PH1_PRO4)	+= pll-init-ph1-pro4.o \
-					   pll-spectrum-ph1-ld4.o
-obj-$(CONFIG_ARCH_UNIPHIER_PH1_SLD8)	+= pll-init-ph1-sld8.o \
-					   pll-spectrum-ph1-ld4.o
+obj-$(CONFIG_ARCH_UNIPHIER_SLD3)	+= pll-init-sld3.o pll-spectrum-sld3.o
+obj-$(CONFIG_ARCH_UNIPHIER_LD4)		+= pll-init-ld4.o pll-spectrum-ld4.o
+obj-$(CONFIG_ARCH_UNIPHIER_PRO4)	+= pll-init-pro4.o pll-spectrum-ld4.o
+obj-$(CONFIG_ARCH_UNIPHIER_SLD8)	+= pll-init-sld8.o pll-spectrum-ld4.o
diff --git a/arch/arm/mach-uniphier/pll/pll-init-ph1-ld4.c b/arch/arm/mach-uniphier/pll/pll-init-ld4.c
similarity index 100%
rename from arch/arm/mach-uniphier/pll/pll-init-ph1-ld4.c
rename to arch/arm/mach-uniphier/pll/pll-init-ld4.c
diff --git a/arch/arm/mach-uniphier/pll/pll-init-ph1-pro4.c b/arch/arm/mach-uniphier/pll/pll-init-pro4.c
similarity index 100%
rename from arch/arm/mach-uniphier/pll/pll-init-ph1-pro4.c
rename to arch/arm/mach-uniphier/pll/pll-init-pro4.c
diff --git a/arch/arm/mach-uniphier/pll/pll-init-ph1-sld3.c b/arch/arm/mach-uniphier/pll/pll-init-sld3.c
similarity index 100%
rename from arch/arm/mach-uniphier/pll/pll-init-ph1-sld3.c
rename to arch/arm/mach-uniphier/pll/pll-init-sld3.c
diff --git a/arch/arm/mach-uniphier/pll/pll-init-ph1-sld8.c b/arch/arm/mach-uniphier/pll/pll-init-sld8.c
similarity index 100%
rename from arch/arm/mach-uniphier/pll/pll-init-ph1-sld8.c
rename to arch/arm/mach-uniphier/pll/pll-init-sld8.c
diff --git a/arch/arm/mach-uniphier/pll/pll-spectrum-ph1-ld4.c b/arch/arm/mach-uniphier/pll/pll-spectrum-ld4.c
similarity index 100%
rename from arch/arm/mach-uniphier/pll/pll-spectrum-ph1-ld4.c
rename to arch/arm/mach-uniphier/pll/pll-spectrum-ld4.c
diff --git a/arch/arm/mach-uniphier/pll/pll-spectrum-ph1-sld3.c b/arch/arm/mach-uniphier/pll/pll-spectrum-sld3.c
similarity index 100%
rename from arch/arm/mach-uniphier/pll/pll-spectrum-ph1-sld3.c
rename to arch/arm/mach-uniphier/pll/pll-spectrum-sld3.c
diff --git a/arch/arm/mach-uniphier/sbc/Makefile b/arch/arm/mach-uniphier/sbc/Makefile
index 57eb44b..87220a6 100644
--- a/arch/arm/mach-uniphier/sbc/Makefile
+++ b/arch/arm/mach-uniphier/sbc/Makefile
@@ -2,10 +2,10 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-obj-$(CONFIG_ARCH_UNIPHIER_PH1_SLD3)	+= sbc-ph1-sld3.o
-obj-$(CONFIG_ARCH_UNIPHIER_PH1_LD4)	+= sbc-ph1-ld4.o
-obj-$(CONFIG_ARCH_UNIPHIER_PH1_PRO4)	+= sbc-ph1-pro4.o
-obj-$(CONFIG_ARCH_UNIPHIER_PH1_SLD8)	+= sbc-ph1-ld4.o
-obj-$(CONFIG_ARCH_UNIPHIER_PH1_PRO5)	+= sbc-ph1-pro4.o
-obj-$(CONFIG_ARCH_UNIPHIER_PROXSTREAM2)	+= sbc-proxstream2.o
-obj-$(CONFIG_ARCH_UNIPHIER_PH1_LD6B)	+= sbc-proxstream2.o
+obj-$(CONFIG_ARCH_UNIPHIER_SLD3)	+= sbc-sld3.o
+obj-$(CONFIG_ARCH_UNIPHIER_LD4)		+= sbc-ld4.o
+obj-$(CONFIG_ARCH_UNIPHIER_PRO4)	+= sbc-pro4.o
+obj-$(CONFIG_ARCH_UNIPHIER_SLD8)	+= sbc-ld4.o
+obj-$(CONFIG_ARCH_UNIPHIER_PRO5)	+= sbc-pro4.o
+obj-$(CONFIG_ARCH_UNIPHIER_PXS2)	+= sbc-pxs2.o
+obj-$(CONFIG_ARCH_UNIPHIER_LD6B)	+= sbc-pxs2.o
diff --git a/arch/arm/mach-uniphier/sbc/sbc-ph1-ld4.c b/arch/arm/mach-uniphier/sbc/sbc-ld4.c
similarity index 100%
rename from arch/arm/mach-uniphier/sbc/sbc-ph1-ld4.c
rename to arch/arm/mach-uniphier/sbc/sbc-ld4.c
diff --git a/arch/arm/mach-uniphier/sbc/sbc-ph1-pro4.c b/arch/arm/mach-uniphier/sbc/sbc-pro4.c
similarity index 100%
rename from arch/arm/mach-uniphier/sbc/sbc-ph1-pro4.c
rename to arch/arm/mach-uniphier/sbc/sbc-pro4.c
diff --git a/arch/arm/mach-uniphier/sbc/sbc-proxstream2.c b/arch/arm/mach-uniphier/sbc/sbc-pxs2.c
similarity index 100%
rename from arch/arm/mach-uniphier/sbc/sbc-proxstream2.c
rename to arch/arm/mach-uniphier/sbc/sbc-pxs2.c
diff --git a/arch/arm/mach-uniphier/sbc/sbc-ph1-sld3.c b/arch/arm/mach-uniphier/sbc/sbc-sld3.c
similarity index 100%
rename from arch/arm/mach-uniphier/sbc/sbc-ph1-sld3.c
rename to arch/arm/mach-uniphier/sbc/sbc-sld3.c
diff --git a/arch/arm/mach-uniphier/sc-regs.h b/arch/arm/mach-uniphier/sc-regs.h
index 474b82d..a095589 100644
--- a/arch/arm/mach-uniphier/sc-regs.h
+++ b/arch/arm/mach-uniphier/sc-regs.h
@@ -9,7 +9,7 @@
 #ifndef ARCH_SC_REGS_H
 #define ARCH_SC_REGS_H
 
-#if defined(CONFIG_ARCH_UNIPHIER_PH1_SLD3)
+#if defined(CONFIG_ARCH_UNIPHIER_SLD3)
 #define SC_BASE_ADDR			0xf1840000
 #else
 #define SC_BASE_ADDR			0x61840000
diff --git a/arch/arm/mach-uniphier/soc-info.h b/arch/arm/mach-uniphier/soc-info.h
index 606094c..d9b38b3 100644
--- a/arch/arm/mach-uniphier/soc-info.h
+++ b/arch/arm/mach-uniphier/soc-info.h
@@ -8,28 +8,28 @@
 #define __MACH_SOC_INFO_H__
 
 enum uniphier_soc_id {
-	SOC_UNIPHIER_PH1_SLD3,
-	SOC_UNIPHIER_PH1_LD4,
-	SOC_UNIPHIER_PH1_PRO4,
-	SOC_UNIPHIER_PH1_SLD8,
-	SOC_UNIPHIER_PH1_PRO5,
-	SOC_UNIPHIER_PROXSTREAM2,
-	SOC_UNIPHIER_PH1_LD6B,
-	SOC_UNIPHIER_PH1_LD11,
-	SOC_UNIPHIER_PH1_LD20,
+	SOC_UNIPHIER_SLD3,
+	SOC_UNIPHIER_LD4,
+	SOC_UNIPHIER_PRO4,
+	SOC_UNIPHIER_SLD8,
+	SOC_UNIPHIER_PRO5,
+	SOC_UNIPHIER_PXS2,
+	SOC_UNIPHIER_LD6B,
+	SOC_UNIPHIER_LD11,
+	SOC_UNIPHIER_LD20,
 	SOC_UNIPHIER_UNKNOWN,
 };
 
 #define UNIPHIER_NR_ENABLED_SOCS		\
-	IS_ENABLED(CONFIG_ARCH_UNIPHIER_PH1_SLD3) +	\
-	IS_ENABLED(CONFIG_ARCH_UNIPHIER_PH1_LD4) +	\
-	IS_ENABLED(CONFIG_ARCH_UNIPHIER_PH1_PRO4) +	\
-	IS_ENABLED(CONFIG_ARCH_UNIPHIER_PH1_SLD8) +	\
-	IS_ENABLED(CONFIG_ARCH_UNIPHIER_PH1_PRO5) +	\
-	IS_ENABLED(CONFIG_ARCH_UNIPHIER_PROXSTREAM2) +	\
-	IS_ENABLED(CONFIG_ARCH_UNIPHIER_PH1_LD6B) + \
-	IS_ENABLED(CONFIG_ARCH_UNIPHIER_PH1_LD11) + \
-	IS_ENABLED(CONFIG_ARCH_UNIPHIER_PH1_LD20)
+	IS_ENABLED(CONFIG_ARCH_UNIPHIER_SLD3) +	\
+	IS_ENABLED(CONFIG_ARCH_UNIPHIER_LD4) +	\
+	IS_ENABLED(CONFIG_ARCH_UNIPHIER_PRO4) +	\
+	IS_ENABLED(CONFIG_ARCH_UNIPHIER_SLD8) +	\
+	IS_ENABLED(CONFIG_ARCH_UNIPHIER_PRO5) +	\
+	IS_ENABLED(CONFIG_ARCH_UNIPHIER_PXS2) +	\
+	IS_ENABLED(CONFIG_ARCH_UNIPHIER_LD6B) + \
+	IS_ENABLED(CONFIG_ARCH_UNIPHIER_LD11) + \
+	IS_ENABLED(CONFIG_ARCH_UNIPHIER_LD20)
 
 #define UNIPHIER_MULTI_SOC	((UNIPHIER_NR_ENABLED_SOCS) > 1)
 
@@ -38,32 +38,32 @@ enum uniphier_soc_id uniphier_get_soc_type(void);
 #else
 static inline enum uniphier_soc_id uniphier_get_soc_type(void)
 {
-#if defined(CONFIG_ARCH_UNIPHIER_PH1_SLD3)
-	return SOC_UNIPHIER_PH1_SLD3;
+#if defined(CONFIG_ARCH_UNIPHIER_SLD3)
+	return SOC_UNIPHIER_SLD3;
 #endif
-#if defined(CONFIG_ARCH_UNIPHIER_PH1_LD4)
-	return SOC_UNIPHIER_PH1_LD4;
+#if defined(CONFIG_ARCH_UNIPHIER_LD4)
+	return SOC_UNIPHIER_LD4;
 #endif
-#if defined(CONFIG_ARCH_UNIPHIER_PH1_PRO4)
-	return SOC_UNIPHIER_PH1_PRO4;
+#if defined(CONFIG_ARCH_UNIPHIER_PRO4)
+	return SOC_UNIPHIER_PRO4;
 #endif
-#if defined(CONFIG_ARCH_UNIPHIER_PH1_SLD8)
-	return SOC_UNIPHIER_PH1_SLD8;
+#if defined(CONFIG_ARCH_UNIPHIER_SLD8)
+	return SOC_UNIPHIER_SLD8;
 #endif
-#if defined(CONFIG_ARCH_UNIPHIER_PH1_PRO5)
-	return SOC_UNIPHIER_PH1_PRO5;
+#if defined(CONFIG_ARCH_UNIPHIER_PRO5)
+	return SOC_UNIPHIER_PRO5;
 #endif
-#if defined(CONFIG_ARCH_UNIPHIER_PROXSTREAM2)
-	return SOC_UNIPHIER_PROXSTREAM2;
+#if defined(CONFIG_ARCH_UNIPHIER_PXS2)
+	return SOC_UNIPHIER_PXS2;
 #endif
-#if defined(CONFIG_ARCH_UNIPHIER_PH1_LD6B)
-	return SOC_UNIPHIER_PH1_LD6B;
+#if defined(CONFIG_ARCH_UNIPHIER_LD6B)
+	return SOC_UNIPHIER_LD6B;
 #endif
-#if defined(CONFIG_ARCH_UNIPHIER_PH1_LD11)
-	return SOC_UNIPHIER_PH1_LD11;
+#if defined(CONFIG_ARCH_UNIPHIER_LD11)
+	return SOC_UNIPHIER_LD11;
 #endif
-#if defined(CONFIG_ARCH_UNIPHIER_PH1_LD20)
-	return SOC_UNIPHIER_PH1_LD20;
+#if defined(CONFIG_ARCH_UNIPHIER_LD20)
+	return SOC_UNIPHIER_LD20;
 #endif
 
 	return SOC_UNIPHIER_UNKNOWN;
diff --git a/arch/arm/mach-uniphier/soc_info.c b/arch/arm/mach-uniphier/soc_info.c
index 3cfc183..046104b 100644
--- a/arch/arm/mach-uniphier/soc_info.c
+++ b/arch/arm/mach-uniphier/soc_info.c
@@ -17,49 +17,49 @@ enum uniphier_soc_id uniphier_get_soc_type(void)
 	enum uniphier_soc_id ret;
 
 	switch ((revision & SG_REVISION_TYPE_MASK) >> SG_REVISION_TYPE_SHIFT) {
-#ifdef CONFIG_ARCH_UNIPHIER_PH1_SLD3
+#ifdef CONFIG_ARCH_UNIPHIER_SLD3
 	case 0x25:
-		ret = SOC_UNIPHIER_PH1_SLD3;
+		ret = SOC_UNIPHIER_SLD3;
 		break;
 #endif
-#ifdef CONFIG_ARCH_UNIPHIER_PH1_LD4
+#ifdef CONFIG_ARCH_UNIPHIER_LD4
 	case 0x26:
-		ret = SOC_UNIPHIER_PH1_LD4;
+		ret = SOC_UNIPHIER_LD4;
 		break;
 #endif
-#ifdef CONFIG_ARCH_UNIPHIER_PH1_PRO4
+#ifdef CONFIG_ARCH_UNIPHIER_PRO4
 	case 0x28:
-		ret = SOC_UNIPHIER_PH1_PRO4;
+		ret = SOC_UNIPHIER_PRO4;
 		break;
 #endif
-#ifdef CONFIG_ARCH_UNIPHIER_PH1_SLD8
+#ifdef CONFIG_ARCH_UNIPHIER_SLD8
 	case 0x29:
-		ret = SOC_UNIPHIER_PH1_SLD8;
+		ret = SOC_UNIPHIER_SLD8;
 		break;
 #endif
-#ifdef CONFIG_ARCH_UNIPHIER_PH1_PRO5
+#ifdef CONFIG_ARCH_UNIPHIER_PRO5
 	case 0x2A:
-		ret = SOC_UNIPHIER_PH1_PRO5;
+		ret = SOC_UNIPHIER_PRO5;
 		break;
 #endif
-#ifdef CONFIG_ARCH_UNIPHIER_PROXSTREAM2
+#ifdef CONFIG_ARCH_UNIPHIER_PXS2
 	case 0x2E:
-		ret = SOC_UNIPHIER_PROXSTREAM2;
+		ret = SOC_UNIPHIER_PXS2;
 		break;
 #endif
-#ifdef CONFIG_ARCH_UNIPHIER_PH1_LD6B
+#ifdef CONFIG_ARCH_UNIPHIER_LD6B
 	case 0x2F:
-		ret = SOC_UNIPHIER_PH1_LD6B;
+		ret = SOC_UNIPHIER_LD6B;
 		break;
 #endif
-#ifdef CONFIG_ARCH_UNIPHIER_PH1_LD11
+#ifdef CONFIG_ARCH_UNIPHIER_LD11
 	case 0x31:
-		ret = SOC_UNIPHIER_PH1_LD11;
+		ret = SOC_UNIPHIER_LD11;
 		break;
 #endif
-#ifdef CONFIG_ARCH_UNIPHIER_PH1_LD20
+#ifdef CONFIG_ARCH_UNIPHIER_LD20
 	case 0x32:
-		ret = SOC_UNIPHIER_PH1_LD20;
+		ret = SOC_UNIPHIER_LD20;
 		break;
 #endif
 	default:
diff --git a/configs/uniphier_pro4_defconfig b/configs/uniphier_pro4_defconfig
index 989f614..1160b77 100644
--- a/configs/uniphier_pro4_defconfig
+++ b/configs/uniphier_pro4_defconfig
@@ -1,7 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_UNIPHIER=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000
-CONFIG_ARCH_UNIPHIER_PH1_PRO4=y
+CONFIG_ARCH_UNIPHIER_PRO4=y
 CONFIG_MICRO_SUPPORT_CARD=y
 CONFIG_SYS_TEXT_BASE=0x84000000
 CONFIG_DEFAULT_DEVICE_TREE="uniphier-ph1-pro4-ref"
diff --git a/configs/uniphier_sld3_defconfig b/configs/uniphier_sld3_defconfig
index 5f0d678..f779ded 100644
--- a/configs/uniphier_sld3_defconfig
+++ b/configs/uniphier_sld3_defconfig
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_ARCH_UNIPHIER=y
-CONFIG_ARCH_UNIPHIER_PH1_SLD3=y
+CONFIG_ARCH_UNIPHIER_SLD3=y
 CONFIG_MICRO_SUPPORT_CARD=y
 CONFIG_SYS_TEXT_BASE=0x84000000
 CONFIG_DEFAULT_DEVICE_TREE="uniphier-ph1-sld3-ref"
diff --git a/drivers/pinctrl/uniphier/Kconfig b/drivers/pinctrl/uniphier/Kconfig
index 33d6763..d22d485 100644
--- a/drivers/pinctrl/uniphier/Kconfig
+++ b/drivers/pinctrl/uniphier/Kconfig
@@ -3,39 +3,39 @@ if ARCH_UNIPHIER
 config PINCTRL_UNIPHIER
 	bool
 
-config PINCTRL_UNIPHIER_PH1_LD4
+config PINCTRL_UNIPHIER_LD4
 	bool "UniPhier PH1-LD4 SoC pinctrl driver"
-	depends on ARCH_UNIPHIER_PH1_LD4
+	depends on ARCH_UNIPHIER_LD4
 	default y
 	select PINCTRL_UNIPHIER
 
-config PINCTRL_UNIPHIER_PH1_PRO4
+config PINCTRL_UNIPHIER_PRO4
 	bool "UniPhier PH1-Pro4 SoC pinctrl driver"
-	depends on ARCH_UNIPHIER_PH1_PRO4
+	depends on ARCH_UNIPHIER_PRO4
 	default y
 	select PINCTRL_UNIPHIER
 
-config PINCTRL_UNIPHIER_PH1_SLD8
+config PINCTRL_UNIPHIER_SLD8
 	bool "UniPhier PH1-sLD8 SoC pinctrl driver"
-	depends on ARCH_UNIPHIER_PH1_SLD8
+	depends on ARCH_UNIPHIER_SLD8
 	default y
 	select PINCTRL_UNIPHIER
 
-config PINCTRL_UNIPHIER_PH1_PRO5
+config PINCTRL_UNIPHIER_PRO5
 	bool "UniPhier PH1-Pro5 SoC pinctrl driver"
-	depends on ARCH_UNIPHIER_PH1_PRO5
+	depends on ARCH_UNIPHIER_PRO5
 	default y
 	select PINCTRL_UNIPHIER
 
-config PINCTRL_UNIPHIER_PROXSTREAM2
+config PINCTRL_UNIPHIER_PXS2
 	bool "UniPhier ProXstream2 SoC pinctrl driver"
-	depends on ARCH_UNIPHIER_PROXSTREAM2
+	depends on ARCH_UNIPHIER_PXS2
 	default y
 	select PINCTRL_UNIPHIER
 
-config PINCTRL_UNIPHIER_PH1_LD6B
+config PINCTRL_UNIPHIER_LD6B
 	bool "UniPhier PH1-LD6b SoC pinctrl driver"
-	depends on ARCH_UNIPHIER_PH1_LD6B
+	depends on ARCH_UNIPHIER_LD6B
 	default y
 	select PINCTRL_UNIPHIER
 
diff --git a/drivers/pinctrl/uniphier/Makefile b/drivers/pinctrl/uniphier/Makefile
index 3667bd3..c6cc13d 100644
--- a/drivers/pinctrl/uniphier/Makefile
+++ b/drivers/pinctrl/uniphier/Makefile
@@ -2,11 +2,11 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-obj-y						+= pinctrl-uniphier-core.o
+obj-y					+= pinctrl-uniphier-core.o
 
-obj-$(CONFIG_PINCTRL_UNIPHIER_PH1_LD4)		+= pinctrl-ph1-ld4.o
-obj-$(CONFIG_PINCTRL_UNIPHIER_PH1_PRO4)		+= pinctrl-ph1-pro4.o
-obj-$(CONFIG_PINCTRL_UNIPHIER_PH1_SLD8)		+= pinctrl-ph1-sld8.o
-obj-$(CONFIG_PINCTRL_UNIPHIER_PH1_PRO5)		+= pinctrl-ph1-pro5.o
-obj-$(CONFIG_PINCTRL_UNIPHIER_PROXSTREAM2)	+= pinctrl-proxstream2.o
-obj-$(CONFIG_PINCTRL_UNIPHIER_PH1_LD6B)		+= pinctrl-ph1-ld6b.o
+obj-$(CONFIG_PINCTRL_UNIPHIER_LD4)	+= pinctrl-uniphier-ld4.o
+obj-$(CONFIG_PINCTRL_UNIPHIER_PRO4)	+= pinctrl-uniphier-pro4.o
+obj-$(CONFIG_PINCTRL_UNIPHIER_SLD8)	+= pinctrl-uniphier-sld8.o
+obj-$(CONFIG_PINCTRL_UNIPHIER_PRO5)	+= pinctrl-uniphier-pro5.o
+obj-$(CONFIG_PINCTRL_UNIPHIER_PXS2)	+= pinctrl-uniphier-pxs2.o
+obj-$(CONFIG_PINCTRL_UNIPHIER_LD6B)	+= pinctrl-uniphier-ld6b.o
diff --git a/drivers/pinctrl/uniphier/pinctrl-ph1-ld4.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c
similarity index 100%
rename from drivers/pinctrl/uniphier/pinctrl-ph1-ld4.c
rename to drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c
diff --git a/drivers/pinctrl/uniphier/pinctrl-ph1-ld6b.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c
similarity index 100%
rename from drivers/pinctrl/uniphier/pinctrl-ph1-ld6b.c
rename to drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c
diff --git a/drivers/pinctrl/uniphier/pinctrl-ph1-pro4.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c
similarity index 100%
rename from drivers/pinctrl/uniphier/pinctrl-ph1-pro4.c
rename to drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c
diff --git a/drivers/pinctrl/uniphier/pinctrl-ph1-pro5.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c
similarity index 100%
rename from drivers/pinctrl/uniphier/pinctrl-ph1-pro5.c
rename to drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c
diff --git a/drivers/pinctrl/uniphier/pinctrl-proxstream2.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c
similarity index 100%
rename from drivers/pinctrl/uniphier/pinctrl-proxstream2.c
rename to drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c
diff --git a/drivers/pinctrl/uniphier/pinctrl-ph1-sld8.c b/drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c
similarity index 100%
rename from drivers/pinctrl/uniphier/pinctrl-ph1-sld8.c
rename to drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c
diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h
index 784d3c1..076c733 100644
--- a/include/configs/uniphier.h
+++ b/include/configs/uniphier.h
@@ -121,7 +121,7 @@
 
 #define CONFIG_NAND_DENALI_ECC_SIZE			1024
 
-#ifdef CONFIG_ARCH_UNIPHIER_PH1_SLD3
+#ifdef CONFIG_ARCH_UNIPHIER_SLD3
 #define CONFIG_SYS_NAND_REGS_BASE			0xf8100000
 #define CONFIG_SYS_NAND_DATA_BASE			0xf8000000
 #else
@@ -247,9 +247,8 @@
 #define CONFIG_SYS_SDRAM_BASE		0x80000000
 #define CONFIG_NR_DRAM_BANKS		2
 
-#if defined(CONFIG_ARCH_UNIPHIER_PH1_SLD3) || \
-	defined(CONFIG_ARCH_UNIPHIER_PH1_LD4) || \
-	defined(CONFIG_ARCH_UNIPHIER_PH1_SLD8)
+#if defined(CONFIG_ARCH_UNIPHIER_SLD3) || defined(CONFIG_ARCH_UNIPHIER_LD4) || \
+	defined(CONFIG_ARCH_UNIPHIER_SLD8)
 #define CONFIG_SPL_TEXT_BASE		0x00040000
 #else
 #define CONFIG_SPL_TEXT_BASE		0x00100000
