Merge git://git.denx.de/u-boot-sunxi

[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 28784ea631b87d441e2971f43fdfc8ac743ec803..8418902a5a74bce4bcd9e88afb0e05af42a32272 100644 (file)
--- a/arch/arm/mach-uniphier/board_init.c
+++ b/arch/arm/mach-uniphier/board_init.c
@@ -6,35 +6,17 @@
  * 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;
-
-#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);
@@ -105,7 +87,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)