[PATCH 0/2] OMAP: misc. fixes for 2.6.32

[PATCH 0/2] OMAP: misc. fixes for 2.6.32

[Kevin Hilman]

Tony,

I pushed a couple more fixes to my pm-upstream/fixes-32 branch.  You've
already pulled this branch into your for-next, so a re-pull will get
you just these two additional patches.

Thanks,

Kevin


Reddy, Teerth (1):
  OMAP3: PM: add T2 interrupt line mux setting, and enable on 3430SDP

Vikram Pandita (1):
  OMAP: Zoom2: release debug board detect gpio line

 arch/arm/mach-omap2/board-3430sdp.c         |    6 ++++++
 arch/arm/mach-omap2/board-zoom-debugboard.c |    7 ++++---
 arch/arm/mach-omap2/mux.c                   |    5 +++++
 arch/arm/plat-omap/include/mach/mux.h       |    3 +++
 4 files changed, 18 insertions(+), 3 deletions(-)

[PATCH 1/2] OMAP3: PM: add T2 interrupt line mux setting, and enable on 3430SDP

[Kevin Hilman]

From: Reddy, Teerth <teerth@ti.com>

This patch changes for setting the padconf value for sys_nirq line
which is connected to T2 INTR1.  This will fix the T2 keypad wakeup
issue on OMAP3 SDP.

Signed-off-by: Teerth Reddy <teerth@ti.com>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
---
 arch/arm/mach-omap2/board-3430sdp.c   |    6 ++++++
 arch/arm/mach-omap2/mux.c             |    5 +++++
 arch/arm/plat-omap/include/mach/mux.h |    3 +++
 3 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-omap2/board-3430sdp.c b/arch/arm/mach-omap2/board-3430sdp.c
index 7e9b76c..31d9f56 100644
--- a/arch/arm/mach-omap2/board-3430sdp.c
+++ b/arch/arm/mach-omap2/board-3430sdp.c
@@ -473,6 +473,11 @@ static inline void board_smc91x_init(void)
 
 #endif
 
+static void enable_board_wakeup_source(void)
+{
+	omap_cfg_reg(AF26_34XX_SYS_NIRQ); /* T2 interrupt line (keypad) */
+}
+
 static void __init omap_3430sdp_init(void)
 {
 	omap3430_i2c_init();
@@ -490,6 +495,7 @@ static void __init omap_3430sdp_init(void)
 	omap_serial_init();
 	usb_musb_init();
 	board_smc91x_init();
+	enable_board_wakeup_source();
 }
 
 static void __init omap_3430sdp_map_io(void)
diff --git a/arch/arm/mach-omap2/mux.c b/arch/arm/mach-omap2/mux.c
index f63f3a2..2daa595 100644
--- a/arch/arm/mach-omap2/mux.c
+++ b/arch/arm/mach-omap2/mux.c
@@ -542,6 +542,11 @@ MUX_CFG_34XX("AF13_3430_MMC3_DAT2", 0x5e8,
 		OMAP34XX_MUX_MODE2 | OMAP34XX_PIN_INPUT_PULLUP)
 MUX_CFG_34XX("AF13_3430_MMC3_DAT3", 0x5e2,
 		OMAP34XX_MUX_MODE2 | OMAP34XX_PIN_INPUT_PULLUP)
+
+/* SYS_NIRQ T2 INT1 */
+MUX_CFG_34XX("AF26_34XX_SYS_NIRQ", 0x1E0,
+		OMAP3_WAKEUP_EN | OMAP34XX_PIN_INPUT_PULLUP |
+		OMAP34XX_MUX_MODE0)
 };
 
 #define OMAP34XX_PINS_SZ	ARRAY_SIZE(omap34xx_pins)
diff --git a/arch/arm/plat-omap/include/mach/mux.h b/arch/arm/plat-omap/include/mach/mux.h
index 2c57bad..98dfab6 100644
--- a/arch/arm/plat-omap/include/mach/mux.h
+++ b/arch/arm/plat-omap/include/mach/mux.h
@@ -885,6 +885,9 @@ enum omap34xx_index {
 	AH9_3430_MMC3_DAT1,
 	AF13_3430_MMC3_DAT2,
 	AF13_3430_MMC3_DAT3,
+
+	/* SYS_NIRQ T2 INT1 */
+	AF26_34XX_SYS_NIRQ,
 };
 
 struct omap_mux_cfg {
-- 
1.6.4

[PATCH 2/2] OMAP: Zoom2: release debug board detect gpio line

[Kevin Hilman]

From: Vikram Pandita <vikram.pandita@ti.com>

Release the Dbg board detection gpio once its purpose is served

Signed-off-by: Vikram Pandita <vikram.pandita@ti.com>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
---
 arch/arm/mach-omap2/board-zoom-debugboard.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/arch/arm/mach-omap2/board-zoom-debugboard.c b/arch/arm/mach-omap2/board-zoom-debugboard.c
index e0948c9..1f13e2a 100644
--- a/arch/arm/mach-omap2/board-zoom-debugboard.c
+++ b/arch/arm/mach-omap2/board-zoom-debugboard.c
@@ -129,6 +129,7 @@ static inline void __init zoom2_init_quaduart(void)
 static inline int omap_zoom2_debugboard_detect(void)
 {
 	int debug_board_detect = 0;
+	int ret = 1;
 
 	debug_board_detect = ZOOM2_SMSC911X_GPIO;
 
@@ -140,10 +141,10 @@ static inline int omap_zoom2_debugboard_detect(void)
 	gpio_direction_input(debug_board_detect);
 
 	if (!gpio_get_value(debug_board_detect)) {
-		gpio_free(debug_board_detect);
-		return 0;
+		ret = 0;
 	}
-	return 1;
+	gpio_free(debug_board_detect);
+	return ret;
 }
 
 static struct platform_device *zoom2_devices[] __initdata = {
-- 
1.6.4

[PATCH 0/2] OMAP: misc. fixes for 2.6.32

[Tony Lindgren]

* Kevin Hilman <khilman@deeprootsystems.com> [090828 01:28]:
> Tony,
> 
> I pushed a couple more fixes to my pm-upstream/fixes-32 branch.  You've
> already pulled this branch into your for-next, so a re-pull will get
> you just these two additional patches.

OK, I need to rebuild the omap for-next as there are few compilation
issues in at least the omap3-upstream series.

Regards,

Tony
 
> Thanks,
> 
> Kevin
> 
> 
> Reddy, Teerth (1):
>   OMAP3: PM: add T2 interrupt line mux setting, and enable on 3430SDP
> 
> Vikram Pandita (1):
>   OMAP: Zoom2: release debug board detect gpio line
> 
>  arch/arm/mach-omap2/board-3430sdp.c         |    6 ++++++
>  arch/arm/mach-omap2/board-zoom-debugboard.c |    7 ++++---
>  arch/arm/mach-omap2/mux.c                   |    5 +++++
>  arch/arm/plat-omap/include/mach/mux.h       |    3 +++
>  4 files changed, 18 insertions(+), 3 deletions(-)
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html