From: 许盛飞 <xsf@rock-chips.com>
Date: Wed, 14 Nov 2012 07:44:57 +0000 (+0800)
Subject: the function get_msc_connect_flag change to get_gadget_connect_flag
X-Git-Tag: firefly_0821_release~8216
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4d9a68ab708f743d4f5c5536fc575aad18c36415;p=firefly-linux-kernel-4.4.55.git

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 8ed049bb4ee1..e2c861c72e49 100644
--- 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 840e5acd0561..933c20af1f40 100644
--- 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 437734e2b99e..d1732d0d10b9 100755
--- 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;