ARM: uniphier: refactor board_init()

The code here is cluttered due to the switch statement.  Introduce a
table of callbacks to clean up the initialization code across SoCs.

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

diff --git a/arch/arm/mach-uniphier/board_init.c b/arch/arm/mach-uniphier/board_init.c
index 4cab7fe32b3ff7d02a080e5cfa3e9dd8b64737e2..d698dd59f1738204880175d76cea623c69253fcc 100644 (file)
--- a/arch/arm/mach-uniphier/board_init.c
+++ b/arch/arm/mach-uniphier/board_init.c
@@ -48,116 +48,177 @@ static void uniphier_setup_xirq(void)
        writel(tmp, 0x55000090);
 }
 
-static void uniphier_nand_pin_init(bool cs2)
+#ifdef CONFIG_ARCH_UNIPHIER_LD11
+static void uniphier_ld11_misc_init(void)
 {
-#ifdef CONFIG_NAND_DENALI
-       if (uniphier_pin_init(cs2 ? "nand2cs_grp" : "nand_grp"))
-               pr_err("failed to init NAND pins\n");
-#endif
+       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
 
-int board_init(void)
+#ifdef CONFIG_ARCH_UNIPHIER_LD20
+static void uniphier_ld20_misc_init(void)
 {
-       led_puts("U0");
+       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);
+               writel(0x00000100, 0x6184e040);
+               writel(0x0000b500, 0x6184e024);
+               writel(0x00000001, 0x6184e000);
+       }
+
+       cci500_init(2);
+}
+#endif
+
+struct uniphier_initdata {
+       enum uniphier_soc_id soc_id;
+       bool nand_2cs;
+       void (*pll_init)(void);
+       void (*clk_init)(void);
+       void (*misc_init)(void);
+};
 
-       switch (uniphier_get_soc_type()) {
+struct uniphier_initdata uniphier_initdata[] = {
 #if defined(CONFIG_ARCH_UNIPHIER_SLD3)
-       case SOC_UNIPHIER_SLD3:
-               uniphier_nand_pin_init(true);
-               led_puts("U1");
-               uniphier_sld3_pll_init();
-               uniphier_ld4_clk_init();
-               break;
+       {
+               .soc_id = SOC_UNIPHIER_SLD3,
+               .nand_2cs = true,
+               .pll_init = uniphier_sld3_pll_init,
+               .clk_init = uniphier_ld4_clk_init,
+       },
 #endif
 #if defined(CONFIG_ARCH_UNIPHIER_LD4)
-       case SOC_UNIPHIER_LD4:
-               uniphier_nand_pin_init(true);
-               led_puts("U1");
-               uniphier_ld4_pll_init();
-               uniphier_ld4_clk_init();
-               break;
+       {
+               .soc_id = SOC_UNIPHIER_LD4,
+               .nand_2cs = true,
+               .pll_init = uniphier_ld4_pll_init,
+               .clk_init = uniphier_ld4_clk_init,
+       },
 #endif
 #if defined(CONFIG_ARCH_UNIPHIER_PRO4)
-       case SOC_UNIPHIER_PRO4:
-               uniphier_nand_pin_init(false);
-               led_puts("U1");
-               uniphier_pro4_pll_init();
-               uniphier_pro4_clk_init();
-               break;
+       {
+               .soc_id = SOC_UNIPHIER_PRO4,
+               .nand_2cs = false,
+               .pll_init = uniphier_pro4_pll_init,
+               .clk_init = uniphier_pro4_clk_init,
+       },
 #endif
 #if defined(CONFIG_ARCH_UNIPHIER_SLD8)
-       case SOC_UNIPHIER_SLD8:
-               uniphier_nand_pin_init(true);
-               led_puts("U1");
-               uniphier_ld4_pll_init();
-               uniphier_ld4_clk_init();
-               break;
+       {
+               .soc_id = SOC_UNIPHIER_SLD8,
+               .nand_2cs = true,
+               .pll_init = uniphier_ld4_pll_init,
+               .clk_init = uniphier_ld4_clk_init,
+       },
 #endif
 #if defined(CONFIG_ARCH_UNIPHIER_PRO5)
-       case SOC_UNIPHIER_PRO5:
-               uniphier_nand_pin_init(true);
-               led_puts("U1");
-               uniphier_pro5_clk_init();
-               break;
+       {
+               .soc_id = SOC_UNIPHIER_PRO5,
+               .nand_2cs = true,
+               .clk_init = uniphier_pro5_clk_init,
+       },
 #endif
 #if defined(CONFIG_ARCH_UNIPHIER_PXS2)
-       case SOC_UNIPHIER_PXS2:
-               uniphier_nand_pin_init(true);
-               led_puts("U1");
-               uniphier_pxs2_clk_init();
-               break;
+       {
+               .soc_id = SOC_UNIPHIER_PXS2,
+               .nand_2cs = true,
+               .clk_init = uniphier_pxs2_clk_init,
+       },
 #endif
 #if defined(CONFIG_ARCH_UNIPHIER_LD6B)
-       case SOC_UNIPHIER_LD6B:
-               uniphier_nand_pin_init(true);
-               led_puts("U1");
-               uniphier_pxs2_clk_init();
-               break;
+       {
+               .soc_id = SOC_UNIPHIER_LD6B,
+               .nand_2cs = true,
+               .clk_init = uniphier_pxs2_clk_init,
+       },
 #endif
 #if defined(CONFIG_ARCH_UNIPHIER_LD11)
-       case SOC_UNIPHIER_LD11:
-               uniphier_nand_pin_init(false);
-               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);
-               led_puts("U1");
-               uniphier_ld11_pll_init();
-               uniphier_ld11_clk_init();
-               break;
+       {
+               .soc_id = SOC_UNIPHIER_LD11,
+               .nand_2cs = false,
+               .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)
-       case SOC_UNIPHIER_LD20:
-               /* ES1 errata: increase VDD09 supply to suppress VBO noise */
-               if (uniphier_get_soc_revision() == 1) {
-                       writel(0x00000003, 0x6184e004);
-                       writel(0x00000100, 0x6184e040);
-                       writel(0x0000b500, 0x6184e024);
-                       writel(0x00000001, 0x6184e000);
-               }
-               uniphier_nand_pin_init(false);
-               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);
-               led_puts("U1");
-               uniphier_ld20_pll_init();
-               uniphier_ld20_clk_init();
-               cci500_init(2);
-               break;
+       {
+               .soc_id = SOC_UNIPHIER_LD20,
+               .nand_2cs = false,
+               .pll_init = uniphier_ld20_pll_init,
+               .misc_init = uniphier_ld20_misc_init,
+       },
 #endif
