diff options
| author | Philippe Langlais <philippe.langlais@stericsson.com> | 2011-10-17 10:40:19 +0200 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-05-22 11:05:54 +0200 |
| commit | 5f7be9fa54196cae95018eb14c6cdd3f1c9c6a04 (patch) | |
| tree | 7913044d7fd0c0e744de687be71416ca44fcd793 | |
| parent | 818b36eb855ec41a8e4b9f8816a0035de10b3525 (diff) | |
u9500: cg2900: GPIO conflicts with external modem
This patch content should have gone with the
below commit
2057772c5d0b1a18198c91085d9e828cdb23d23b
| -rw-r--r-- | drivers/staging/cg2900/board-mop500-cg2900.c | 8 |
1 files changed, 8 insertions, 0 deletions
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] = { @@ -149,6 +151,12 @@ static struct resource cg2900_uart_resources_u9500[] = { .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, .flags = IORESOURCE_IO, |