ARM: uniphier: allow to use System Bus for ROM boot mode of PH1-LD20

The System Bus is not available by default on the ROM boot mode of
PH1-LD20.  To use devices connected to the System Bus, such as the
Micro Support Card, it is necessary to set up pin-muxing and some
System Bus Controller register.

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

diff --git a/arch/arm/mach-uniphier/early-pinctrl/Makefile b/arch/arm/mach-uniphier/early-pinctrl/Makefile
index dc4064c05bcb07e4f6538c8e669d97f8add3ef6d..a1039025ca4839831b231c92e8471ea7626f2d5b 100644 (file)
--- a/arch/arm/mach-uniphier/early-pinctrl/Makefile
+++ b/arch/arm/mach-uniphier/early-pinctrl/Makefile
@@ -3,3 +3,4 @@
 #
 
 obj-$(CONFIG_ARCH_UNIPHIER_SLD3)       += early-pinctrl-sld3.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
new file mode 100644 (file)
index 0000000..537deaf
--- /dev/null
+++ b/arch/arm/mach-uniphier/early-pinctrl/early-pinctrl-ld20.c
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2016 Masahiro Yamada <yamada.masahiro@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 f5b3fa836c83ed0d9460c7b27233b5023bb22d0c..5a0ebeb1b1552efed42705da7b94732e5b37957d 100644 (file)
--- a/arch/arm/mach-uniphier/init.h
+++ b/arch/arm/mach-uniphier/init.h
@@ -90,6 +90,7 @@ int uniphier_pxs2_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);
 int uniphier_pro4_umc_init(const struct uniphier_board_data *bd);

diff --git a/arch/arm/mach-uniphier/init/init-ld20.c b/arch/arm/mach-uniphier/init/init-ld20.c
index 0ad264c9f11ec66067e4f2d8a93e5ef003a0e5a3..660ad457dc4dc812afdef9101911419f58d55be2 100644 (file)
--- a/arch/arm/mach-uniphier/init/init-ld20.c
+++ b/arch/arm/mach-uniphier/init/init-ld20.c
@@ -13,6 +13,8 @@
 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);
 
        support_card_reset();
 

diff --git a/arch/arm/mach-uniphier/sbc/Makefile b/arch/arm/mach-uniphier/sbc/Makefile
index 3c1e92a54d61290d20d146f2ee38f476d4a33a8b..236f13691c720fef31915c1b90ba72756cb5b377 100644 (file)
--- a/arch/arm/mach-uniphier/sbc/Makefile
+++ b/arch/arm/mach-uniphier/sbc/Makefile
@@ -9,4 +9,4 @@ obj-$(CONFIG_ARCH_UNIPHIER_SLD8)        += sbc-savepin.o sbc-ld4.o
 obj-$(CONFIG_ARCH_UNIPHIER_PRO5)       += sbc-savepin.o
 obj-$(CONFIG_ARCH_UNIPHIER_PXS2)       += sbc-savepin.o sbc-pxs2.o
 obj-$(CONFIG_ARCH_UNIPHIER_LD6B)       += sbc-savepin.o sbc-pxs2.o
-obj-$(CONFIG_ARCH_UNIPHIER_LD20)       += sbc-savepin.o
+obj-$(CONFIG_ARCH_UNIPHIER_LD20)       += sbc-savepin.o sbc-pxs2.o