ARM: uniphier: merge board init functions into board_init()

Currently, the UniPhier platform calls several init functions in the
following order:

  [1] spl_board_init()
  [2] board_early_init_f()
  [3] board_init()
  [4] board_early_init_r()
  [5] board_late_init()

The serial console is not ready at the point of [2], so we want to
avoid using [2] from the view point of debuggability.  Fortunately,
all of the initialization in [2] can be delayed until [3].  I see no
good reason to split into [3] and [4].  So, merge [2] through [4].

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

diff --git a/arch/arm/mach-uniphier/Makefile b/arch/arm/mach-uniphier/Makefile
index 2e92e155810915b0861405a0e048a25b0bc7fb44..1fe5199a3a0845c42f7a93274223b04b562fe52e 100644 (file)
--- a/arch/arm/mach-uniphier/Makefile
+++ b/arch/arm/mach-uniphier/Makefile
@@ -9,11 +9,9 @@ obj-$(CONFIG_MICRO_SUPPORT_CARD) += sbc/
 
 else
 
-obj-$(CONFIG_BOARD_EARLY_INIT_F) += board_early_init_f.o
 obj-$(CONFIG_DISPLAY_CPUINFO) += cpu_info.o
 obj-y += dram_init.o
-obj-y += board_common.o
-obj-$(CONFIG_BOARD_EARLY_INIT_R) += board_early_init_r.o
+obj-y += board_init.o
 obj-$(CONFIG_BOARD_LATE_INIT) += board_late_init.o
 obj-y += reset.o
 

diff --git a/arch/arm/mach-uniphier/board_common.c b/arch/arm/mach-uniphier/board_common.c
deleted file mode 100644 (file)
index 330d690..0000000
--- a/arch/arm/mach-uniphier/board_common.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright (C) 2012-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#include <common.h>
-
-#include "micro-support-card.h"
-
-void uniphier_smp_kick_all_cpus(void);
-
-int board_init(void)
-{
-       led_puts("Uboo");
-#ifdef CONFIG_ARM64
-       uniphier_smp_kick_all_cpus();
-#endif
-       return 0;
-}

diff --git a/arch/arm/mach-uniphier/board_early_init_f.c b/arch/arm/mach-uniphier/board_early_init_f.c
deleted file mode 100644 (file)
index d35d38d..0000000
--- a/arch/arm/mach-uniphier/board_early_init_f.c
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Copyright (C) 2012-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#include <common.h>
-#include <libfdt.h>
-#include <linux/io.h>
-
-#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_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;
-       }
-
-       uniphier_setup_xirq();
-
-       led_puts("U2");
-
-       return 0;
-}

diff --git a/arch/arm/mach-uniphier/board_early_init_r.c b/arch/arm/mach-uniphier/board_early_init_r.c
deleted file mode 100644 (file)
index b26da36..0000000
--- a/arch/arm/mach-uniphier/board_early_init_r.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright (C) 2014-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#include <common.h>
-
-#include "micro-support-card.h"
-
-int board_early_init_r(void)
-{
-       support_card_late_init();
-       return 0;
-}

diff --git a/arch/arm/mach-uniphier/board_init.c b/arch/arm/mach-uniphier/board_init.c
new file mode 100644 (file)
index 0000000..6bf35ee
--- /dev/null
+++ b/arch/arm/mach-uniphier/board_init.c
@@ -0,0 +1,138 @@
+/*
+ * 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/io.h>
+
+#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_init(void)
+{
+       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;
+       }
+
+       uniphier_setup_xirq();
+
+       led_puts("U2");
+
+       support_card_late_init();
+
+       led_puts("U3");
+
+#ifdef CONFIG_ARM64
+       uniphier_smp_kick_all_cpus();
+#endif
+
+       led_puts("Uboo");
+
+       return 0;
+}

diff --git a/arch/arm/mach-uniphier/init.h b/arch/arm/mach-uniphier/init.h
index db80074fc9e708485af2f9ec71ca2e61001d82ca..a2fedbc00a6c8ba79f27b346ad872fc59ab13f3d 100644 (file)
--- a/arch/arm/mach-uniphier/init.h
+++ b/arch/arm/mach-uniphier/init.h
@@ -115,6 +115,7 @@ void uniphier_pxs2_clk_init(void);
 void uniphier_ld11_clk_init(void);
 void uniphier_ld20_clk_init(void);
 
+void uniphier_smp_kick_all_cpus(void);
 void cci500_init(int nr_slaves);
 
 #define pr_err(fmt, args...)   printf(fmt, ##args)

diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h
index 1e601b959e9f4c45ccb06392f22e8138a2a749f2..f835ff1173e8556f8ae25e1255512a035a7582aa 100644 (file)
--- a/include/configs/uniphier.h
+++ b/include/configs/uniphier.h
@@ -31,8 +31,6 @@
 
 #define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DISPLAY_BOARDINFO
-#define CONFIG_BOARD_EARLY_INIT_F
-#define CONFIG_BOARD_EARLY_INIT_R
 #define CONFIG_BOARD_LATE_INIT
 
 #define CONFIG_SYS_MALLOC_LEN          (4 * 1024 * 1024)