xxm FIH: 1.update cm3202 ,2.update rk29_serial for gps

diff --git a/arch/arm/mach-rk29/board-rk29-fih.c b/arch/arm/mach-rk29/board-rk29-fih.c
index e0ce1042ab53c4bf9363b675843c055e2c1dac4e..134816cb448cbbe10fd229e4ae1647263c3b643d 100755 (executable)
--- a/arch/arm/mach-rk29/board-rk29-fih.c
+++ b/arch/arm/mach-rk29/board-rk29-fih.c
@@ -2570,7 +2570,7 @@ static void __init machine_rk29_board_init(void)
        rk29sdk_init_wifi_mem();
 #endif
 
-#ifdef CONFIG_RK29_GPS
+#if CONFIG_RK29_GPS
        rk29_gps_bcm4751_gpio_init();
 #endif
 

diff --git a/drivers/input/lightsensor/cm3202.c b/drivers/input/lightsensor/cm3202.c
index a1bc3eea1734ca9f1b186548806e3e8d4264f432..09536778e2c47e5b224c4790176e5346c2a81a46 100644 (file)
--- a/drivers/input/lightsensor/cm3202.c
+++ b/drivers/input/lightsensor/cm3202.c
@@ -202,7 +202,10 @@ static int cm3202_probe(struct platform_device *pdev)
                printk("cm3202 alloc memory err !!!\n");
                err = -ENOMEM;
                goto alloc_memory_fail;
-       }
+       }       
+               if(pdata->init_platform_hw)
+               pdata->init_platform_hw();
+
        cm3202->CM3202_SD = pdata->CM3202_SD_IOPIN;
        DBG("===============================cm3202==========================\ncm3202_ADC_CHN = %d",pdata->DATA_ADC_CHN);
        light = cm3202;

diff --git a/drivers/serial/rk29_serial.c b/drivers/serial/rk29_serial.c
index 5bfcaa2f7e89aabbdcc6b8ae0fb4ed7134d5cc91..0c463416622b26b89320c01ecf346bcf5ce9ebfe 100755 (executable)
--- a/drivers/serial/rk29_serial.c
+++ b/drivers/serial/rk29_serial.c
@@ -334,7 +334,11 @@ 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);
+               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
        }
 
        retval = request_irq(port->irq,rk29_uart_interrupt,IRQF_SHARED,