These settings are nicely cared by the pinctrl driver now.  Remove.

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

 arch/arm/mach-uniphier/early-pinctrl/Makefile      |  1 -
 .../early-pinctrl/early-pinctrl-sld3.c             | 26 --------------------
 arch/arm/mach-uniphier/init.h                      |  1 -
 arch/arm/mach-uniphier/init/init-sld3.c            |  2 --
 arch/arm/mach-uniphier/pinctrl/pinctrl-sld3.c      | 28 ----------------------
 5 files changed, 58 deletions(-)
 delete mode 100644 arch/arm/mach-uniphier/early-pinctrl/early-pinctrl-sld3.c

diff --git a/arch/arm/mach-uniphier/early-pinctrl/Makefile 
b/arch/arm/mach-uniphier/early-pinctrl/Makefile
index 7177a8c..84040c6 100644
--- a/arch/arm/mach-uniphier/early-pinctrl/Makefile
+++ b/arch/arm/mach-uniphier/early-pinctrl/Makefile
@@ -2,6 +2,5 @@
 # SPDX-License-Identifier:     GPL-2.0+
 #
 
-obj-$(CONFIG_ARCH_UNIPHIER_SLD3)       += early-pinctrl-sld3.o
 obj-$(CONFIG_ARCH_UNIPHIER_LD11)       += early-pinctrl-ld20.o
 obj-$(CONFIG_ARCH_UNIPHIER_LD20)       += early-pinctrl-ld20.o
diff --git a/arch/arm/mach-uniphier/early-pinctrl/early-pinctrl-sld3.c 
b/arch/arm/mach-uniphier/early-pinctrl/early-pinctrl-sld3.c
deleted file mode 100644
index 22c07fb..0000000
--- a/arch/arm/mach-uniphier/early-pinctrl/early-pinctrl-sld3.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2011-2015 Masahiro Yamada <yamada.masah...@socionext.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#include "../init.h"
-#include "../sg-regs.h"
-
-int uniphier_sld3_early_pin_init(const struct uniphier_board_data *bd)
-{
-       /* Comment format:    PAD Name -> Function Name */
-
-#ifdef CONFIG_UNIPHIER_SERIAL
-       sg_set_pinsel(63, 0, 4, 4);     /* RXD0 */
-       sg_set_pinsel(64, 1, 4, 4);     /* TXD0 */
-
-       sg_set_pinsel(65, 0, 4, 4);     /* RXD1 */
-       sg_set_pinsel(66, 1, 4, 4);     /* TXD1 */
-
-       sg_set_pinsel(96, 2, 4, 4);     /* RXD2 */
-       sg_set_pinsel(102, 2, 4, 4);    /* TXD2 */
-#endif
-
-       return 0;
-}
diff --git a/arch/arm/mach-uniphier/init.h b/arch/arm/mach-uniphier/init.h
index 406d5d0..6b20784 100644
--- a/arch/arm/mach-uniphier/init.h
+++ b/arch/arm/mach-uniphier/init.h
@@ -94,7 +94,6 @@ int uniphier_pxs2_early_clk_init(const struct 
uniphier_board_data *bd);
 int uniphier_ld11_early_clk_init(const struct uniphier_board_data *bd);
 int uniphier_ld20_early_clk_init(const struct uniphier_board_data *bd);
 
-int uniphier_sld3_early_pin_init(const struct uniphier_board_data *bd);
 int uniphier_ld20_early_pin_init(const struct uniphier_board_data *bd);
 
 int uniphier_ld4_umc_init(const struct uniphier_board_data *bd);
diff --git a/arch/arm/mach-uniphier/init/init-sld3.c 
b/arch/arm/mach-uniphier/init/init-sld3.c
index 50fcbb0..1ee57ec 100644
--- a/arch/arm/mach-uniphier/init/init-sld3.c
+++ b/arch/arm/mach-uniphier/init/init-sld3.c
@@ -16,8 +16,6 @@ int uniphier_sld3_init(const struct uniphier_board_data *bd)
 
        uniphier_sbc_init_admulti(bd);
 
-       uniphier_sld3_early_pin_init(bd);
-
        support_card_reset();
 
        uniphier_sld3_pll_init(bd);
diff --git a/arch/arm/mach-uniphier/pinctrl/pinctrl-sld3.c 
b/arch/arm/mach-uniphier/pinctrl/pinctrl-sld3.c
index 62edc49..16563f9 100644
--- a/arch/arm/mach-uniphier/pinctrl/pinctrl-sld3.c
+++ b/arch/arm/mach-uniphier/pinctrl/pinctrl-sld3.c
@@ -9,20 +9,6 @@
 
 void uniphier_sld3_pin_init(void)
 {
-#ifdef CONFIG_USB_EHCI
-       sg_set_pinsel(13, 0, 4, 4);     /* USB0OC */
-       sg_set_pinsel(14, 1, 4, 4);     /* USB0VBUS */
-
-       sg_set_pinsel(15, 0, 4, 4);     /* USB1OC */
-       sg_set_pinsel(16, 1, 4, 4);     /* USB1VBUS */
-
-       sg_set_pinsel(17, 0, 4, 4);     /* USB2OC */
-       sg_set_pinsel(18, 1, 4, 4);     /* USB2VBUS */
-
-       sg_set_pinsel(19, 0, 4, 4);     /* USB3OC */
-       sg_set_pinsel(20, 1, 4, 4);     /* USB3VBUS */
-#endif
-
 #ifdef CONFIG_NAND_DENALI
        sg_set_pinsel(38, 1, 4, 4);     /* NFALE_GB, NFCLE_GB */
        sg_set_pinsel(39, 1, 4, 4);     /* XNFRYBY0_GB */
@@ -31,18 +17,4 @@ void uniphier_sld3_pin_init(void)
        sg_set_pinsel(58, 1, 4, 4);     /* NFD[0-3]_GB */
        sg_set_pinsel(59, 1, 4, 4);     /* NFD[4-7]_GB */
 #endif
-
-#ifdef CONFIG_MMC_UNIPHIER
-       /* eMMC */
-       sg_set_pinsel(55, 1, 4, 4);     /* XERST */
-       sg_set_pinsel(56, 1, 4, 4);     /* MMCDAT[0-3] */
-       sg_set_pinsel(57, 1, 4, 4);     /* MMCDAT[4-7] */
-       sg_set_pinsel(60, 1, 4, 4);     /* MMCCLK, MMCCMD */
-
-       /* SD card */
-       sg_set_pinsel(42, 1, 4, 4);     /* SD1CLK, SD1CMD, SD1DAT[0-3] */
-       sg_set_pinsel(43, 1, 4, 4);     /* SD1CD */
-       sg_set_pinsel(44, 1, 4, 4);     /* SD1WP */
-       sg_set_pinsel(45, 1, 4, 4);     /* SDVTCG */
-#endif
 }
-- 
1.9.1

_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Reply via email to