From: Vaibhav Hiremath <hvaibhav@ti.com>
Date: Thu, 29 Jan 2009 19:22:29 +0000 (+0530)
Subject: ARM: OMAP: Add mux for GPIO pins 134, 54 and 136
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=7cc1ee3e8489351d18fd5be597b55ab47bac9c6d;p=linux-2.6-omap-h63xx.git

ARM: OMAP: Add mux for GPIO pins 134, 54 and 136

On OMAP3EVM Mass Market Daugher Card following GPIO pins are being
used -

GPIO134 --> Enable/Disable TVP5146 interface
GPIO54 --> Enable/Disable Expansion Camera interface
GPIO136 --> Enable/Disable Camera (Sensor) interface

Added entry for the above GPIO's in mux.c and mux.h file

Signed-off-by: Brijesh Jadav <brijesh.j@ti.com>
Signed-off-by: Hardik Shah <hardik.shah@ti.com>
Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/arch/arm/mach-omap2/mux.c b/arch/arm/mach-omap2/mux.c
index 1556688901d..d226d817a6a 100644
--- a/arch/arm/mach-omap2/mux.c
+++ b/arch/arm/mach-omap2/mux.c
@@ -471,6 +471,12 @@ MUX_CFG_34XX("AF5_34XX_GPIO142", 0x170,
 		OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_OUTPUT)
 MUX_CFG_34XX("AE5_34XX_GPIO143", 0x172,
 		OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_OUTPUT)
+MUX_CFG_34XX("AG4_34XX_GPIO134", 0x160,
+		OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_OUTPUT)
+MUX_CFG_34XX("U8_34XX_GPIO54", 0x0b4,
+		OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_OUTPUT)
+MUX_CFG_34XX("AE4_34XX_GPIO136", 0x164,
+		OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_OUTPUT)
 
 };
 
diff --git a/arch/arm/plat-omap/include/mach/mux.h b/arch/arm/plat-omap/include/mach/mux.h
index 67fddec3ec0..ace037f1598 100644
--- a/arch/arm/plat-omap/include/mach/mux.h
+++ b/arch/arm/plat-omap/include/mach/mux.h
@@ -795,7 +795,10 @@ enum omap34xx_index {
 	AF6_34XX_GPIO140_UP,
 	AE6_34XX_GPIO141,
 	AF5_34XX_GPIO142,
-	AE5_34XX_GPIO143
+	AE5_34XX_GPIO143,
+	AG4_34XX_GPIO134,
+	U8_34XX_GPIO54,
+	AE4_34XX_GPIO136,
 };
 
 struct omap_mux_cfg {