]> git.sur5r.net Git - u-boot/commitdiff
ARM: uniphier: drop ad-hoc input enable settings
authorMasahiro Yamada <yamada.masahiro@socionext.com>
Fri, 11 Sep 2015 11:17:44 +0000 (20:17 +0900)
committerMasahiro Yamada <yamada.masahiro@socionext.com>
Thu, 24 Sep 2015 15:27:52 +0000 (00:27 +0900)
These input enable settings are handled by the pinctrl drivers.

Because the external bus pins are input-enabled by default, on-board
devices such as LED still work fine even with this delayed input
enabling.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
arch/arm/mach-uniphier/ph1-ld4/Makefile
arch/arm/mach-uniphier/ph1-ld4/sg_init.c [deleted file]
arch/arm/mach-uniphier/ph1-pro4/Makefile
arch/arm/mach-uniphier/ph1-pro4/sg_init.c [deleted file]
arch/arm/mach-uniphier/ph1-sld8/pinctrl.c
arch/arm/mach-uniphier/ph1-sld8/sg_init.c [deleted file]
arch/arm/mach-uniphier/spl.c

index 789820e0678d6599677085dca904f5ae8bf60d6b..0c198c65e773a523e7d32f24f09404c38a79d8ef 100644 (file)
@@ -4,7 +4,7 @@
 
 ifdef CONFIG_SPL_BUILD
 obj-$(CONFIG_DEBUG_LL) += lowlevel_debug.o
-obj-y += bcu_init.o sg_init.o pll_init.o early_clkrst_init.o \
+obj-y += bcu_init.o pll_init.o early_clkrst_init.o \
        pll_spectrum.o umc_init.o ddrphy_init.o
 obj-$(CONFIG_PFC_MICRO_SUPPORT_CARD) += sbc_init.o
 obj-$(CONFIG_DCC_MICRO_SUPPORT_CARD) += sbc_init_3cs.o
diff --git a/arch/arm/mach-uniphier/ph1-ld4/sg_init.c b/arch/arm/mach-uniphier/ph1-ld4/sg_init.c
deleted file mode 100644 (file)
index dab56e9..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright (C) 2011-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#include <linux/io.h>
-#include <mach/sg-regs.h>
-
-void sg_init(void)
-{
-       u32 tmp;
-
-       /* Input ports must be enabled before deasserting reset of cores */
-       tmp = readl(SG_IECTRL);
-       tmp |= 0x1;
-       writel(tmp, SG_IECTRL);
-}
index 7fdb36a394eaa65aee16fc2e1dd26df650b49caf..afd9235e9b34e425500987b23b6b6f765513f0b7 100644 (file)
@@ -4,7 +4,7 @@
 
 ifdef CONFIG_SPL_BUILD
 obj-$(CONFIG_DEBUG_LL) += lowlevel_debug.o
-obj-y += sg_init.o pll_init.o early_clkrst_init.o \
+obj-y += pll_init.o early_clkrst_init.o \
        pll_spectrum.o umc_init.o ddrphy_init.o
 obj-$(CONFIG_PFC_MICRO_SUPPORT_CARD) += sbc_init.o
 obj-$(CONFIG_DCC_MICRO_SUPPORT_CARD) += sbc_init_3cs.o
diff --git a/arch/arm/mach-uniphier/ph1-pro4/sg_init.c b/arch/arm/mach-uniphier/ph1-pro4/sg_init.c
deleted file mode 100644 (file)
index d6ccffb..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright (C) 2011-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#include <linux/io.h>
-#include <mach/sg-regs.h>
-
-void sg_init(void)
-{
-       u32 tmp;
-
-       /* Input ports must be enabled before deasserting reset of cores */
-       tmp = readl(SG_IECTRL);
-       tmp |= 1 << 6;
-       writel(tmp, SG_IECTRL);
-}
index 130c8317366df4f3c44d7cc6ab8fd5ad018cf373..98da1f9fe9be928d4375294dda8aacac209bac4a 100644 (file)
@@ -11,15 +11,6 @@ void pin_init(void)
 {
        /* Comment format:    PAD Name -> Function Name */
 
-#ifdef CONFIG_SYS_I2C_UNIPHIER
-       {
-               u32 tmp;
-               tmp = readl(SG_IECTRL);
-               tmp |= 0xc00; /* enable SCL0, SDA0, SCL1, SDA1 */
-               writel(tmp, SG_IECTRL);
-       }
-#endif
-
 #ifdef CONFIG_NAND_DENALI
        sg_set_pinsel(15, 0);   /* XNFRE_GB -> XNFRE_GB */
        sg_set_pinsel(16, 0);   /* XNFWE_GB -> XNFWE_GB */
diff --git a/arch/arm/mach-uniphier/ph1-sld8/sg_init.c b/arch/arm/mach-uniphier/ph1-sld8/sg_init.c
deleted file mode 100644 (file)
index a808289..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include "../ph1-ld4/sg_init.c"
index 86764bcc73bd60a1bdd6bf80bece3b61fcb5fd10..78534fc41ce26c4342bc1a97356a209987a7d38f 100644 (file)
@@ -1,7 +1,5 @@
 /*
- * Copyright (C) 2013-2015 Panasonic Corporation
- * Copyright (C) 2015      Socionext Inc.
- *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
+ * Copyright (C) 2013-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
  *
  * SPDX-License-Identifier:    GPL-2.0+
  */
@@ -16,6 +14,10 @@ void __weak bcu_init(void)
 {
 };
 
+void __weak sg_init(void)
+{
+};
+
 void __weak early_pin_init(void)
 {
 };