Commit d181e69c authored by Jason Cooper's avatar Jason Cooper
Browse files

Merge tag 'tags/mvebu-soc-3.15' into mvebu/soc-3xx 

mvebu soc changes for v3.15

 - mvebu
    - Makefile cleanup and remove map_io
    - use of_find_matching_node_and_match
parents 38dbfb59 08bb3adf

arch/arm/mach-mvebu/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -3,8 +3,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-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-$(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

+0 −6
Original line number Diff line number Diff line
@@ -31,11 +31,6 @@ 
#include "coherency.h"

#include "mvebu-soc-id.h"



static void __init armada_370_xp_map_io(void)

{

	debug_ll_io_init();

}



static void __init armada_370_xp_timer_and_clk_init(void)

{

	of_clk_init(NULL);
@@ -90,7 +85,6 @@ 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,

	.restart	= mvebu_restart,

	.dt_compat	= armada_370_xp_dt_compat,

arch/arm/mach-mvebu/system-controller.c

+4 −5
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ static const struct mvebu_system_controller orion_system_controller = { 
	.system_soft_reset = 0x1,

};



static struct of_device_id of_system_controller_table[] = {

static const struct of_device_id of_system_controller_table[] = {

	{

		.compatible = "marvell,orion-system-controller",

		.data = (void *) &orion_system_controller,
@@ -90,13 +90,12 @@ void mvebu_restart(enum reboot_mode mode, const char *cmd) 


static int __init mvebu_system_controller_init(void)

{

	const struct of_device_id *match;

	struct device_node *np;



	np = of_find_matching_node(NULL, of_system_controller_table);

	np = of_find_matching_node_and_match(NULL, of_system_controller_table,

					     &match);

	if (np) {

		const struct of_device_id *match =

		    of_match_node(of_system_controller_table, np);

		BUG_ON(!match);

		system_controller_base = of_iomap(np, 0);

		mvebu_sc = (struct mvebu_system_controller *)match->data;

		of_node_put(np);