summaryrefslogtreecommitdiffstats
path: root/drivers/extcon/extcon-axp288.c
diff options
context:
space:
mode:
authorChanwoo Choi <cw00.choi@samsung.com>2015-10-03 01:15:13 -0400
committerChanwoo Choi <cw00.choi@samsung.com>2015-10-15 19:30:09 -0400
commit11eecf910bd81d36425020743b2df73651c5b466 (patch)
treeccd2a1b7401285dacd118453c88bd88c5e44e5c4 /drivers/extcon/extcon-axp288.c
parentde992acb93df41fd6cd0ea975ae192363033694a (diff)
extcon: Modify the id and name of external connector
This patch modifies the id and name of external connector with the additional prefix to clarify both attribute and meaning of external connector as following: - EXTCON_CHG_* mean the charger connector. - EXTCON_JACK_* mean the jack connector. - EXTCON_DISP_* mean the display port connector. Following table show the new name of external connector with old name: -------------------------------------------------- Old extcon name | New extcon name | -------------------------------------------------- EXTCON_TA | EXTCON_CHG_USB_DCP | EXTCON_CHARGE_DOWNSTREAM| EXTCON_CHG_USB_CDP | EXTCON_FAST_CHARGER | EXTCON_CHG_USB_FAST | EXTCON_SLOW_CHARGER | EXTCON_CHG_USB_SLOW | -------------------------------------------------- EXTCON_MICROPHONE | EXTCON_JACK_MICROPHONE | EXTCON_HEADPHONE | EXTCON_JACK_HEADPHONE | EXTCON_LINE_IN | EXTCON_JACK_LINE_IN | EXTCON_LINE_OUT | EXTCON_JACK_LINE_OUT | EXTCON_VIDEO_IN | EXTCON_JACK_VIDEO_IN | EXTCON_VIDEO_OUT | EXTCON_JACK_VIDEO_OUT | EXTCON_SPDIF_IN | EXTCON_JACK_SPDIF_IN | EXTCON_SPDIF_OUT | EXTCON_JACK_SPDIF_OUT | -------------------------------------------------- EXTCON_HMDI | EXTCON_DISP_HDMI | EXTCON_MHL | EXTCON_DISP_MHL | EXTCON_DVI | EXTCON_DISP_DVI | EXTCON_VGA | EXTCON_DISP_VGA | -------------------------------------------------- And, when altering the name of USB charger connector, EXTCON refers to the "Battery Charging v1.2 Spec and Adopters Agreement"[1] to use the standard name of USB charging port as following. Following name of USB charging port are already used in power_supply subsystem. We chan check it on patch[2]. - EXTCON_CHG_USB_SDP /* Standard Downstream Port */ - EXTCON_CHG_USB_DCP /* Dedicated Charging Port */ - EXTCON_CHG_USB_CDP /* Charging Downstream Port */ - EXTCON_CHG_USB_ACA /* Accessory Charger Adapter */ [1] www.usb.org/developers/docs/devclass_docs/BCv1.2_070312.zip [2] commit 85efc8a18ced ("power_supply: Add types for USB chargers") Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com> [ckeepax: For the Arizona changes] Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com> Reviewed-by: Roger Quadros <rogerq@ti.com>
Diffstat (limited to 'drivers/extcon/extcon-axp288.c')
-rw-r--r--drivers/extcon/extcon-axp288.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/extcon/extcon-axp288.c b/drivers/extcon/extcon-axp288.c
index 9668d6a94e38..fd55c2f2080a 100644
--- a/drivers/extcon/extcon-axp288.c
+++ b/drivers/extcon/extcon-axp288.c
@@ -102,9 +102,9 @@ enum axp288_extcon_irq {
102}; 102};
103 103
104static const unsigned int axp288_extcon_cables[] = { 104static const unsigned int axp288_extcon_cables[] = {
105 EXTCON_SLOW_CHARGER, 105 EXTCON_CHG_USB_SDP,
106 EXTCON_CHARGE_DOWNSTREAM, 106 EXTCON_CHG_USB_CDP,
107 EXTCON_FAST_CHARGER, 107 EXTCON_CHG_USB_DCP,
108 EXTCON_NONE, 108 EXTCON_NONE,
109}; 109};
110 110
@@ -192,18 +192,18 @@ static int axp288_handle_chrg_det_event(struct axp288_extcon_info *info)
192 dev_dbg(info->dev, "sdp cable is connecetd\n"); 192 dev_dbg(info->dev, "sdp cable is connecetd\n");
193 notify_otg = true; 193 notify_otg = true;
194 notify_charger = true; 194 notify_charger = true;
195 cable = EXTCON_SLOW_CHARGER; 195 cable = EXTCON_CHG_USB_SDP;
196 break; 196 break;
197 case DET_STAT_CDP: 197 case DET_STAT_CDP:
198 dev_dbg(info->dev, "cdp cable is connecetd\n"); 198 dev_dbg(info->dev, "cdp cable is connecetd\n");
199 notify_otg = true; 199 notify_otg = true;
200 notify_charger = true; 200 notify_charger = true;
201 cable = EXTCON_CHARGE_DOWNSTREAM; 201 cable = EXTCON_CHG_USB_CDP;
202 break; 202 break;
203 case DET_STAT_DCP: 203 case DET_STAT_DCP:
204 dev_dbg(info->dev, "dcp cable is connecetd\n"); 204 dev_dbg(info->dev, "dcp cable is connecetd\n");
205 notify_charger = true; 205 notify_charger = true;
206 cable = EXTCON_FAST_CHARGER; 206 cable = EXTCON_CHG_USB_DCP;
207 break; 207 break;
208 default: 208 default:
209 dev_warn(info->dev, 209 dev_warn(info->dev,