From mboxrd@z Thu Jan 1 00:00:00 1970 From: thomas.petazzoni@free-electrons.com (Thomas Petazzoni) Date: Thu, 13 Feb 2014 12:04:23 +0100 Subject: [PATCH v3 01/13] ARM: mvebu: rename armada-370-xp.c to armada-mvebu.c In-Reply-To: <1392289475-8902-1-git-send-email-thomas.petazzoni@free-electrons.com> References: <1392289475-8902-1-git-send-email-thomas.petazzoni@free-electrons.com> Message-ID: <1392289475-8902-2-git-send-email-thomas.petazzoni@free-electrons.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org In preparation to the introduction of the support of Armada 375 and Armada 38x, this commit renames arch/arm/mach-mvebu/armada-370-xp.c to arch/arm/mach-mvebu/armada-mvebu.c. The armada-mvebu.c name was chosen because: * As we are going to merge the support for Kirkwood and Dove into mach-mvebu, there will be other files with DT_MACHINE_START structures, so a generic name such as board-dt.c or mvebu.c does not work. * A simple armada.c does not work, because there are Marvell Armada SOCs that are not part of the MVEBU family. For example, the Marvell Armada 1500 are part of the mach-berlin family, which is a completely separate line of SOCs. In relation to this file rename, this commit also: * Renames the hidden Kconfig symbol MACH_ARMADA_370_XP to MACH_ARMADA_MVEBU. This hidden symbol is selected by the various per-SoC visible Kconfig options to trigger the build of armada-mvebu.c. * Renames a certain number of functions in armada-mvebu.c so that their armada_370_xp prefix is replaced by a armada_mvebu prefix. The .dt_compat array keeps its armada_370_xp prefix because the new SOCs will be introduced with separate .dt_compat arrays, due to the need for different SMP operations. Signed-off-by: Thomas Petazzoni --- Jason, this commit will create a trivial conflict with the patch that removed armada_370_xp_map_io(), which I submitted a few days. The conflict should be easy to resolve (simply remove the ->map_io function). Signed-off-by: Thomas Petazzoni --- arch/arm/mach-mvebu/Kconfig | 6 +++--- arch/arm/mach-mvebu/Makefile | 2 +- arch/arm/mach-mvebu/{armada-370-xp.c => armada-mvebu.c} | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) rename arch/arm/mach-mvebu/{armada-370-xp.c => armada-mvebu.c} (89%) diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig index 5e269d7..35ef594 100644 --- a/arch/arm/mach-mvebu/Kconfig +++ b/arch/arm/mach-mvebu/Kconfig @@ -21,7 +21,7 @@ if ARCH_MVEBU menu "Marvell SOC with device tree" -config MACH_ARMADA_370_XP +config MACH_ARMADA_MVEBU bool select ARMADA_370_XP_TIMER select HAVE_SMP @@ -31,7 +31,7 @@ config MACH_ARMADA_370_XP config MACH_ARMADA_370 bool "Marvell Armada 370 boards" select ARMADA_370_CLK - select MACH_ARMADA_370_XP + select MACH_ARMADA_MVEBU select PINCTRL_ARMADA_370 help Say 'Y' here if you want your kernel to support boards based @@ -40,7 +40,7 @@ config MACH_ARMADA_370 config MACH_ARMADA_XP bool "Marvell Armada XP boards" select ARMADA_XP_CLK - select MACH_ARMADA_370_XP + select MACH_ARMADA_MVEBU select PINCTRL_ARMADA_XP help Say 'Y' here if you want your kernel to support boards based diff --git a/arch/arm/mach-mvebu/Makefile b/arch/arm/mach-mvebu/Makefile index 878aebe..4386094 100644 --- a/arch/arm/mach-mvebu/Makefile +++ b/arch/arm/mach-mvebu/Makefile @@ -4,7 +4,7 @@ ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include \ AFLAGS_coherency_ll.o := -Wa,-march=armv7-a obj-y += system-controller.o mvebu-soc-id.o -obj-$(CONFIG_MACH_ARMADA_370_XP) += armada-370-xp.o +obj-$(CONFIG_MACH_ARMADA_MVEBU) += armada-mvebu.o obj-$(CONFIG_ARCH_MVEBU) += coherency.o coherency_ll.o pmsu.o obj-$(CONFIG_SMP) += platsmp.o headsmp.o obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o diff --git a/arch/arm/mach-mvebu/armada-370-xp.c b/arch/arm/mach-mvebu/armada-mvebu.c similarity index 89% rename from arch/arm/mach-mvebu/armada-370-xp.c rename to arch/arm/mach-mvebu/armada-mvebu.c index f6c9d1d..40e3a4d 100644 --- a/arch/arm/mach-mvebu/armada-370-xp.c +++ b/arch/arm/mach-mvebu/armada-mvebu.c @@ -31,12 +31,12 @@ #include "coherency.h" #include "mvebu-soc-id.h" -static void __init armada_370_xp_map_io(void) +static void __init armada_mvebu_map_io(void) { debug_ll_io_init(); } -static void __init armada_370_xp_timer_and_clk_init(void) +static void __init armada_mvebu_timer_and_clk_init(void) { of_clk_init(NULL); clocksource_of_init(); @@ -75,7 +75,7 @@ static void __init i2c_quirk(void) return; } -static void __init armada_370_xp_dt_init(void) +static void __init armada_mvebu_dt_init(void) { if (of_machine_is_compatible("plathome,openblocks-ax3-4")) i2c_quirk(); @@ -89,9 +89,9 @@ static const char * const armada_370_xp_dt_compat[] = { DT_MACHINE_START(ARMADA_XP_DT, "Marvell Armada 370/XP (Device Tree)") .smp = smp_ops(armada_xp_smp_ops), - .init_machine = armada_370_xp_dt_init, - .map_io = armada_370_xp_map_io, - .init_time = armada_370_xp_timer_and_clk_init, + .init_machine = armada_mvebu_dt_init, + .map_io = armada_mvebu_map_io, + .init_time = armada_mvebu_timer_and_clk_init, .restart = mvebu_restart, .dt_compat = armada_370_xp_dt_compat, MACHINE_END -- 1.8.3.2