Skip to contentSkip to conversation

ARM: versatile: move restart to the device tree

PATCH In review Linus Walleij 3 participants 3 messages Jan 25, 2016 – Feb 15, 2016

Subsystems (4)
Arm (32-bit) Arm sub-architectures Arm/versatile express platform Arm integrator, versatile and realview support
lore
Share & tools
lore

Linus Walleij

author
#0 lore raw

PATCH 2/2 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 Sebastian Reichel <[email protected]>
Cc Dmitry Eremin-Solenikov <[email protected]>
Cc David Woodhouse <[email protected]>
Cc Rob Herring <[email protected]>
Signed-off-by Linus Walleij <[email protected]>
---
 arch/arm/mach-versatile/Kconfig        |  3 +++
 arch/arm/mach-versatile/versatile_dt.c | 13 -------------
 2 files changed, 3 insertions(+), 13 deletions(-)
arch/arm/mach-versatile/Kconfig +3 -0
index e40f777ccf7d..b0cc26284fc9 100644
@@ -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.
arch/arm/mach-versatile/versatile_dt.c +0 -13
index c44871851255..cf8a4ea6311a 100644
@@ -345,18 +345,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 +408,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
Signature · 1 line
2.4.3
#1 lore raw

PATCH 2/2 ARM: versatile: move restart to the device tree

Quoted 10 lines · On Monday 25 January 2016 09:30:56 Linus Walleij wrote:

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 Sebastian Reichel <[email protected]>
Cc Dmitry Eremin-Solenikov <[email protected]>
Cc David Woodhouse <[email protected]>
Cc Rob Herring <[email protected]>
Signed-off-by Linus Walleij <[email protected]>

Good idea.

Acked-by Arnd Bergmann <[email protected]>

I don't see patch 1/2 here. Maybe that was caught by the list spam filters in some way?

#2 lore raw

PATCH 2/2 ARM: versatile: move restart to the device tree

In reply to Linus Walleij

Hi,

Quoted 9 lines · Linus Walleij

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 Sebastian Reichel <[email protected]>
Cc Dmitry Eremin-Solenikov <[email protected]>
Cc David Woodhouse <[email protected]>
Cc Rob Herring <[email protected]>
Signed-off-by Linus Walleij <[email protected]>
Acked-by Sebastian Reichel <[email protected]>

-- Sebastian
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20160215/ac760a53/attachment.sig>