the function get_msc_connect_flag change to get_gadget_connect_flag

diff --git a/drivers/power/rk29_adc_battery.c b/drivers/power/rk29_adc_battery.c
index 8ed049bb4ee1100def2e1c2f7c0ecf26482a66d6..e2c861c72e49eef7db2209e2bb102bcf2a76686f 100644 (file)
--- a/drivers/power/rk29_adc_battery.c
+++ b/drivers/power/rk29_adc_battery.c
@@ -126,7 +126,7 @@ static struct batt_vol_cal  batt_table[BATT_NUM] = {
 /********************************************************************************/
 
 extern int dwc_vbus_status(void);
-extern int get_msc_connect_flag(void);
+extern int get_gadget_connect_flag(void);
 
 struct rk29_adc_battery_data {
        int irq;
@@ -259,7 +259,7 @@ static int rk29_adc_battery_get_charge_level(struct rk29_adc_battery_data *bat)
                        return;
                if (1 == dwc_vbus_status()) {          //¼ì²âµ½USB²åÈ룬µ«ÊÇÎÞ·¨Ê¶±ðÊÇ·ñÊdzäµçÆ÷
                                                 //ͨ¹ýÑÓʱ¼ì²âPCʶ±ð±êÖ¾£¬Èç¹û³¬Ê±¼ì²â²»µ½£¬ËµÃ÷Êdzäµç
-                       if (0 == get_msc_connect_flag()){                               //²åÈë³äµçÆ÷ʱ¼ä´óÓÚÒ»¶¨Ê±¼äÖ®ºó£¬¿ªÊ¼½øÈë³äµç״̬
+                       if (1 == get_gadget_connect_flag()){                               //²åÈë³äµçÆ÷ʱ¼ä´óÓÚÒ»¶¨Ê±¼äÖ®ºó£¬¿ªÊ¼½øÈë³äµç״̬
                                if (++gBatUsbChargeCnt >= NUM_USBCHARGE_IDENTIFY_TIMES){
                                        gBatUsbChargeCnt = NUM_USBCHARGE_IDENTIFY_TIMES + 1;
                                        charge_on = 1;

diff --git a/drivers/power/rk30_factory_adc_battery.c b/drivers/power/rk30_factory_adc_battery.c
index 840e5acd0561b236ebc72ae088e737ab0c4f89ec..933c20af1f40157514efdd1cdba30b52bfd59403 100644 (file)
--- a/drivers/power/rk30_factory_adc_battery.c
+++ b/drivers/power/rk30_factory_adc_battery.c
@@ -201,7 +201,7 @@ char gDischargeFlag[3] = {"on "};
 /********************************************************************************/
 
 extern int dwc_vbus_status(void);
-extern int get_msc_connect_flag(void);
+extern int get_gadget_connect_flag(void);
 
 struct rk30_adc_battery_data {
        int irq;
@@ -492,7 +492,7 @@ static int rk30_adc_battery_get_charge_level(struct rk30_adc_battery_data *bat)
        if(1 == pdata->spport_usb_charging){
                if (charge_on == 0){
                        if (1 == dwc_vbus_status()) {
-                               if (0 == get_msc_connect_flag()){ 
+                               if (1 == get_gadget_connect_flag()){ 
                                        if (++bat->gBatUsbChargeCnt >= NUM_USBCHARGE_IDENTIFY_TIMES){
                                                bat->gBatUsbChargeCnt = NUM_USBCHARGE_IDENTIFY_TIMES + 1;
                                                //charge_on = 1;

diff --git a/drivers/usb/otg/twl6030-usb.c b/drivers/usb/otg/twl6030-usb.c
index 437734e2b99e8ecb5c9c92bb86038b281c2b414e..d1732d0d10b9e4c668ef72325a08f557f489bd6b 100755 (executable)
--- a/drivers/usb/otg/twl6030-usb.c
+++ b/drivers/usb/otg/twl6030-usb.c
@@ -92,7 +92,7 @@
 #define CONTROLLER_STAT1               0x03
 #define        VBUS_DET                        BIT(2)
 
-extern int get_msc_connect_flag(void);
+extern int get_gadget_connect_flag(void);
 
 
 struct twl6030_usb {
@@ -313,7 +313,7 @@ static irqreturn_t twl6030_usb_irq(int irq, void *_twl)
 
                regulator_enable(twl->usb3v3);
                twl6030_phy_suspend(&twl->otg, 0);
-               if(0 == get_msc_connect_flag())
+               if(0 == get_gadget_connect_flag())
                        charger_type = POWER_SUPPLY_TYPE_USB_DCP;
                else
                        charger_type = POWER_SUPPLY_TYPE_USB;