diff mbox

[U-Boot] ARM: uniphier: add pin-mux settings for NAND, eMMC, SD of PH1-sLD3

Message ID 1459302795-13839-1-git-send-email-yamada.masahiro@socionext.com
State Accepted
Commit a75ecfc2a637d581bc6ab21676f73e8eee1b13d2
Delegated to: Masahiro Yamada
Headers show

Commit Message

Masahiro Yamada March 30, 2016, 1:53 a.m. UTC 
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

 arch/arm/mach-uniphier/pinctrl/pinctrl-sld3.c | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

Comments

Masahiro Yamada March 31, 2016, 4:14 p.m. UTC | #1 
2016-03-30 10:53 GMT+09:00 Masahiro Yamada <yamada.masahiro@socionext.com>:
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
>

Applied to u-boot-uniphier/master.
diff mbox

Patch

diff --git a/arch/arm/mach-uniphier/pinctrl/pinctrl-sld3.c b/arch/arm/mach-uniphier/pinctrl/pinctrl-sld3.c
index 367d9f3..f85ed53 100644
--- a/arch/arm/mach-uniphier/pinctrl/pinctrl-sld3.c
+++ b/arch/arm/mach-uniphier/pinctrl/pinctrl-sld3.c
@@ -22,4 +22,27 @@  void ph1_sld3_pin_init(void)
 	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 */
+	sg_set_pinsel(40, 1, 4, 4);	/* XNFCE0_GB, XNFRE_GB, XNFWE_GB, XNFWP_GB */
+	sg_set_pinsel(41, 1, 4, 4);	/* XNFRYBY1_GB, XNFCE1_GB */
+	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
 }