ARM: uniphier: move XIRQ pin-mux settings of LD11/LD20

This is the last code in the mach-uniphier/pinctrl/ directory.
Push the remaining code out to delete the directory entirely.

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

diff --git a/arch/arm/mach-uniphier/Makefile b/arch/arm/mach-uniphier/Makefile
index df6888f80fd36c0f49b112ff75156ff32d06bdb0..548cfe76fc5184941de8aa7565b88a58601c018c 100644 (file)
--- a/arch/arm/mach-uniphier/Makefile
+++ b/arch/arm/mach-uniphier/Makefile
@@ -15,7 +15,7 @@ obj-y += board_init.o
 obj-$(CONFIG_BOARD_LATE_INIT) += board_late_init.o
 obj-y += reset.o
 
-obj-y += pinctrl/ clk/
+obj-y += clk/
 
 endif
 

diff --git a/arch/arm/mach-uniphier/board_init.c b/arch/arm/mach-uniphier/board_init.c
index 228092c15e485cf6bcf2ceb1c999327aa1196158..c9d3f28f58145336e84873e895d0da3e8308173e 100644 (file)
--- a/arch/arm/mach-uniphier/board_init.c
+++ b/arch/arm/mach-uniphier/board_init.c
@@ -12,6 +12,7 @@
 
 #include "init.h"
 #include "micro-support-card.h"
+#include "sg-regs.h"
 #include "soc-info.h"
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -112,7 +113,10 @@ int board_init(void)
 #if defined(CONFIG_ARCH_UNIPHIER_LD11)
        case SOC_UNIPHIER_LD11:
                uniphier_nand_pin_init(false);
-               uniphier_ld20_pin_init();
+               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);
                led_puts("U1");
                uniphier_ld11_clk_init();
                break;
@@ -120,7 +124,10 @@ int board_init(void)
 #if defined(CONFIG_ARCH_UNIPHIER_LD20)
        case SOC_UNIPHIER_LD20:
                uniphier_nand_pin_init(false);
-               uniphier_ld20_pin_init();
+               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);
                led_puts("U1");
                uniphier_ld20_clk_init();
                cci500_init(2);

diff --git a/arch/arm/mach-uniphier/init.h b/arch/arm/mach-uniphier/init.h
index bc524a1e12c414f8a5081d22b54e1ba5b2552cc1..1dc53d5d7a3e89a0628ef66b2d9f87ca31c1a24d 100644 (file)
--- a/arch/arm/mach-uniphier/init.h
+++ b/arch/arm/mach-uniphier/init.h
@@ -101,8 +101,6 @@ int uniphier_pxs2_umc_init(const struct uniphier_board_data *bd);
 int uniphier_ld20_umc_init(const struct uniphier_board_data *bd);
 int uniphier_ld11_umc_init(const struct uniphier_board_data *bd);
 
-void uniphier_ld20_pin_init(void);
-
 void uniphier_ld4_clk_init(void);
 void uniphier_pro4_clk_init(void);
 void uniphier_pro5_clk_init(void);

diff --git a/arch/arm/mach-uniphier/pinctrl/Makefile b/arch/arm/mach-uniphier/pinctrl/Makefile
deleted file mode 100644 (file)
index 4ee9553..0000000
--- a/arch/arm/mach-uniphier/pinctrl/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# SPDX-License-Identifier:     GPL-2.0+
-#
-
-obj-$(CONFIG_ARCH_UNIPHIER_LD11)       += pinctrl-ld20.o
-obj-$(CONFIG_ARCH_UNIPHIER_LD20)       += pinctrl-ld20.o

diff --git a/arch/arm/mach-uniphier/pinctrl/pinctrl-ld20.c b/arch/arm/mach-uniphier/pinctrl/pinctrl-ld20.c
deleted file mode 100644 (file)
index e1cb90a..0000000
--- a/arch/arm/mach-uniphier/pinctrl/pinctrl-ld20.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright (C) 2016 Masahiro Yamada <yamada.masahiro@socionext.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#include <linux/io.h>
-
-#include "../init.h"
-#include "../sg-regs.h"
-
-void uniphier_ld20_pin_init(void)
-{
-       /* Comment format:    PAD Name -> Function Name */
-
-       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);
-}