diff options
| author | Philippe Langlais <philippe.langlais@linaro.org> | 2012-01-11 14:42:16 +0100 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-05-22 11:05:57 +0200 |
| commit | be42df30325bbcd2092617837396628dfd144290 (patch) | |
| tree | af15dc3d11542d84ddc4e537ded7a0b4be7e88e1 | |
| parent | 3ced2371141b8ba201530f87504e640627f78ab2 (diff) | |
cg2900: [U9500] Correct the GPIO configuration for WLAN
There are two parts in this correction.
Firstly, as there is much in common between a U9500 platform
and a U8500 one, all the tests performed to identify a U9500 platform
shall be done before the ones related to U8500. Otherwise,
the platform will be considered as a U8500 one and the GPIOs will
be badly configured.
Secondly, the mapping of WLAN_IRQ has to be changed. On U8500, WLAN_IRQ
is mapped onto GPIO04. On U9500, it is GPIO144 that shall be used.
ST-Ericsson ID: 368270
ST-Ericsson Linux next: NA
ST-Ericsson FOSS-OUT ID: Trivial
Signed-off-by: Rejane DURAND <rejane.durand@stericsson.com>
| -rw-r--r-- | drivers/staging/cg2900/board-ux500-cg2900.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/staging/cg2900/board-ux500-cg2900.c b/drivers/staging/cg2900/board-ux500-cg2900.c index bd81f68fdc6..1f4b93ca0e5 100644 --- a/drivers/staging/cg2900/board-ux500-cg2900.c +++ b/drivers/staging/cg2900/board-ux500-cg2900.c @@ -265,7 +265,13 @@ static int __init board_cg2900_init(void) } dcg2900_init_platdata(&ux500_cg2900_uart_platform_data); - if (cpu_is_u8500()) { + if (pins_for_u9500()) { + /* u9500 */ + ux500_cg2900_uart_device.num_resources = + ARRAY_SIZE(cg2900_uart_resources_u9500); + ux500_cg2900_uart_device.resource = + cg2900_uart_resources_u9500; + } else if (cpu_is_u8500()) { if (machine_is_hrefv60()) { /* u8500 */ ux500_cg2900_uart_device.num_resources = @@ -285,12 +291,6 @@ static int __init board_cg2900_init(void) ARRAY_SIZE(cg2900_uart_resources_u5500); ux500_cg2900_uart_device.resource = cg2900_uart_resources_u5500; - } else { - /* u9500 */ - ux500_cg2900_uart_device.num_resources = - ARRAY_SIZE(cg2900_uart_resources_u9500); - ux500_cg2900_uart_device.resource = - cg2900_uart_resources_u9500; } err = platform_device_register(&ux500_cg2900_device); |