summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-uniphier/ph1-sld8
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2015-09-11 20:17:44 +0900
committerMasahiro Yamada <yamada.masahiro@socionext.com>2015-09-25 00:27:52 +0900
commit1386233da33235a68d9f4321e505bfa97370d949 (patch)
tree8162bc59f562516c964dee241645b90ff8250f01 /arch/arm/mach-uniphier/ph1-sld8
parent11f3afeaa5a03e624e630c6b2187efb998d49972 (diff)
downloadtalos-obmc-uboot-1386233da33235a68d9f4321e505bfa97370d949.tar.gz
talos-obmc-uboot-1386233da33235a68d9f4321e505bfa97370d949.zip
ARM: uniphier: drop ad-hoc input enable settings
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>
Diffstat (limited to 'arch/arm/mach-uniphier/ph1-sld8')
-rw-r--r--arch/arm/mach-uniphier/ph1-sld8/pinctrl.c9
-rw-r--r--arch/arm/mach-uniphier/ph1-sld8/sg_init.c1
2 files changed, 0 insertions, 10 deletions
diff --git a/arch/arm/mach-uniphier/ph1-sld8/pinctrl.c b/arch/arm/mach-uniphier/ph1-sld8/pinctrl.c
index 130c831736..98da1f9fe9 100644
--- a/arch/arm/mach-uniphier/ph1-sld8/pinctrl.c
+++ b/arch/arm/mach-uniphier/ph1-sld8/pinctrl.c
@@ -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
index a808289a56..0000000000
--- a/arch/arm/mach-uniphier/ph1-sld8/sg_init.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../ph1-ld4/sg_init.c"
OpenPOWER on IntegriCloud