shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-11 13:27:06 +09:00
Code Issues Packages Projects Releases Wiki Activity

xxm FIH:update gps && UART3

Browse Source
This commit is contained in:
root
2011-04-26 19:37:34 +08:00
parent 99e3aa8104
commit c3093c46d4
2 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
arch/arm/mach-rk29/board-rk29-fih.c
View File

@@ -1901,6 +1901,29 @@ 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 = {
@@ -2403,6 +2426,10 @@ static void __init machine_rk29_board_init(void)
rk29sdk_init_wifi_mem();
#endif
#ifdef CONFIG_RK29_GPS
rk29_gps_bcm4751_gpio_init();
#endif
board_usb_detect_init(RK29_PIN0_PA0);
}

2
drivers/serial/rk29_serial.c
View File

@@ -335,8 +335,6 @@ static int rk29_serial_startup(struct uart_port *port)
{
rk29_mux_api_set(GPIO2B3_UART3SOUT_NAME, GPIO2L_UART3_SOUT);
rk29_mux_api_set(GPIO2B2_UART3SIN_NAME, GPIO2L_UART3_SIN);
gpio_pull_updown(RK29_PIN2_PB2, NULL);
gpio_pull_updown(RK29_PIN2_PB3, NULL);
}
retval = request_irq(port->irq,rk29_uart_interrupt,IRQF_SHARED,