-       default:
-               break;
+};
+
+static struct uniphier_initdata *uniphier_get_initdata(
+                                               enum uniphier_soc_id soc_id)
+{
+       int i;
+
+       for (i = 0; i < ARRAY_SIZE(uniphier_initdata); i++) {
+               if (uniphier_initdata[i].soc_id == soc_id)
+                       return &uniphier_initdata[i];
        }
 
-       uniphier_setup_xirq();
+       return NULL;
+}
+
+int board_init(void)
+{
+       struct uniphier_initdata *initdata;
+       enum uniphier_soc_id soc_id;
+       int ret;
+
+       led_puts("U0");
+
+       soc_id = uniphier_get_soc_type();
+       initdata = uniphier_get_initdata(soc_id);
+       if (!initdata) {
+               pr_err("unsupported board\n");
+               return -EINVAL;
+       }
+
+       if (IS_ENABLED(CONFIG_NAND_DENALI)) {
+               ret = uniphier_pin_init(initdata->nand_2cs ?
+                                       "nand2cs_grp" : "nand_grp");
+               if (ret)
+                       pr_err("failed to init NAND pins\n");
+       }
+
+       led_puts("U1");
+
+       if (initdata->pll_init)
+               initdata->pll_init();
 
        led_puts("U2");
 
-       support_card_late_init();
+       if (initdata->clk_init)
+               initdata->clk_init();
 
        led_puts("U3");
 
+       if (initdata->misc_init)
+               initdata->misc_init();
+
+       led_puts("U4");
+
+       uniphier_setup_xirq();
+
+       led_puts("U5");
+
+       support_card_late_init();
+
+       led_puts("U6");
+
 #ifdef CONFIG_ARM64
        uniphier_smp_kick_all_cpus();
 #endif

diff --git a/arch/arm/mach-uniphier/clk/Makefile b/arch/arm/mach-uniphier/clk/Makefile
index 765660f8758e82aec8f23b3300524c780015d103..bf77fca5a975669d0d5b351c111bbdd2688f588c 100644 (file)
--- a/arch/arm/mach-uniphier/clk/Makefile
+++ b/arch/arm/mach-uniphier/clk/Makefile
@@ -24,7 +24,7 @@ obj-$(CONFIG_ARCH_UNIPHIER_PRO5)      += clk-pro5.o
 obj-$(CONFIG_ARCH_UNIPHIER_PXS2)       += clk-pxs2.o
 obj-$(CONFIG_ARCH_UNIPHIER_LD6B)       += clk-pxs2.o
 obj-$(CONFIG_ARCH_UNIPHIER_LD11)       += clk-ld11.o pll-ld11.o
-obj-$(CONFIG_ARCH_UNIPHIER_LD20)       += clk-ld20.o pll-ld20.o
+obj-$(CONFIG_ARCH_UNIPHIER_LD20)       += pll-ld20.o
 
 endif
 

diff --git a/arch/arm/mach-uniphier/clk/clk-ld20.c b/arch/arm/mach-uniphier/clk/clk-ld20.c
deleted file mode 100644 (file)
index 556a30a..0000000
--- a/arch/arm/mach-uniphier/clk/clk-ld20.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright (C) 2016 Masahiro Yamada <yamada.masahiro@socionext.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#include <linux/io.h>
-
-#include "../init.h"
-#include "../sc64-regs.h"
-
-void uniphier_ld20_clk_init(void)
-{
-}

diff --git a/arch/arm/mach-uniphier/init.h b/arch/arm/mach-uniphier/init.h
index 18393e5e06ad9222d38a7b2806ce28618ae4cf23..6a1816f6d503caf6970a924d70ca95832b3391dc 100644 (file)
--- a/arch/arm/mach-uniphier/init.h
+++ b/arch/arm/mach-uniphier/init.h
@@ -114,7 +114,6 @@ void uniphier_pro4_clk_init(void);
 void uniphier_pro5_clk_init(void);
 void uniphier_pxs2_clk_init(void);
 void uniphier_ld11_clk_init(void);
-void uniphier_ld20_clk_init(void);
 
 int uniphier_pin_init(const char *pinconfig_name);
 void uniphier_smp_kick_all_cpus(void);