Commit ba0ae312 authored by Andrew Lunn's avatar Andrew Lunn Committed by Jason Cooper

ARM: mvebu: Let kirkwood use the system controller for restart

The mvebu system controller already supports restarting orion
systems. Remove all the C code which will be replaced by the system
controller.
Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Tested-by: default avatarJason Gunthorpe <jgunthorpe@obsidianresearch.com>
Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent ba5a37e5
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include <plat/common.h> #include <plat/common.h>
#include <plat/pcie.h> #include <plat/pcie.h>
#include "kirkwood-pm.h" #include "kirkwood-pm.h"
#include "common.h"
static struct resource kirkwood_cpufreq_resources[] = { static struct resource kirkwood_cpufreq_resources[] = {
[0] = { [0] = {
...@@ -68,23 +69,6 @@ static void __init kirkwood_cpuidle_init(void) ...@@ -68,23 +69,6 @@ static void __init kirkwood_cpuidle_init(void)
platform_device_register(&kirkwood_cpuidle); platform_device_register(&kirkwood_cpuidle);
} }
/* Temporary here since mach-mvebu has a function we can use */
static void kirkwood_restart(enum reboot_mode mode, const char *cmd)
{
/*
* Enable soft reset to assert RSTOUTn.
*/
writel(SOFT_RESET_OUT_EN, RSTOUTn_MASK);
/*
* Assert soft reset.
*/
writel(SOFT_RESET, SYSTEM_SOFT_RESET);
while (1)
;
}
#define MV643XX_ETH_MAC_ADDR_LOW 0x0414 #define MV643XX_ETH_MAC_ADDR_LOW 0x0414
#define MV643XX_ETH_MAC_ADDR_HIGH 0x0418 #define MV643XX_ETH_MAC_ADDR_HIGH 0x0418
...@@ -204,6 +188,6 @@ static const char * const kirkwood_dt_board_compat[] = { ...@@ -204,6 +188,6 @@ static const char * const kirkwood_dt_board_compat[] = {
DT_MACHINE_START(KIRKWOOD_DT, "Marvell Kirkwood (Flattened Device Tree)") DT_MACHINE_START(KIRKWOOD_DT, "Marvell Kirkwood (Flattened Device Tree)")
/* Maintainer: Jason Cooper <jason@lakedaemon.net> */ /* Maintainer: Jason Cooper <jason@lakedaemon.net> */
.init_machine = kirkwood_dt_init, .init_machine = kirkwood_dt_init,
.restart = kirkwood_restart, .restart = mvebu_restart,
.dt_compat = kirkwood_dt_board_compat, .dt_compat = kirkwood_dt_board_compat,
MACHINE_END MACHINE_END
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment