Commit 47c128c6 authored by Andrew Davis's avatar Andrew Davis Committed by Arnd Bergmann
Browse files

ARM: nspire: Use syscon-reboot to handle restart 



Writing this bit can be handled by the DT syscon-reboot driver.
Enable that driver and remove the machine_desc version.

Signed-off-by: default avatarAndrew Davis <afd@ti.com>
Tested-by: default avatarFabian Vogt <fabian@ritter-vogt.de>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Reviewed-by: default avatarFabian Vogt <fabian@ritter-vogt.de>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent d69ba6fe

arch/arm/mach-nspire/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -9,5 +9,7 @@ config ARCH_NSPIRE 
	select ARM_VIC

	select ARM_TIMER_SP804

	select NSPIRE_TIMER

	select POWER_RESET

	select POWER_RESET_SYSCON

	help

	  This enables support for systems using the TI-NSPIRE CPU

arch/arm/mach-nspire/mmio.h

+0 −3
Original line number Diff line number Diff line
@@ -5,9 +5,6 @@ 
 *	Copyright (C) 2013 Daniel Tang <tangrs@tangrs.id.au>

 */



#define NSPIRE_MISC_PHYS_BASE		0x900A0000

#define NSPIRE_MISC_HWRESET		0x08



#define NSPIRE_PWR_PHYS_BASE		0x900B0000

#define NSPIRE_PWR_VIRT_BASE		0xFEEB0000

#define NSPIRE_PWR_BUS_DISABLE1		0x18

arch/arm/mach-nspire/nspire.c

+0 −10
Original line number Diff line number Diff line
@@ -20,16 +20,6 @@ static const char *const nspire_dt_match[] __initconst = { 
	NULL,

};



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

{

	void __iomem *base = ioremap(NSPIRE_MISC_PHYS_BASE, SZ_4K);

	if (!base)

		return;



	writel(2, base + NSPIRE_MISC_HWRESET);

}



DT_MACHINE_START(NSPIRE, "TI-NSPIRE")

	.dt_compat	= nspire_dt_match,

	.restart	= nspire_restart,

MACHINE_END