update bp driver

diff --git a/drivers/misc/bp/chips/mu509.c b/drivers/misc/bp/chips/mu509.c
index 7de6ae707b1f63c21f1d981f256f172e83951179..b8c5384069908b9e385ef5835ae38e34b9b40d02 100755 (executable)
--- 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");\r
        #if defined(CONFIG_ARCH_RK29)\r
                rk29_mux_api_set(GPIO1C1_UART0RTSN_SDMMC1WRITEPRT_NAME, GPIO1H_GPIO1C1);\r
-       #elif defined(CONFIG_ARCH_RK30)\r
+       #elif defined(CONFIG_SOC_RK3066)\r
                rk30_mux_api_set(GPIO1A7_UART1RTSN_SPI0TXD_NAME, GPIO1A_GPIO1A7);\r
        #endif\r
        \r
@@ -192,7 +192,7 @@ static int bp_resume(struct bp_private_data *bp)
 {      \r
        #if defined(CONFIG_ARCH_RK29)\r
                rk29_mux_api_set(GPIO1C1_UART0RTSN_SDMMC1WRITEPRT_NAME, GPIO1H_UART0_RTS_N);\r
-       #elif defined(CONFIG_ARCH_RK30)\r
+       #elif defined(CONFIG_SOC_RK3066)\r
                rk30_mux_api_set(GPIO1A7_UART1RTSN_SPI0TXD_NAME, GPIO1A_UART1_RTS_N);\r
        #endif\r
        \r

diff --git a/drivers/misc/bp/chips/sew290.c b/drivers/misc/bp/chips/sew290.c
index b135ba83668ce24fcca819a89a91359533555e1d..8e3d32638cca4ce2ab003812269f9efc09042ede 100644 (file)
--- 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,\r
        .misc_name              = NULL,\r
        .private_miscdev        = NULL,\r
-#elif defined(CONFIG_ARCH_RK30)\r
+#elif defined(CONFIG_SOC_RK3066)\r
        .name                   = "sew290",\r
        .bp_id                  = BP_ID_SEW290,\r
        .bp_bus                 = BP_BUS_TYPE_USB_UART,         \r

diff --git a/drivers/misc/bp/chips/u7501.c b/drivers/misc/bp/chips/u7501.c
index 1936affb0208524a32c146a7e160fbc05cbc4d61..87fd8b96a11a6245a8da0610504df45e877e893b 100644 (file)
--- 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\r
        {\r
        printk("<-----U7501 bp_off----->\n");\r
-                gpio_set_value(bp->ops->bp_en, GPIO_HIGH);\r
-                msleep(4000);\r
                 gpio_set_value(bp->ops->bp_en, GPIO_LOW);\r
 \r
        }\r
@@ -80,11 +78,10 @@ static int ap_wake_bp(struct bp_private_data *bp, int wake)
 {\r
        printk("<-----U7501 ap_wake_bp-------->\n");\r
 \r
-       int result = 0;\r
        \r
        gpio_set_value(bp->ops->ap_wakeup_bp, wake);  \r
        \r
-       return result;\r
+       return 0;\r
 \r
 }\r
 \r
@@ -220,7 +217,7 @@ struct bp_operate bp_U7501_ops = {
        .resume                 = bp_resume,\r
        .misc_name              = NULL,\r
        .private_miscdev        = NULL,\r
-#elif defined(CONFIG_ARCH_RK30)\r
+#elif (defined(CONFIG_SOC_RK3168) || defined(CONFIG_SOC_RK3188))\r
        .name                   = "U7501",\r
        .bp_id                  = BP_ID_U7501,\r
        .bp_bus                 = BP_BUS_TYPE_USB_UART,         \r