Use the pin-mux data in the pinctrl drivers by directly calling
pinctrl_generic_set_state().

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

 arch/arm/mach-uniphier/Makefile                    |  2 +-
 arch/arm/mach-uniphier/early-pinctrl/Makefile      |  6 ----
 .../early-pinctrl/early-pinctrl-ld20.c             | 32 ----------------------
 arch/arm/mach-uniphier/init.h                      |  2 --
 arch/arm/mach-uniphier/init/init-ld11.c            |  2 +-
 arch/arm/mach-uniphier/init/init-ld20.c            |  2 +-
 6 files changed, 3 insertions(+), 43 deletions(-)
 delete mode 100644 arch/arm/mach-uniphier/early-pinctrl/Makefile
 delete mode 100644 arch/arm/mach-uniphier/early-pinctrl/early-pinctrl-ld20.c

diff --git a/arch/arm/mach-uniphier/Makefile b/arch/arm/mach-uniphier/Makefile
index af56d6f..df6888f 100644
--- a/arch/arm/mach-uniphier/Makefile
+++ b/arch/arm/mach-uniphier/Makefile
@@ -4,7 +4,7 @@
 
 ifdef CONFIG_SPL_BUILD
 
-obj-y += init/ bcu/ memconf/ pll/ early-clk/ early-pinctrl/
+obj-y += init/ bcu/ memconf/ pll/ early-clk/
 obj-$(CONFIG_MICRO_SUPPORT_CARD) += sbc/
 
 else
diff --git a/arch/arm/mach-uniphier/early-pinctrl/Makefile 
b/arch/arm/mach-uniphier/early-pinctrl/Makefile
deleted file mode 100644
index 84040c6..0000000
--- a/arch/arm/mach-uniphier/early-pinctrl/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# SPDX-License-Identifier:     GPL-2.0+
-#
-
-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-ld20.c 
b/arch/arm/mach-uniphier/early-pinctrl/early-pinctrl-ld20.c
deleted file mode 100644
index 537deaf..0000000
--- a/arch/arm/mach-uniphier/early-pinctrl/early-pinctrl-ld20.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2016 Masahiro Yamada <yamada.masah...@socionext.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#include "../init.h"
-#include "../sg-regs.h"
-
-int uniphier_ld20_early_pin_init(const struct uniphier_board_data *bd)
-{
-       /* Comment format:    PAD Name -> Function Name */
-       sg_set_pinsel(0, 0, 8, 4);      /* XECS1  -> XECS1 */
-       sg_set_pinsel(1, 0, 8, 4);      /* ERXW   -> ERXW  */
-       sg_set_pinsel(2, 0, 8, 4);      /* XERWE1 -> XERWE1 */
-       sg_set_pinsel(6, 2, 8, 4);      /* XNFRE  -> XERWE0 */
-       sg_set_pinsel(7, 2, 8, 4);      /* XNFWE  -> ES0 */
-       sg_set_pinsel(8, 2, 8, 4);      /* NFALE  -> ES1 */
-       sg_set_pinsel(9, 2, 8, 4);      /* NFCLE  -> ES2 */
-       sg_set_pinsel(10, 2, 8, 4);     /* NFD0   -> ED0 */
-       sg_set_pinsel(11, 2, 8, 4);     /* NFD1   -> ED1 */
-       sg_set_pinsel(12, 2, 8, 4);     /* NFD2   -> ED2 */
-       sg_set_pinsel(13, 2, 8, 4);     /* NFD3   -> ED3 */
-       sg_set_pinsel(14, 2, 8, 4);     /* NFD4   -> ED4 */
-       sg_set_pinsel(15, 2, 8, 4);     /* NFD5   -> ED5 */
-       sg_set_pinsel(16, 2, 8, 4);     /* NFD6   -> ED6 */
-       sg_set_pinsel(17, 2, 8, 4);     /* NFD7   -> ED7 */
-       sg_set_iectrl_range(0, 2);
-       sg_set_iectrl_range(6, 17);
-
-       return 0;
-}
diff --git a/arch/arm/mach-uniphier/init.h b/arch/arm/mach-uniphier/init.h
index 27b9a38..bc524a1 100644
--- a/arch/arm/mach-uniphier/init.h
+++ b/arch/arm/mach-uniphier/init.h
@@ -94,8 +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_ld20_early_pin_init(const struct uniphier_board_data *bd);
-
 int uniphier_ld4_umc_init(const struct uniphier_board_data *bd);
 int uniphier_pro4_umc_init(const struct uniphier_board_data *bd);
 int uniphier_sld8_umc_init(const struct uniphier_board_data *bd);
diff --git a/arch/arm/mach-uniphier/init/init-ld11.c 
b/arch/arm/mach-uniphier/init/init-ld11.c
index de2dc62..758df8d 100644
--- a/arch/arm/mach-uniphier/init/init-ld11.c
+++ b/arch/arm/mach-uniphier/init/init-ld11.c
@@ -15,7 +15,7 @@ int uniphier_ld11_init(const struct uniphier_board_data *bd)
 {
        uniphier_sbc_init_savepin(bd);
        uniphier_pxs2_sbc_init(bd);
-       uniphier_ld20_early_pin_init(bd);
+       uniphier_pin_init("system_bus_grp");
 
        support_card_reset();
 
diff --git a/arch/arm/mach-uniphier/init/init-ld20.c 
b/arch/arm/mach-uniphier/init/init-ld20.c
index 7f66053..f23ca09 100644
--- a/arch/arm/mach-uniphier/init/init-ld20.c
+++ b/arch/arm/mach-uniphier/init/init-ld20.c
@@ -14,7 +14,7 @@ int uniphier_ld20_init(const struct uniphier_board_data *bd)
 {
        uniphier_sbc_init_savepin(bd);
        uniphier_pxs2_sbc_init(bd);
-       uniphier_ld20_early_pin_init(bd);
+       uniphier_pin_init("system_bus_grp");
 
        support_card_reset();
 
-- 
1.9.1

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

Reply via email to