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

Commit 78a9057f authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Simon Horman
Browse files

ARM: shmobile: r8a7790: Use common R-Car Gen2 machine definition 



Now r8a7790 no longer needs the SMP initialization fallback, it can use
the common R-Car Gen2 machine definition, and the r8a7790-specific one
can be removed.

Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent f13e47ee

arch/arm/mach-shmobile/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ obj-$(CONFIG_ARCH_R8A73A4) += setup-r8a73a4.o 
obj-$(CONFIG_ARCH_R8A7740)	+= setup-r8a7740.o

obj-$(CONFIG_ARCH_R8A7778)	+= setup-r8a7778.o

obj-$(CONFIG_ARCH_R8A7779)	+= setup-r8a7779.o pm-r8a7779.o

obj-$(CONFIG_ARCH_R8A7790)	+= setup-r8a7790.o

obj-$(CONFIG_ARCH_R8A7791)	+= setup-r8a7791.o

obj-$(CONFIG_ARCH_EMEV2)	+= setup-emev2.o

obj-$(CONFIG_ARCH_R7S72100)	+= setup-r7s72100.o

arch/arm/mach-shmobile/setup-r8a7790.c

deleted100644 → 0
+0 −36
Original line number Diff line number Diff line 
/*

 * r8a7790 processor support

 *

 * Copyright (C) 2013  Renesas Solutions Corp.

 * Copyright (C) 2013  Magnus Damm

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; version 2 of the License.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



#include <linux/init.h>



#include <asm/mach/arch.h>



#include "common.h"

#include "rcar-gen2.h"



static const char * const r8a7790_boards_compat_dt[] __initconst = {

	"renesas,r8a7790",

	NULL,

};



DT_MACHINE_START(R8A7790_DT, "Generic R8A7790 (Flattened Device Tree)")

	.smp_init	= smp_init_ops(shmobile_smp_init_fallback_ops),

	.init_early	= shmobile_init_delay,

	.init_time	= rcar_gen2_timer_init,

	.init_late	= shmobile_init_late,

	.reserve	= rcar_gen2_reserve,

	.dt_compat	= r8a7790_boards_compat_dt,

MACHINE_END

arch/arm/mach-shmobile/setup-rcar-gen2.c

+2 −1
Original line number Diff line number Diff line
@@ -186,8 +186,9 @@ void __init rcar_gen2_reserve(void) 
}



static const char * const rcar_gen2_boards_compat_dt[] __initconst = {

	"renesas,r8a7790",

	/*

	 * R8A7790 and R8A7791 can't be handled here as long as they need SMP

	 * R8A7791 can't be handled here as long as it needs SMP

	 * initialization fallback.

	 */

	"renesas,r8a7792",