From 344d70a08a854bfd23444ed2a64c5b1037dc50cc Mon Sep 17 00:00:00 2001 From: root Date: Thu, 19 May 2011 10:30:33 +0800 Subject: [PATCH] xxm FIH: 1.update cm3202 ,2.update rk29_serial for gps --- arch/arm/mach-rk29/board-rk29-fih.c | 2 +- drivers/input/lightsensor/cm3202.c | 5 ++++- drivers/serial/rk29_serial.c | 6 +++++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-rk29/board-rk29-fih.c b/arch/arm/mach-rk29/board-rk29-fih.c index e0ce1042ab53..134816cb448c 100755 --- 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 a1bc3eea1734..09536778e2c4 100644 --- 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 5bfcaa2f7e89..0c463416622b 100755 --- 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, -- 2.34.1