ARM: uniphier: reuse uniphier_cache_disable() for lowlevel_init

[u-boot] / arch / arm / mach-uniphier / board_early_init_f.c

diff --git a/arch/arm/mach-uniphier/board_early_init_f.c b/arch/arm/mach-uniphier/board_early_init_f.c
index bf81345ab9e50253df3403bde1d9a2036dab9977..d35d38dcbf3ef70aa8466642cdc6d32e94e50212 100644 (file)
--- a/arch/arm/mach-uniphier/board_early_init_f.c
+++ b/arch/arm/mach-uniphier/board_early_init_f.c
@@ -1,22 +1,126 @@
 /*
- * Copyright (C) 2012-2015 Panasonic Corporation
- *   Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
+ * Copyright (C) 2012-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
  *
  * SPDX-License-Identifier:    GPL-2.0+
  */
 
-#include <mach/led.h>
-#include <mach/board.h>
+#include <common.h>
+#include <libfdt.h>
+#include <linux/io.h>
 
-void pin_init(void);
+#include "init.h"
+#include "micro-support-card.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 u32 *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);
+}
 
 int board_early_init_f(void)
 {
-       led_write(U, 0, , );
+       led_puts("U0");
+
+       switch (uniphier_get_soc_type()) {
+#if defined(CONFIG_ARCH_UNIPHIER_SLD3)
+       case SOC_UNIPHIER_SLD3:
+               uniphier_sld3_pin_init();
+               led_puts("U1");
+               uniphier_ld4_clk_init();
+               break;
+#endif
+#if defined(CONFIG_ARCH_UNIPHIER_LD4)
+       case SOC_UNIPHIER_LD4:
+               uniphier_ld4_pin_init();
+               led_puts("U1");
+               uniphier_ld4_clk_init();
+               break;
+#endif
+#if defined(CONFIG_ARCH_UNIPHIER_PRO4)
+       case SOC_UNIPHIER_PRO4:
+               uniphier_pro4_pin_init();
+               led_puts("U1");
+               uniphier_pro4_clk_init();
+               break;
+#endif
+#if defined(CONFIG_ARCH_UNIPHIER_SLD8)
+       case SOC_UNIPHIER_SLD8:
+               uniphier_sld8_pin_init();
+               led_puts("U1");
+               uniphier_ld4_clk_init();
+               break;
+#endif
+#if defined(CONFIG_ARCH_UNIPHIER_PRO5)
+       case SOC_UNIPHIER_PRO5:
+               uniphier_pro5_pin_init();
+               led_puts("U1");
+               uniphier_pro5_clk_init();
+               break;
+#endif
+#if defined(CONFIG_ARCH_UNIPHIER_PXS2)
+       case SOC_UNIPHIER_PXS2:
+               uniphier_pxs2_pin_init();
+               led_puts("U1");
+               uniphier_pxs2_clk_init();
+               break;
+#endif
+#if defined(CONFIG_ARCH_UNIPHIER_LD6B)
+       case SOC_UNIPHIER_LD6B:
+               uniphier_ld6b_pin_init();
+               led_puts("U1");
+               uniphier_pxs2_clk_init();
+               break;
+#endif
+#if defined(CONFIG_ARCH_UNIPHIER_LD11)
+       case SOC_UNIPHIER_LD11:
+               uniphier_ld20_pin_init();
+               led_puts("U1");
+               uniphier_ld11_clk_init();
+               break;
+#endif
+#if defined(CONFIG_ARCH_UNIPHIER_LD20)
+       case SOC_UNIPHIER_LD20:
+               uniphier_ld20_pin_init();
+               led_puts("U1");
+               uniphier_ld20_clk_init();
+               cci500_init(2);
+               break;
+#endif
+       default:
+               break;
+       }
 
-       pin_init();
+       uniphier_setup_xirq();
 
-       led_write(U, 1, , );
+       led_puts("U2");
 
        return 0;
 }