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

Commit 73a0e335 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

Pull "Renesas ARM Based SoC Boards Updates for v3.19" from Simon Horman:

* Add restart callback to kzm9g

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

:
  ARM: shmobile: kzm9g-reference: Add restart callback

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents b4e2c4bf 534547c0

arch/arm/mach-shmobile/board-kzm9g-reference.c

+8 −0
Original line number Diff line number Diff line
@@ -43,6 +43,13 @@ static void __init kzm_init(void) 
#endif

}



#define RESCNT2 IOMEM(0xe6188020)

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

{

	/* Do soft power on reset */

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

}



static const char *kzm9g_boards_compat_dt[] __initdata = {

	"renesas,kzm9g-reference",

	NULL,
@@ -54,5 +61,6 @@ DT_MACHINE_START(KZM9G_DT, "kzm9g-reference") 
	.init_early	= shmobile_init_delay,

	.init_machine	= kzm_init,

	.init_late	= shmobile_init_late,

	.restart	= kzm9g_restart,

	.dt_compat	= kzm9g_boards_compat_dt,

MACHINE_END