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

Commit b4e2c4bf authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'renesas-soc3-for-v3.19' of... 

Merge tag 'renesas-soc3-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc

Pull "Third Round of Renesas ARM Based Soc Updates for v3.19" from Simon Horman:

* Always build rcar setup for armv7
  - Fixes allmodconfig build fauilre caused by
    "ARM: shmobile: always build rcar setup for armv7"
* Add restart callback to sh73a0

* tag 'renesas-soc3-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

:
  ARM: shmobile: always build rcar setup for armv7
  ARM: shmobile: sh73a0: Add restart callback

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 0a1d6434 e3d16332

arch/arm/mach-shmobile/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ cpu-y := platsmp.o headsmp.o 


# Shared SoC family objects

obj-$(CONFIG_ARCH_RCAR_GEN2)	+= setup-rcar-gen2.o platsmp-apmu.o $(cpu-y)

CFLAGS_setup-rcar-gen2.o	+= -march=armv7-a



# SMP objects

smp-y				:= $(cpu-y)

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

+8 −0
Original line number Diff line number Diff line
@@ -775,6 +775,13 @@ void __init sh73a0_add_standard_devices_dt(void) 
	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);

}



#define RESCNT2 IOMEM(0xe6188020)

static void sh73a0_restart(enum reboot_mode mode, const char *cmd)

{

	/* Do soft power on reset */

	writel((1 << 31), RESCNT2);

}



static const char *sh73a0_boards_compat_dt[] __initdata = {

	"renesas,sh73a0",

	NULL,
@@ -786,6 +793,7 @@ DT_MACHINE_START(SH73A0_DT, "Generic SH73A0 (Flattened Device Tree)") 
	.init_early	= sh73a0_init_delay,

	.init_machine	= sh73a0_add_standard_devices_dt,

	.init_late	= shmobile_init_late,

	.restart	= sh73a0_restart,

	.dt_compat	= sh73a0_boards_compat_dt,

MACHINE_END

#endif /* CONFIG_USE_OF */