| commit | 53c59aebadb10ec4e3e878e290c968703ba7d160 | [log] [tgz] |
|---|---|---|
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | Fri Mar 18 16:41:43 2016 +0900 |
| committer | Masahiro Yamada <yamada.masahiro@socionext.com> | Thu Mar 24 01:42:13 2016 +0900 |
| tree | 47fd29a996ceb41bfb974dc09b02ae518d3412d6 | |
| parent | 6497c363f0f97e96bfa789dea4181ca432be6b98 [diff] |
ARM: uniphier: drop PH1- prefix from CONFIG options and file names The current CONFIG names like "CONFIG_ARCH_UNIPHIER_PH1_PRO4" is too long. It would not hurt to drop "PH1_" because "UNIPHIER_" already well specifies the SoC family. Also, rename files for consistency. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
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