ARM: keystone2: Switch to using the poweroff command

Now that we have a standard way to power off the hardware, switch to
using that rather than our own command.

Cc: Vitaly Andrianov <vitalya@ti.com>
Cc: Nishanth Menon <nm@ti.com>
Cc: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 653ecc8..e5f57ef 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -450,6 +450,7 @@ config ARCH_KEYSTONE
        bool "TI Keystone"
        select CPU_V7
        select SUPPORT_SPL
+       select CMD_POWEROFF
 
 config ARCH_MX7
        bool "Freescale MX7"

diff --git a/arch/arm/mach-keystone/Makefile b/arch/arm/mach-keystone/Makefile
index 7f12009..8829e7f 100644 (file)
--- a/arch/arm/mach-keystone/Makefile
+++ b/arch/arm/mach-keystone/Makefile
@@ -12,6 +12,7 @@ obj-y += mon.o
 ifndef CONFIG_SPL_BUILD
 obj-y  += cmd_clock.o
 obj-y  += cmd_mon.o
+obj-y  += cmd_poweroff.o
 endif
 obj-y  += msmc.o
 obj-y  += ddr3.o cmd_ddr3.o

diff --git a/arch/arm/mach-keystone/cmd_poweroff.c b/arch/arm/mach-keystone/cmd_poweroff.c
new file mode 100644 (file)
index 0000000..1b127a8
--- /dev/null
+++ b/arch/arm/mach-keystone/cmd_poweroff.c
@@ -0,0 +1,28 @@
+/*
+ * Keystone EVM : Power off
+ *
+ * (C) Copyright 2014
+ *     Texas Instruments Incorporated, <www.ti.com>
+ *
+ * SPDX-License-Identifier:     GPL-2.0+
+ */
+
+#include <common.h>
+#include <command.h>
+#include <asm/arch/mon.h>
+#include <asm/arch/psc_defs.h>
+#include <asm/arch/hardware.h>
+
+int do_poweroff(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+{
+       mon_power_off(0);
+
+       psc_disable_module(KS2_LPSC_TETRIS);
+       psc_disable_domain(KS2_TETRIS_PWR_DOMAIN);
+
+       asm volatile ("isb\n"
+                     "dsb\n"
+                     "wfi\n");
+
+       return 0;
+}

diff --git a/arch/arm/mach-keystone/keystone.c b/arch/arm/mach-keystone/keystone.c
index a807127..beb8a76 100644 (file)
--- a/arch/arm/mach-keystone/keystone.c
+++ b/arch/arm/mach-keystone/keystone.c
@@ -9,10 +9,8 @@
 
 #include <common.h>
 #include <asm/io.h>
-#include <asm/arch/mon.h>
 #include <asm/arch/psc_defs.h>
 #include <asm/arch/hardware.h>
-#include <asm/arch/hardware.h>
 
 /**
  * cpu_to_bus - swap bytes of the 32-bit data if the device is BE
@@ -30,22 +28,6 @@ int cpu_to_bus(u32 *ptr, u32 length)
        return 0;
 }
 
-static int turn_off_myself(void)
-{
-       printf("Turning off ourselves\r\n");
-       mon_power_off(0);
-
-       psc_disable_module(KS2_LPSC_TETRIS);
-       psc_disable_domain(KS2_TETRIS_PWR_DOMAIN);
-
-       asm volatile ("isb\n"
-                     "dsb\n"
-                     "wfi\n");
-
-       printf("What! Should not see that\n");
-       return 0;
-}
-
 static void turn_off_all_dsps(int num_dsps)
 {
        int i;
@@ -59,17 +41,6 @@ static void turn_off_all_dsps(int num_dsps)
        }
 }
 
-int do_killme_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
-{
-       return turn_off_myself();
-}
-
-U_BOOT_CMD(
-       killme, 1,      0,      do_killme_cmd,
-       "turn off main ARM core",
-       "turn off main ARM core. Should not live after that :(\n"
-);
-
 int misc_init_r(void)
 {
        char *env;