From: Grazvydas Ignotas <notasas@gmail.com>
Date: Wed, 21 Mar 2012 00:30:55 +0000 (+0200)
Subject: OMAP3: pandora: pin mux updates for DM3730 board variant
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ba9c6757c55e6625971ccf78d420334a1c0d9dd;p=pandora-u-boot.git

OMAP3: pandora: pin mux updates for DM3730 board variant

DM3730 needs some additional pin mux configuration for GPIOs 126-129
to work, add it.

Signed-off-by: Grazvydas Ignotas <notasas@gmail.com>
---

diff --git a/arch/arm/include/asm/arch-omap3/mux.h b/arch/arm/include/asm/arch-omap3/mux.h
index 6daef49e97f..71f183de8d1 100644
--- a/arch/arm/include/asm/arch-omap3/mux.h
+++ b/arch/arm/include/asm/arch-omap3/mux.h
@@ -445,6 +445,12 @@
 #define CONTROL_PADCONF_STRBEN_DLY1	0x0224
 #define CONTROL_PADCONF_SYS_BOOT8	0x0226
 
+/* AM/DM37xx specific */
+#define CONTROL_PADCONF_GPIO127		0x0A54
+#define CONTROL_PADCONF_GPIO126		0x0A56
+#define CONTROL_PADCONF_GPIO128		0x0A58
+#define CONTROL_PADCONF_GPIO129		0x0A5A
+
 #define MUX_VAL(OFFSET,VALUE)\
 	writew((VALUE), OMAP34XX_CTRL_BASE + (OFFSET));
 
diff --git a/board/pandora/pandora.c b/board/pandora/pandora.c
index 9c7583916fc..0bc918a21e1 100644
--- a/board/pandora/pandora.c
+++ b/board/pandora/pandora.c
@@ -113,6 +113,9 @@ int misc_init_r(void)
 void set_muxconf_regs(void)
 {
 	MUX_PANDORA();
+	if (get_cpu_family() == CPU_OMAP36XX) {
+		MUX_PANDORA_3730();
+	}
 }
 
 #ifdef CONFIG_GENERIC_MMC
diff --git a/board/pandora/pandora.h b/board/pandora/pandora.h
index f0ad16b0a40..fea8bf259a8 100644
--- a/board/pandora/pandora.h
+++ b/board/pandora/pandora.h
@@ -399,4 +399,10 @@ const omap3_sysinfo sysinfo = {
 	MUX_VAL(CP(SDRC_CKE0),		(IDIS | PTU | EN  | M0)) /*sdrc_cke0*/\
 	MUX_VAL(CP(SDRC_CKE1),		(IDIS | PTU | EN  | M0)) /*sdrc_cke1*/
 
+#define MUX_PANDORA_3730() \
+	MUX_VAL(CP(GPIO126),		(IEN  | PTD | DIS | M4)) /*GPIO_126 - MMC1_WP*/\
+	MUX_VAL(CP(GPIO127),		(IEN  | PTD | DIS | M4)) /*GPIO_127 - MMC2_WP*/\
+	MUX_VAL(CP(GPIO128),		(IDIS | PTD | DIS | M4)) /*GPIO_128 - LED_MMC1*/\
+	MUX_VAL(CP(GPIO129),		(IDIS | PTD | DIS | M4)) /*GPIO_129 - LED_MMC2*/
+
 #endif