msm_serial_hs: Cleanup code to configure/unconfigure UART GPIOs
With current approach UART GPIOs are configure/unconfigure from
board files by using GPIOLib APIs. UART driver uses gpio_config
pdata based function pointer to call per uart device related API
from board file for the same. Hence correct this approach and
pass only UART GPIOs numbers to UART driver using pdata and
configure/unconfigure those GPIOs using GPIOLib APIs once UART
port is being opened and closed respectively.
CRs-Fixed: 460961
Change-Id: I4bb007b2b476525cb50dd2eb5788c735aae0e32d
Signed-off-by: Mayank Rana <mrana@codeaurora.org>
diff --git a/arch/arm/mach-msm/board-8930.c b/arch/arm/mach-msm/board-8930.c
index 4f01ba9..b729e62 100644
--- a/arch/arm/mach-msm/board-8930.c
+++ b/arch/arm/mach-msm/board-8930.c
@@ -2891,32 +2891,12 @@
}
#ifdef CONFIG_SERIAL_MSM_HS
-static int configure_uart_gpios(int on)
-{
- int ret = 0, i;
- int uart_gpios[] = {93, 94, 95, 96};
-
- for (i = 0; i < ARRAY_SIZE(uart_gpios); i++) {
- if (on) {
- ret = gpio_request(uart_gpios[i], NULL);
- if (ret) {
- pr_err("%s: unable to request uart gpio[%d]\n",
- __func__, uart_gpios[i]);
- break;
- }
- } else {
- gpio_free(uart_gpios[i]);
- }
- }
-
- if (ret && on && i)
- for (; i >= 0; i--)
- gpio_free(uart_gpios[i]);
- return ret;
-}
-
static struct msm_serial_hs_platform_data msm_uart_dm9_pdata = {
- .gpio_config = configure_uart_gpios,
+ .config_gpio = 4,
+ .uart_tx_gpio = 93,
+ .uart_rx_gpio = 94,
+ .uart_cts_gpio = 95,
+ .uart_rfr_gpio = 96,
};
#else
static struct msm_serial_hs_platform_data msm_uart_dm9_pdata;