ARM: kirkwood: Add device-tree for keymile

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

diff --git a/arch/arm/mach-uniphier/board_init.c b/arch/arm/mach-uniphier/board_init.c
index a6ee22e3392d77d8720d50b6cadc693e88fba6fd..7535f915286d430451abe4409b020839d5807871 100644 (file)
--- a/arch/arm/mach-uniphier/board_init.c
+++ b/arch/arm/mach-uniphier/board_init.c
@@ -1,71 +1,21 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2012-2015 Panasonic Corporation
  * Copyright (C) 2015-2016 Socionext Inc.
  *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
-#include <common.h>
-#include <libfdt.h>
+#include <linux/errno.h>
 #include <linux/io.h>
+#include <linux/printk.h>
 
 #include "init.h"
 #include "micro-support-card.h"
-#include "sg-regs.h"
 #include "soc-info.h"
 
-DECLARE_GLOBAL_DATA_PTR;
-
-static void uniphier_setup_xirq(void)
-{
-       const void *fdt = gd->fdt_blob;
-       int soc_node, aidet_node;
-       const fdt32_t *val;
-       unsigned long aidet_base;
-       u32 tmp;
-
-       soc_node = fdt_path_offset(fdt, "/soc");
-       if (soc_node < 0)
-               return;
-
-       aidet_node = fdt_subnode_offset_namelen(fdt, soc_node, "aidet", 5);
-       if (aidet_node < 0)
-               return;
-
-       val = fdt_getprop(fdt, aidet_node, "reg", NULL);
-       if (!val)
-               return;
-
-       aidet_base = fdt32_to_cpu(*val);
-
-       tmp = readl(aidet_base + 8);    /* AIDET DETCONFR2 */
-       tmp |= 0x00ff0000;              /* Set XIRQ0-7 low active */
-       writel(tmp, aidet_base + 8);
-
-       tmp = readl(0x55000090);        /* IRQCTL */
-       tmp |= 0x000000ff;
-       writel(tmp, 0x55000090);
-}
-
-#ifdef CONFIG_ARCH_UNIPHIER_LD11
-static void uniphier_ld11_misc_init(void)
-{
-       sg_set_pinsel(149, 14, 8, 4);   /* XIRQ0    -> XIRQ0 */
-       sg_set_iectrl(149);
-       sg_set_pinsel(153, 14, 8, 4);   /* XIRQ4    -> XIRQ4 */
-       sg_set_iectrl(153);
-}
-#endif
-
 #ifdef CONFIG_ARCH_UNIPHIER_LD20
 static void uniphier_ld20_misc_init(void)
 {
-       sg_set_pinsel(149, 14, 8, 4);   /* XIRQ0    -> XIRQ0 */
-       sg_set_iectrl(149);
-       sg_set_pinsel(153, 14, 8, 4);   /* XIRQ4    -> XIRQ4 */
-       sg_set_iectrl(153);
-
        /* ES1 errata: increase VDD09 supply to suppress VBO noise */
        if (uniphier_get_soc_revision() == 1) {
                writel(0x00000003, 0x6184e004);
@@ -136,7 +86,6 @@ static const struct uniphier_initdata uniphier_initdata[] = {
                .sbc_init = uniphier_ld11_sbc_init,
                .pll_init = uniphier_ld11_pll_init,
                .clk_init = uniphier_ld11_clk_init,
-               .misc_init = uniphier_ld11_misc_init,
        },
 #endif
 #if defined(CONFIG_ARCH_UNIPHIER_LD20)
@@ -192,10 +141,6 @@ int board_init(void)
 
        led_puts("U3");
 
-       uniphier_setup_xirq();
-
-       led_puts("U4");
-
        support_card_late_init();
 
        led_puts("Uboo");