xxm FIH : update gps

diff --git a/arch/arm/mach-rk29/board-rk29-fih.c b/arch/arm/mach-rk29/board-rk29-fih.c
index 46ff644e7ca2237c43a7ffd67713ea3772963e53..17303419447fc3e4a92906c48e8d7004a9583124 100755 (executable)
--- a/arch/arm/mach-rk29/board-rk29-fih.c
+++ b/arch/arm/mach-rk29/board-rk29-fih.c
@@ -2053,30 +2053,6 @@ static struct platform_device rk29sdk_wifi_device = {
 };
 #endif
 
-#ifdef CONFIG_RK29_GPS
-static int rk29_gps_bcm4751_gpio_init(void)
-{
-       rk29_mux_api_set(GPIO2B3_UART3SOUT_NAME, GPIO2L_GPIO2B3);  
-       rk29_mux_api_set(GPIO2B2_UART3SIN_NAME, GPIO2L_GPIO2B2);
-       
-    if (gpio_request(RK29_PIN2_PB3, "uart3_sout")) {
-           pr_info("%s: request uart3_sout gpio failed\n", __func__);
-           return -1;
-    }
-
-    if (gpio_request(RK29_PIN2_PB2, "uart3_sin")) {
-           pr_info("%s: request uart3_sin gpio failed\n", __func__);
-           gpio_free(RK29_PIN2_PB3);
-           return -1;
-    }
-
-       gpio_pull_updown(RK29_PIN2_PB3, PullDisable);
-    gpio_pull_updown(RK29_PIN2_PB2, PullDisable);
-
-    return 0;
-}
-#endif
-
 /* bluetooth rfkill device */
 static struct platform_device rk29sdk_rfkill = {
         .name = "rk29sdk_rfkill",
@@ -2571,10 +2547,6 @@ static void __init machine_rk29_board_init(void)
        rk29sdk_init_wifi_mem();
 #endif
 
-#if CONFIG_RK29_GPS
-       rk29_gps_bcm4751_gpio_init();
-#endif
-
        board_usb_detect_init(RK29_PIN0_PA0);
 }
 

diff --git a/drivers/serial/rk29_serial.c b/drivers/serial/rk29_serial.c
index 0c463416622b26b89320c01ecf346bcf5ce9ebfe..5bfcaa2f7e89aabbdcc6b8ae0fb4ed7134d5cc91 100755 (executable)
--- a/drivers/serial/rk29_serial.c
+++ b/drivers/serial/rk29_serial.c
@@ -334,11 +334,7 @@ static int rk29_serial_startup(struct uart_port *port)
        else if(3 == port->line)
        {
                rk29_mux_api_set(GPIO2B3_UART3SOUT_NAME, GPIO2L_UART3_SOUT);
-               rk29_mux_api_set(GPIO2B2_UART3SIN_NAME, GPIO2L_UART3_SIN);      
-       #ifdef CONFIG_MACH_RK29FIH
-               gpio_pull_updown(RK29_PIN2_PB3, PullDisable);
-               gpio_pull_updown(RK29_PIN2_PB2, PullDisable);
-       #endif
+               rk29_mux_api_set(GPIO2B2_UART3SIN_NAME, GPIO2L_UART3_SIN);
        }
 
        retval = request_irq(port->irq,rk29_uart_interrupt,IRQF_SHARED,