change u5501 modem usbport to 244

diff --git a/drivers/misc/bp/chips/u5501.c b/drivers/misc/bp/chips/u5501.c
index c5fa41a56104005d038f94da4140828f0ba47493..e72461de90006f947366e19c9855c49858c1c747 100755 (executable)
--- a/drivers/misc/bp/chips/u5501.c
+++ b/drivers/misc/bp/chips/u5501.c
@@ -171,7 +171,7 @@ static int bp_suspend(struct bp_private_data *bp)
        printk("<-----u5501 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
@@ -183,7 +183,7 @@ static int bp_suspend(struct bp_private_data *bp)
        #if defined(CONFIG_ARCH_RK2928)\r
        rk29_mux_api_set(GPIO1B1_SPI_TXD_UART1_SOUT_NAME, GPIO1B_GPIO1B1);\r
        gpio_set_value(RK2928_PIN1_PB1, GPIO_LOW);\r
-       #elif defined(CONFIG_ARCH_RK30)\r
+       #elif defined(CONFIG_SOC_RK3066)\r
        rk30_mux_api_set(GPIO1A5_UART1SOUT_SPI0CLK_NAME, GPIO1A_GPIO1A5);\r
        gpio_set_value(RK30_PIN1_PA5, GPIO_LOW);\r
        #endif\r
@@ -197,13 +197,13 @@ 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
        #if defined(CONFIG_ARCH_RK2928)\r
        rk29_mux_api_set(GPIO1B1_SPI_TXD_UART1_SOUT_NAME, GPIO1B_UART1_SOUT);\r
-       #elif defined(CONFIG_ARCH_RK30)\r
+       #elif defined(CONFIG_SOC_RK3066)\r
        rk30_mux_api_set(GPIO1A5_UART1SOUT_SPI0CLK_NAME, GPIO1A_UART1_SOUT);\r
        #endif\r
        //bp->suspend_status = 0;       \r

diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
old mode 100644 (file)
new mode 100755 (executable)
index ce25650..e5bced3
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@ -1079,6 +1079,7 @@ int usb_serial_probe(struct usb_interface *interface,
                        || ((le16_to_cpu(dev->descriptor.idVendor) == 0x19f5) && (le16_to_cpu(dev->descriptor.idProduct) == 0x9013) && (bp_id == 4))                    
                        || ((le16_to_cpu(dev->descriptor.idVendor) == 0x0E8D) && (le16_to_cpu(dev->descriptor.idProduct) == 0x00A2) && (bp_id == 1))
                        || ((le16_to_cpu(dev->descriptor.idVendor) == 0x21f5) && (le16_to_cpu(dev->descriptor.idProduct) == 0x2012) && (bp_id == 10))
+                       || ((le16_to_cpu(dev->descriptor.idVendor) == 0x1c9e) && (le16_to_cpu(dev->descriptor.idProduct) == 0x9603) && (bp_id == 11))
                ){
                        BP_USB =1;