From 5f7be9fa54196cae95018eb14c6cdd3f1c9c6a04 Mon Sep 17 00:00:00 2001
From: Philippe Langlais <philippe.langlais@stericsson.com>
Date: Mon, 17 Oct 2011 10:40:19 +0200
Subject: u9500: cg2900: GPIO conflicts with external modem

This patch content should have gone with the
below commit
2057772c5d0b1a18198c91085d9e828cdb23d23b
---
 drivers/staging/cg2900/board-mop500-cg2900.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/drivers/staging/cg2900/board-mop500-cg2900.c b/drivers/staging/cg2900/board-mop500-cg2900.c
index b8fa3e98fa2..de2fc08dffa 100644
--- a/drivers/staging/cg2900/board-mop500-cg2900.c
+++ b/drivers/staging/cg2900/board-mop500-cg2900.c
@@ -26,10 +26,12 @@
 #include "devices-cg2900.h"
 #include "pins-db8500.h"
 #include "pins.h"
+#include "board-mop500.h"
 
 #define CG2900_BT_ENABLE_GPIO		170
 #define CG2900_GBF_ENA_RESET_GPIO	171
 #define WLAN_PMU_EN_GPIO		226
+#define WLAN_PMU_EN_GPIO_U9500		MOP500_AB8500_GPIO(10)
 #define CG2900_BT_CTS_GPIO		0
 
 enum cg2900_gpio_pull_sleep cg2900_sleep_gpio[21] = {
@@ -148,6 +150,12 @@ static struct resource cg2900_uart_resources_u9500[] = {
 		.flags = IORESOURCE_IO,
 		.name = "gbf_ena_reset",
 	},
+	{
+		.start = WLAN_PMU_EN_GPIO_U9500,
+		.end = WLAN_PMU_EN_GPIO_U9500,
+		.flags = IORESOURCE_IO,
+		.name = "pmu_en",
+	},
 	{
 		.start = CG2900_BT_CTS_GPIO,
 		.end = CG2900_BT_CTS_GPIO,
-- 
cgit v1.2.3