From 0a40c1b539d1eec69a14ed1eaeddd8c01d43e1b6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E8=B5=B5=E5=AD=90=E5=88=9D?= Date: Tue, 18 Jun 2013 11:56:53 +0800 Subject: [PATCH] update bp driver --- drivers/misc/bp/chips/mu509.c | 4 ++-- drivers/misc/bp/chips/sew290.c | 2 +- drivers/misc/bp/chips/u7501.c | 7 ++----- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/drivers/misc/bp/chips/mu509.c b/drivers/misc/bp/chips/mu509.c index 7de6ae707b1f..b8c538406990 100755 --- a/drivers/misc/bp/chips/mu509.c +++ b/drivers/misc/bp/chips/mu509.c @@ -171,7 +171,7 @@ static int bp_suspend(struct bp_private_data *bp) printk("<-----mu509 bp_suspend-------->\n"); #if defined(CONFIG_ARCH_RK29) rk29_mux_api_set(GPIO1C1_UART0RTSN_SDMMC1WRITEPRT_NAME, GPIO1H_GPIO1C1); - #elif defined(CONFIG_ARCH_RK30) + #elif defined(CONFIG_SOC_RK3066) rk30_mux_api_set(GPIO1A7_UART1RTSN_SPI0TXD_NAME, GPIO1A_GPIO1A7); #endif @@ -192,7 +192,7 @@ static int bp_resume(struct bp_private_data *bp) { #if defined(CONFIG_ARCH_RK29) rk29_mux_api_set(GPIO1C1_UART0RTSN_SDMMC1WRITEPRT_NAME, GPIO1H_UART0_RTS_N); - #elif defined(CONFIG_ARCH_RK30) + #elif defined(CONFIG_SOC_RK3066) rk30_mux_api_set(GPIO1A7_UART1RTSN_SPI0TXD_NAME, GPIO1A_UART1_RTS_N); #endif diff --git a/drivers/misc/bp/chips/sew290.c b/drivers/misc/bp/chips/sew290.c index b135ba83668c..8e3d32638cca 100644 --- a/drivers/misc/bp/chips/sew290.c +++ b/drivers/misc/bp/chips/sew290.c @@ -214,7 +214,7 @@ struct bp_operate bp_sew290_ops = { .resume = bp_resume, .misc_name = NULL, .private_miscdev = NULL, -#elif defined(CONFIG_ARCH_RK30) +#elif defined(CONFIG_SOC_RK3066) .name = "sew290", .bp_id = BP_ID_SEW290, .bp_bus = BP_BUS_TYPE_USB_UART, diff --git a/drivers/misc/bp/chips/u7501.c b/drivers/misc/bp/chips/u7501.c index 1936affb0208..87fd8b96a11a 100644 --- a/drivers/misc/bp/chips/u7501.c +++ b/drivers/misc/bp/chips/u7501.c @@ -67,8 +67,6 @@ static int bp_active(struct bp_private_data *bp, int enable) else { printk("<-----U7501 bp_off----->\n"); - gpio_set_value(bp->ops->bp_en, GPIO_HIGH); - msleep(4000); gpio_set_value(bp->ops->bp_en, GPIO_LOW); } @@ -80,11 +78,10 @@ static int ap_wake_bp(struct bp_private_data *bp, int wake) { printk("<-----U7501 ap_wake_bp-------->\n"); - int result = 0; gpio_set_value(bp->ops->ap_wakeup_bp, wake); - return result; + return 0; } @@ -220,7 +217,7 @@ struct bp_operate bp_U7501_ops = { .resume = bp_resume, .misc_name = NULL, .private_miscdev = NULL, -#elif defined(CONFIG_ARCH_RK30) +#elif (defined(CONFIG_SOC_RK3168) || defined(CONFIG_SOC_RK3188)) .name = "U7501", .bp_id = BP_ID_U7501, .bp_bus = BP_BUS_TYPE_USB_UART, -- 2.34.1