Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[karo-tx-linux.git] / arch / arm / mach-bcm / board_bcm21664.c

diff --git a/arch/arm/mach-bcm/board_bcm21664.c b/arch/arm/mach-bcm/board_bcm21664.c
index 0d7034c57334717cca8094f0a3fe2f81f6159f2f..c5bf016411725195c11708eb54b58db56d9e767c 100644 (file)
--- a/arch/arm/mach-bcm/board_bcm21664.c
+++ b/arch/arm/mach-bcm/board_bcm21664.c
@@ -11,52 +11,10 @@
  * GNU General Public License for more details.
  */
 
-#include <linux/of_address.h>
-#include <linux/io.h>
-
 #include <asm/mach/arch.h>
 
 #include "kona_l2_cache.h"
 
-#define RSTMGR_DT_STRING               "brcm,bcm21664-resetmgr"
-
-#define RSTMGR_REG_WR_ACCESS_OFFSET    0
-#define RSTMGR_REG_CHIP_SOFT_RST_OFFSET        4
-
-#define RSTMGR_WR_PASSWORD             0xa5a5
-#define RSTMGR_WR_PASSWORD_SHIFT       8
-#define RSTMGR_WR_ACCESS_ENABLE                1
-
-static void bcm21664_restart(enum reboot_mode mode, const char *cmd)
-{
-       void __iomem *base;
-       struct device_node *resetmgr;
-
-       resetmgr = of_find_compatible_node(NULL, NULL, RSTMGR_DT_STRING);
-       if (!resetmgr) {
-               pr_emerg("Couldn't find " RSTMGR_DT_STRING "\n");
-               return;
-       }
-       base = of_iomap(resetmgr, 0);
-       if (!base) {
-               pr_emerg("Couldn't map " RSTMGR_DT_STRING "\n");
-               return;
-       }
-
-       /*
-        * A soft reset is triggered by writing a 0 to bit 0 of the soft reset
-        * register. To write to that register we must first write the password
-        * and the enable bit in the write access enable register.
-        */
-       writel((RSTMGR_WR_PASSWORD << RSTMGR_WR_PASSWORD_SHIFT) |
-               RSTMGR_WR_ACCESS_ENABLE,
-               base + RSTMGR_REG_WR_ACCESS_OFFSET);
-       writel(0, base + RSTMGR_REG_CHIP_SOFT_RST_OFFSET);
-
-       /* Wait for reset */
-       while (1);
-}
-
 static void __init bcm21664_init(void)
 {
        kona_l2_cache_init();
@@ -69,6 +27,5 @@ static const char * const bcm21664_dt_compat[] = {
 
 DT_MACHINE_START(BCM21664_DT, "BCM21664 Broadcom Application Processor")
        .init_machine = bcm21664_init,
-       .restart = bcm21664_restart,
        .dt_compat = bcm21664_dt_compat,
 MACHINE_END