projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus-4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
extcon
/
extcon-max77843.c
diff --git
a/drivers/extcon/extcon-max77843.c
b/drivers/extcon/extcon-max77843.c
index fdd928542c19dffe06d2ba762b64b4aaf85d7442..9f9ea334399c19044908f2ebe241e79166123fa5 100644
(file)
--- a/
drivers/extcon/extcon-max77843.c
+++ b/
drivers/extcon/extcon-max77843.c
@@
-122,11
+122,11
@@
enum max77843_muic_charger_type {
static const unsigned int max77843_extcon_cable[] = {
EXTCON_USB,
EXTCON_USB_HOST,
static const unsigned int max77843_extcon_cable[] = {
EXTCON_USB,
EXTCON_USB_HOST,
- EXTCON_
TA
,
- EXTCON_CH
ARGE_DOWNSTREAM
,
- EXTCON_
FAST_CHARGER
,
- EXTCON_
SLOW_CHARGER
,
- EXTCON_MHL,
+ EXTCON_
CHG_USB_DCP
,
+ EXTCON_CH
G_USB_CDP
,
+ EXTCON_
CHG_USB_FAST
,
+ EXTCON_
CHG_USB_SLOW
,
+ EXTCON_
DISP_
MHL,
EXTCON_JIG,
EXTCON_NONE,
};
EXTCON_JIG,
EXTCON_NONE,
};
@@
-355,7
+355,7
@@
static int max77843_muic_adc_gnd_handler(struct max77843_muic_info *info)
if (ret < 0)
return ret;
if (ret < 0)
return ret;
- extcon_set_cable_state_(info->edev, EXTCON_MHL, attached);
+ extcon_set_cable_state_(info->edev, EXTCON_
DISP_
MHL, attached);
break;
default:
dev_err(info->dev, "failed to detect %s accessory(gnd:0x%x)\n",
break;
default:
dev_err(info->dev, "failed to detect %s accessory(gnd:0x%x)\n",
@@
-494,7
+494,7
@@
static int max77843_muic_chg_handler(struct max77843_muic_info *info)
if (ret < 0)
return ret;
if (ret < 0)
return ret;
- extcon_set_cable_state_(info->edev, EXTCON_CH
ARGE_DOWNSTREAM
,
+ extcon_set_cable_state_(info->edev, EXTCON_CH
G_USB_CDP
,
attached);
break;
case MAX77843_MUIC_CHG_DEDICATED:
attached);
break;
case MAX77843_MUIC_CHG_DEDICATED:
@@
-504,7
+504,8
@@
static int max77843_muic_chg_handler(struct max77843_muic_info *info)
if (ret < 0)
return ret;
if (ret < 0)
return ret;
- extcon_set_cable_state_(info->edev, EXTCON_TA, attached);
+ extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_DCP,
+ attached);
break;
case MAX77843_MUIC_CHG_SPECIAL_500MA:
ret = max77843_muic_set_path(info,
break;
case MAX77843_MUIC_CHG_SPECIAL_500MA:
ret = max77843_muic_set_path(info,
@@
-513,7
+514,7
@@
static int max77843_muic_chg_handler(struct max77843_muic_info *info)
if (ret < 0)
return ret;
if (ret < 0)
return ret;
- extcon_set_cable_state_(info->edev, EXTCON_
SLOW_CHARGER
,
+ extcon_set_cable_state_(info->edev, EXTCON_
CHG_USB_SLOW
,
attached);
break;
case MAX77843_MUIC_CHG_SPECIAL_1A:
attached);
break;
case MAX77843_MUIC_CHG_SPECIAL_1A:
@@
-523,7
+524,7
@@
static int max77843_muic_chg_handler(struct max77843_muic_info *info)
if (ret < 0)
return ret;
if (ret < 0)
return ret;
- extcon_set_cable_state_(info->edev, EXTCON_
FAST_CHARGER
,
+ extcon_set_cable_state_(info->edev, EXTCON_
CHG_USB_FAST
,
attached);
break;
case MAX77843_MUIC_CHG_GND:
attached);
break;
case MAX77843_MUIC_CHG_GND:
@@
-532,9
+533,11
@@
static int max77843_muic_chg_handler(struct max77843_muic_info *info)
/* Charger cable on MHL accessory is attach or detach */
if (gnd_type == MAX77843_MUIC_GND_MHL_VB)
/* Charger cable on MHL accessory is attach or detach */
if (gnd_type == MAX77843_MUIC_GND_MHL_VB)
- extcon_set_cable_state_(info->edev, EXTCON_TA, true);
+ extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_DCP,
+ true);
else if (gnd_type == MAX77843_MUIC_GND_MHL)
else if (gnd_type == MAX77843_MUIC_GND_MHL)
- extcon_set_cable_state_(info->edev, EXTCON_TA, false);
+ extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_DCP,
+ false);
break;
case MAX77843_MUIC_CHG_NONE:
break;
break;
case MAX77843_MUIC_CHG_NONE:
break;