Skip to content

Commit 47c128c

Browse files
glneoarndb
authored andcommitted
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: Andrew Davis <[email protected]> Tested-by: Fabian Vogt <[email protected]> Reviewed-by: Linus Walleij <[email protected]> Reviewed-by: Fabian Vogt <[email protected]> Signed-off-by: Arnd Bergmann <[email protected]>
1 parent d69ba6f commit 47c128c

File tree

3 files changed

+2
-13
lines changed

3 files changed

+2
-13
lines changed

arch/arm/mach-nspire/Kconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,7 @@ config ARCH_NSPIRE
99
select ARM_VIC
1010
select ARM_TIMER_SP804
1111
select NSPIRE_TIMER
12+
select POWER_RESET
13+
select POWER_RESET_SYSCON
1214
help
1315
This enables support for systems using the TI-NSPIRE CPU

arch/arm/mach-nspire/mmio.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
* Copyright (C) 2013 Daniel Tang <[email protected]>
66
*/
77

8-
#define NSPIRE_MISC_PHYS_BASE 0x900A0000
9-
#define NSPIRE_MISC_HWRESET 0x08
10-
118
#define NSPIRE_PWR_PHYS_BASE 0x900B0000
129
#define NSPIRE_PWR_VIRT_BASE 0xFEEB0000
1310
#define NSPIRE_PWR_BUS_DISABLE1 0x18

arch/arm/mach-nspire/nspire.c

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,6 @@ static const char *const nspire_dt_match[] __initconst = {
2020
NULL,
2121
};
2222

23-
static void nspire_restart(enum reboot_mode mode, const char *cmd)
24-
{
25-
void __iomem *base = ioremap(NSPIRE_MISC_PHYS_BASE, SZ_4K);
26-
if (!base)
27-
return;
28-
29-
writel(2, base + NSPIRE_MISC_HWRESET);
30-
}
31-
3223
DT_MACHINE_START(NSPIRE, "TI-NSPIRE")
3324
.dt_compat = nspire_dt_match,
34-
.restart = nspire_restart,
3525
MACHINE_END

0 commit comments

Comments
 (0)