ARM: dts: rmobile: Reserve space in R-Car Gen3 DTs

[oweals/u-boot.git] / arch / arm / mach-keystone / keystone.c

diff --git a/arch/arm/mach-keystone/keystone.c b/arch/arm/mach-keystone/keystone.c
index a8071270e9bf5bc1cdf233aa8970536d2f855996..efaabca5a7e77eb02888399dcc182e49f2217bc4 100644 (file)
--- a/arch/arm/mach-keystone/keystone.c
+++ b/arch/arm/mach-keystone/keystone.c
@@ -1,18 +1,17 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Keystone EVM : Board initialization
  *
  * (C) Copyright 2014
  *     Texas Instruments Incorporated, <www.ti.com>
- *
- * SPDX-License-Identifier:     GPL-2.0+
  */
 
 #include <common.h>
+#include <env.h>
+#include <init.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 +29,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,23 +42,12 @@ 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;
        long ks2_debug = 0;
 
-       env = getenv("ks2_debug");
+       env = env_get("ks2_debug");
 
        if (env)
                ks2_debug = simple_strtol(env, NULL, 0);