Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 99b3d294 authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Jason Cooper
Browse files

ARM: mvebu: rename armada-370-xp.c to board-v7.c 



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/board-v7.c. The board-v7.c name as we expect this
file to ultimately contain the DT_MACHINE_START definitions for all
ARMv7 Marvell EBU platforms (370, 375, 38x, XP and Dove as of today).

In relation to this file rename, this commit also:

 * Renames the hidden Kconfig symbol MACH_ARMADA_370_XP to
   MACH_MVEBU_V7. This hidden symbol is selected by the various
   per-SoC visible Kconfig options to trigger the build of board-v7.c.

 * Renames a certain number of functions in board-v7.c so that their
   armada_370_xp prefix is replaced by a 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: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent d181e69c

arch/arm/mach-mvebu/Kconfig

+3 −3
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ if ARCH_MVEBU 


menu "Marvell SOC with device tree"



config MACH_ARMADA_370_XP

config MACH_MVEBU_V7

	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_MVEBU_V7

	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_MVEBU_V7

	select PINCTRL_ARMADA_XP

	help

	  Say 'Y' here if you want your kernel to support boards based

arch/arm/mach-mvebu/Makefile

+3 −2
Original line number Diff line number Diff line
@@ -3,7 +3,8 @@ ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include \ 


AFLAGS_coherency_ll.o		:= -Wa,-march=armv7-a



obj-y				 += coherency.o coherency_ll.o pmsu.o system-controller.o mvebu-soc-id.o

obj-$(CONFIG_MACH_ARMADA_370_XP) += armada-370-xp.o

obj-y				 += system-controller.o mvebu-soc-id.o

obj-$(CONFIG_MACH_MVEBU_V7)      += board-v7.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

arch/arm/mach-mvebu/armada-370-xp.c→arch/arm/mach-mvebu/board-v7.c

+4 −4
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
#include "coherency.h"

#include "mvebu-soc-id.h"



static void __init armada_370_xp_timer_and_clk_init(void)

static void __init mvebu_timer_and_clk_init(void)

{

	of_clk_init(NULL);

	clocksource_of_init();
@@ -70,7 +70,7 @@ static void __init i2c_quirk(void) 
	return;

}



static void __init armada_370_xp_dt_init(void)

static void __init mvebu_dt_init(void)

{

	if (of_machine_is_compatible("plathome,openblocks-ax3-4"))

		i2c_quirk();
@@ -84,8 +84,8 @@ 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,

	.init_time	= armada_370_xp_timer_and_clk_init,

	.init_machine	= mvebu_dt_init,

	.init_time	= mvebu_timer_and_clk_init,

	.restart	= mvebu_restart,

	.dt_compat	= armada_370_xp_dt_compat,

MACHINE_END