ARM: keystone: remove redundant reset stuff

Remove reset stuff in flavour of using keystone reset driver:
driver/power/reset/keystone-reset.c

Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>

diff --git a/arch/arm/mach-keystone/keystone.c b/arch/arm/mach-keystone/keystone.c
index 59b8383cbdb0761928c7577992c3874242f28e15..1f9ae89ee06d1fb39d82816710cfbc89903a3817 100644 (file)
--- a/arch/arm/mach-keystone/keystone.c
+++ b/arch/arm/mach-keystone/keystone.c
@@ -26,11 +26,6 @@
 
 #include "keystone.h"
 
-#define PLL_RESET_WRITE_KEY_MASK               0xffff0000
-#define PLL_RESET_WRITE_KEY                    0x5a69
-#define PLL_RESET                              BIT(16)
-
-static void __iomem *keystone_rstctrl;
 static struct notifier_block platform_nb;
 static unsigned long keystone_dma_pfn_offset __read_mostly;
 
@@ -55,16 +50,6 @@ static int keystone_platform_notifier(struct notifier_block *nb,
 
 static void __init keystone_init(void)
 {
-       struct device_node *node;
-
-       node = of_find_compatible_node(NULL, NULL, "ti,keystone-reset");
-       if (WARN_ON(!node))
-               pr_warn("ti,keystone-reset node undefined\n");
-
-       keystone_rstctrl = of_iomap(node, 0);
-       if (WARN_ON(!keystone_rstctrl))
-               pr_warn("ti,keystone-reset iomap error\n");
-
        keystone_pm_runtime_init();
        if (platform_nb.notifier_call)
                bus_register_notifier(&platform_bus_type, &platform_nb);
@@ -123,24 +108,6 @@ static const char *keystone_match[] __initconst = {
        NULL,
 };
 
-void keystone_restart(enum reboot_mode mode, const char *cmd)
-{
-       u32 val;
-
-       BUG_ON(!keystone_rstctrl);
-
-       /* Enable write access to RSTCTRL */
-       val = readl(keystone_rstctrl);
-       val &= PLL_RESET_WRITE_KEY_MASK;
-       val |= PLL_RESET_WRITE_KEY;
-       writel(val, keystone_rstctrl);
-
-       /* Reset the SOC */
-       val = readl(keystone_rstctrl);
-       val &= ~PLL_RESET;
-       writel(val, keystone_rstctrl);
-}
-
 DT_MACHINE_START(KEYSTONE, "Keystone")
 #if defined(CONFIG_ZONE_DMA) && defined(CONFIG_ARM_LPAE)
        .dma_zone_size  = SZ_2G,
@@ -148,6 +115,5 @@ DT_MACHINE_START(KEYSTONE, "Keystone")
        .smp            = smp_ops(keystone_smp_ops),
        .init_machine   = keystone_init,
        .dt_compat      = keystone_match,
-       .restart        = keystone_restart,
        .init_meminfo   = keystone_init_meminfo,
 MACHINE_END