ARM: versatile: move restart to the device tree
We have a power/reset driver for the Versatile family in drivers/power/reset so let's just activate that driver and use it and get rid of some non-DT remnants. Cc: Rob Herring <robh@kernel.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
parent
820617c251
commit
1c6e288da6
|
@ -8,8 +8,11 @@ config ARCH_VERSATILE
|
|||
select COMMON_CLK_VERSATILE
|
||||
select CPU_ARM926T
|
||||
select ICST
|
||||
select MFD_SYSCON
|
||||
select MIGHT_HAVE_PCI
|
||||
select PLAT_VERSATILE
|
||||
select POWER_RESET
|
||||
select POWER_RESET_VERSATILE
|
||||
select VERSATILE_FPGA_IRQ
|
||||
help
|
||||
This enables support for ARM Ltd Versatile board.
|
||||
|
|
|
@ -52,8 +52,6 @@
|
|||
* Versatile Registers
|
||||
* ------------------------------------------------------------------------
|
||||
*/
|
||||
#define VERSATILE_SYS_LOCK_OFFSET 0x20
|
||||
#define VERSATILE_SYS_RESETCTL_OFFSET 0x40
|
||||
#define VERSATILE_SYS_PCICTL_OFFSET 0x44
|
||||
#define VERSATILE_SYS_MCI_OFFSET 0x48
|
||||
#define VERSATILE_SYS_FLASH_OFFSET 0x4C
|
||||
|
@ -345,18 +343,6 @@ static void __init versatile_init_early(void)
|
|||
__io_address(VERSATILE_SCTL_BASE));
|
||||
}
|
||||
|
||||
static void versatile_restart(enum reboot_mode mode, const char *cmd)
|
||||
{
|
||||
u32 val;
|
||||
|
||||
val = readl(versatile_sys_base + VERSATILE_SYS_RESETCTL_OFFSET);
|
||||
val |= 0x105;
|
||||
|
||||
writel(0xa05f, versatile_sys_base + VERSATILE_SYS_LOCK_OFFSET);
|
||||
writel(val, versatile_sys_base + VERSATILE_SYS_RESETCTL_OFFSET);
|
||||
writel(0, versatile_sys_base + VERSATILE_SYS_LOCK_OFFSET);
|
||||
}
|
||||
|
||||
static void __init versatile_dt_pci_init(void)
|
||||
{
|
||||
u32 val;
|
||||
|
@ -420,5 +406,4 @@ DT_MACHINE_START(VERSATILE_PB, "ARM-Versatile (Device Tree Support)")
|
|||
.init_early = versatile_init_early,
|
||||
.init_machine = versatile_dt_init,
|
||||
.dt_compat = versatile_dt_match,
|
||||
.restart = versatile_restart,
|
||||
MACHINE_END
|
||||
|
|
Loading…
Reference in a new issue