Skip to content

Commit 11eecf9

Browse files
chanwoochoichanwoochoi
committed
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 85efc8a ("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>
1 parent de992ac commit 11eecf9

10 files changed

Lines changed: 139 additions & 119 deletions

File tree

‎drivers/extcon/extcon-arizona.c‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,9 @@ static const int arizona_micd_levels[] = {
137137

138138
static const unsigned int arizona_cable[] = {
139139
EXTCON_MECHANICAL,
140-
EXTCON_MICROPHONE,
141-
EXTCON_HEADPHONE,
142-
EXTCON_LINE_OUT,
140+
EXTCON_JACK_MICROPHONE,
141+
EXTCON_JACK_HEADPHONE,
142+
EXTCON_JACK_LINE_OUT,
143143
EXTCON_NONE,
144144
};
145145

@@ -600,7 +600,7 @@ static irqreturn_t arizona_hpdet_irq(int irq, void *data)
600600
struct arizona_extcon_info *info = data;
601601
struct arizona *arizona = info->arizona;
602602
int id_gpio = arizona->pdata.hpdet_id_gpio;
603-
unsigned int report = EXTCON_HEADPHONE;
603+
unsigned int report = EXTCON_JACK_HEADPHONE;
604604
int ret, reading;
605605
bool mic = false;
606606

@@ -645,9 +645,9 @@ static irqreturn_t arizona_hpdet_irq(int irq, void *data)
645645

646646
/* Report high impedence cables as line outputs */
647647
if (reading >= 5000)
648-
report = EXTCON_LINE_OUT;
648+
report = EXTCON_JACK_LINE_OUT;
649649
else
650-
report = EXTCON_HEADPHONE;
650+
report = EXTCON_JACK_HEADPHONE;
651651

652652
ret = extcon_set_cable_state_(info->edev, report, true);
653653
if (ret != 0)
@@ -732,7 +732,7 @@ static void arizona_identify_headphone(struct arizona_extcon_info *info)
732732
ARIZONA_ACCDET_MODE_MASK, ARIZONA_ACCDET_MODE_MIC);
733733

734734
/* Just report headphone */
735-
ret = extcon_set_cable_state_(info->edev, EXTCON_HEADPHONE, true);
735+
ret = extcon_set_cable_state_(info->edev, EXTCON_JACK_HEADPHONE, true);
736736
if (ret != 0)
737737
dev_err(arizona->dev, "Failed to report headphone: %d\n", ret);
738738

@@ -789,7 +789,7 @@ static void arizona_start_hpdet_acc_id(struct arizona_extcon_info *info)
789789
ARIZONA_ACCDET_MODE_MASK, ARIZONA_ACCDET_MODE_MIC);
790790

791791
/* Just report headphone */
792-
ret = extcon_set_cable_state_(info->edev, EXTCON_HEADPHONE, true);
792+
ret = extcon_set_cable_state_(info->edev, EXTCON_JACK_HEADPHONE, true);
793793
if (ret != 0)
794794
dev_err(arizona->dev, "Failed to report headphone: %d\n", ret);
795795

@@ -915,7 +915,7 @@ static void arizona_micd_detect(struct work_struct *work)
915915
arizona_identify_headphone(info);
916916

917917
ret = extcon_set_cable_state_(info->edev,
918-
EXTCON_MICROPHONE, true);
918+
EXTCON_JACK_MICROPHONE, true);
919919
if (ret != 0)
920920
dev_err(arizona->dev, "Headset report failed: %d\n",
921921
ret);

‎drivers/extcon/extcon-axp288.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,9 @@ enum axp288_extcon_irq {
102102
};
103103

104104
static const unsigned int axp288_extcon_cables[] = {
105-
EXTCON_SLOW_CHARGER,
106-
EXTCON_CHARGE_DOWNSTREAM,
107-
EXTCON_FAST_CHARGER,
105+
EXTCON_CHG_USB_SDP,
106+
EXTCON_CHG_USB_CDP,
107+
EXTCON_CHG_USB_DCP,
108108
EXTCON_NONE,
109109
};
110110

@@ -192,18 +192,18 @@ static int axp288_handle_chrg_det_event(struct axp288_extcon_info *info)
192192
dev_dbg(info->dev, "sdp cable is connecetd\n");
193193
notify_otg = true;
194194
notify_charger = true;
195-
cable = EXTCON_SLOW_CHARGER;
195+
cable = EXTCON_CHG_USB_SDP;
196196
break;
197197
case DET_STAT_CDP:
198198
dev_dbg(info->dev, "cdp cable is connecetd\n");
199199
notify_otg = true;
200200
notify_charger = true;
201-
cable = EXTCON_CHARGE_DOWNSTREAM;
201+
cable = EXTCON_CHG_USB_CDP;
202202
break;
203203
case DET_STAT_DCP:
204204
dev_dbg(info->dev, "dcp cable is connecetd\n");
205205
notify_charger = true;
206-
cable = EXTCON_FAST_CHARGER;
206+
cable = EXTCON_CHG_USB_DCP;
207207
break;
208208
default:
209209
dev_warn(info->dev,

‎drivers/extcon/extcon-max14577.c‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -150,10 +150,10 @@ enum max14577_muic_acc_type {
150150

151151
static const unsigned int max14577_extcon_cable[] = {
152152
EXTCON_USB,
153-
EXTCON_TA,
154-
EXTCON_FAST_CHARGER,
155-
EXTCON_SLOW_CHARGER,
156-
EXTCON_CHARGE_DOWNSTREAM,
153+
EXTCON_CHG_USB_DCP,
154+
EXTCON_CHG_USB_FAST,
155+
EXTCON_CHG_USB_SLOW,
156+
EXTCON_CHG_USB_CDP,
157157
EXTCON_JIG,
158158
EXTCON_NONE,
159159
};
@@ -456,18 +456,19 @@ static int max14577_muic_chg_handler(struct max14577_muic_info *info)
456456
extcon_set_cable_state_(info->edev, EXTCON_USB, attached);
457457
break;
458458
case MAX14577_CHARGER_TYPE_DEDICATED_CHG:
459-
extcon_set_cable_state_(info->edev, EXTCON_TA, attached);
459+
extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_DCP,
460+
attached);
460461
break;
461462
case MAX14577_CHARGER_TYPE_DOWNSTREAM_PORT:
462-
extcon_set_cable_state_(info->edev, EXTCON_CHARGE_DOWNSTREAM,
463+
extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_CDP,
463464
attached);
464465
break;
465466
case MAX14577_CHARGER_TYPE_SPECIAL_500MA:
466-
extcon_set_cable_state_(info->edev, EXTCON_SLOW_CHARGER,
467+
extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_SLOW,
467468
attached);
468469
break;
469470
case MAX14577_CHARGER_TYPE_SPECIAL_1A:
470-
extcon_set_cable_state_(info->edev, EXTCON_FAST_CHARGER,
471+
extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_FAST,
471472
attached);
472473
break;
473474
case MAX14577_CHARGER_TYPE_NONE:

‎drivers/extcon/extcon-max77693.c‎

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -204,11 +204,11 @@ enum max77693_muic_acc_type {
204204
static const unsigned int max77693_extcon_cable[] = {
205205
EXTCON_USB,
206206
EXTCON_USB_HOST,
207-
EXTCON_TA,
208-
EXTCON_FAST_CHARGER,
209-
EXTCON_SLOW_CHARGER,
210-
EXTCON_CHARGE_DOWNSTREAM,
211-
EXTCON_MHL,
207+
EXTCON_CHG_USB_DCP,
208+
EXTCON_CHG_USB_FAST,
209+
EXTCON_CHG_USB_SLOW,
210+
EXTCON_CHG_USB_CDP,
211+
EXTCON_DISP_MHL,
212212
EXTCON_JIG,
213213
EXTCON_DOCK,
214214
EXTCON_NONE,
@@ -505,7 +505,7 @@ static int max77693_muic_dock_handler(struct max77693_muic_info *info,
505505
return ret;
506506

507507
extcon_set_cable_state_(info->edev, EXTCON_DOCK, attached);
508-
extcon_set_cable_state_(info->edev, EXTCON_MHL, attached);
508+
extcon_set_cable_state_(info->edev, EXTCON_DISP_MHL, attached);
509509
goto out;
510510
case MAX77693_MUIC_ADC_AUDIO_MODE_REMOTE: /* Dock-Desk */
511511
dock_id = EXTCON_DOCK;
@@ -605,7 +605,7 @@ static int max77693_muic_adc_ground_handler(struct max77693_muic_info *info)
605605
case MAX77693_MUIC_GND_MHL:
606606
case MAX77693_MUIC_GND_MHL_VB:
607607
/* MHL or MHL with USB/TA cable */
608-
extcon_set_cable_state_(info->edev, EXTCON_MHL, attached);
608+
extcon_set_cable_state_(info->edev, EXTCON_DISP_MHL, attached);
609609
break;
610610
default:
611611
dev_err(info->dev, "failed to detect %s cable of gnd type\n",
@@ -801,10 +801,11 @@ static int max77693_muic_chg_handler(struct max77693_muic_info *info)
801801
* - Support charging through micro-usb port without
802802
* data connection
803803
*/
804-
extcon_set_cable_state_(info->edev, EXTCON_TA, attached);
804+
extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_DCP,
805+
attached);
805806
if (!cable_attached)
806-
extcon_set_cable_state_(info->edev, EXTCON_MHL,
807-
cable_attached);
807+
extcon_set_cable_state_(info->edev,
808+
EXTCON_DISP_MHL, cable_attached);
808809
break;
809810
}
810811

@@ -862,7 +863,7 @@ static int max77693_muic_chg_handler(struct max77693_muic_info *info)
862863

863864
extcon_set_cable_state_(info->edev, EXTCON_DOCK,
864865
attached);
865-
extcon_set_cable_state_(info->edev, EXTCON_MHL,
866+
extcon_set_cable_state_(info->edev, EXTCON_DISP_MHL,
866867
attached);
867868
break;
868869
}
@@ -901,20 +902,21 @@ static int max77693_muic_chg_handler(struct max77693_muic_info *info)
901902
break;
902903
case MAX77693_CHARGER_TYPE_DEDICATED_CHG:
903904
/* Only TA cable */
904-
extcon_set_cable_state_(info->edev, EXTCON_TA, attached);
905+
extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_DCP,
906+
attached);
905907
break;
906908
}
907909
break;
908910
case MAX77693_CHARGER_TYPE_DOWNSTREAM_PORT:
909-
extcon_set_cable_state_(info->edev, EXTCON_CHARGE_DOWNSTREAM,
911+
extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_CDP,
910912
attached);
911913
break;
912914
case MAX77693_CHARGER_TYPE_APPLE_500MA:
913-
extcon_set_cable_state_(info->edev, EXTCON_SLOW_CHARGER,
915+
extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_SLOW,
914916
attached);
915917
break;
916918
case MAX77693_CHARGER_TYPE_APPLE_1A_2A:
917-
extcon_set_cable_state_(info->edev, EXTCON_FAST_CHARGER,
919+
extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_FAST,
918920
attached);
919921
break;
920922
case MAX77693_CHARGER_TYPE_DEAD_BATTERY:

‎drivers/extcon/extcon-max77843.c‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -122,11 +122,11 @@ enum max77843_muic_charger_type {
122122
static const unsigned int max77843_extcon_cable[] = {
123123
EXTCON_USB,
124124
EXTCON_USB_HOST,
125-
EXTCON_TA,
126-
EXTCON_CHARGE_DOWNSTREAM,
127-
EXTCON_FAST_CHARGER,
128-
EXTCON_SLOW_CHARGER,
129-
EXTCON_MHL,
125+
EXTCON_CHG_USB_DCP,
126+
EXTCON_CHG_USB_CDP,
127+
EXTCON_CHG_USB_FAST,
128+
EXTCON_CHG_USB_SLOW,
129+
EXTCON_DISP_MHL,
130130
EXTCON_JIG,
131131
EXTCON_NONE,
132132
};
@@ -355,7 +355,7 @@ static int max77843_muic_adc_gnd_handler(struct max77843_muic_info *info)
355355
if (ret < 0)
356356
return ret;
357357

358-
extcon_set_cable_state_(info->edev, EXTCON_MHL, attached);
358+
extcon_set_cable_state_(info->edev, EXTCON_DISP_MHL, attached);
359359
break;
360360
default:
361361
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)
494494
if (ret < 0)
495495
return ret;
496496

497-
extcon_set_cable_state_(info->edev, EXTCON_CHARGE_DOWNSTREAM,
497+
extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_CDP,
498498
attached);
499499
break;
500500
case MAX77843_MUIC_CHG_DEDICATED:
@@ -504,7 +504,8 @@ static int max77843_muic_chg_handler(struct max77843_muic_info *info)
504504
if (ret < 0)
505505
return ret;
506506

507-
extcon_set_cable_state_(info->edev, EXTCON_TA, attached);
507+
extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_DCP,
508+
attached);
508509
break;
509510
case MAX77843_MUIC_CHG_SPECIAL_500MA:
510511
ret = max77843_muic_set_path(info,
@@ -513,7 +514,7 @@ static int max77843_muic_chg_handler(struct max77843_muic_info *info)
513514
if (ret < 0)
514515
return ret;
515516

516-
extcon_set_cable_state_(info->edev, EXTCON_SLOW_CHARGER,
517+
extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_SLOW,
517518
attached);
518519
break;
519520
case MAX77843_MUIC_CHG_SPECIAL_1A:
@@ -523,7 +524,7 @@ static int max77843_muic_chg_handler(struct max77843_muic_info *info)
523524
if (ret < 0)
524525
return ret;
525526

526-
extcon_set_cable_state_(info->edev, EXTCON_FAST_CHARGER,
527+
extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_FAST,
527528
attached);
528529
break;
529530
case MAX77843_MUIC_CHG_GND:
@@ -532,9 +533,11 @@ static int max77843_muic_chg_handler(struct max77843_muic_info *info)
532533

533534
/* Charger cable on MHL accessory is attach or detach */
534535
if (gnd_type == MAX77843_MUIC_GND_MHL_VB)
535-
extcon_set_cable_state_(info->edev, EXTCON_TA, true);
536+
extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_DCP,
537+
true);
536538
else if (gnd_type == MAX77843_MUIC_GND_MHL)
537-
extcon_set_cable_state_(info->edev, EXTCON_TA, false);
539+
extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_DCP,
540+
false);
538541
break;
539542
case MAX77843_MUIC_CHG_NONE:
540543
break;

‎drivers/extcon/extcon-max8997.c‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -148,11 +148,11 @@ struct max8997_muic_info {
148148
static const unsigned int max8997_extcon_cable[] = {
149149
EXTCON_USB,
150150
EXTCON_USB_HOST,
151-
EXTCON_TA,
152-
EXTCON_FAST_CHARGER,
153-
EXTCON_SLOW_CHARGER,
154-
EXTCON_CHARGE_DOWNSTREAM,
155-
EXTCON_MHL,
151+
EXTCON_CHG_USB_DCP,
152+
EXTCON_CHG_USB_FAST,
153+
EXTCON_CHG_USB_SLOW,
154+
EXTCON_CHG_USB_CDP,
155+
EXTCON_DISP_MHL,
156156
EXTCON_DOCK,
157157
EXTCON_JIG,
158158
EXTCON_NONE,
@@ -403,7 +403,7 @@ static int max8997_muic_adc_handler(struct max8997_muic_info *info)
403403
return ret;
404404
break;
405405
case MAX8997_MUIC_ADC_MHL:
406-
extcon_set_cable_state_(info->edev, EXTCON_MHL, attached);
406+
extcon_set_cable_state_(info->edev, EXTCON_DISP_MHL, attached);
407407
break;
408408
case MAX8997_MUIC_ADC_FACTORY_MODE_USB_OFF:
409409
case MAX8997_MUIC_ADC_FACTORY_MODE_USB_ON:
@@ -486,18 +486,19 @@ static int max8997_muic_chg_handler(struct max8997_muic_info *info)
486486
}
487487
break;
488488
case MAX8997_CHARGER_TYPE_DOWNSTREAM_PORT:
489-
extcon_set_cable_state_(info->edev, EXTCON_CHARGE_DOWNSTREAM,
489+
extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_CDP,
490490
attached);
491491
break;
492492
case MAX8997_CHARGER_TYPE_DEDICATED_CHG:
493-
extcon_set_cable_state_(info->edev, EXTCON_TA, attached);
493+
extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_DCP,
494+
attached);
494495
break;
495496
case MAX8997_CHARGER_TYPE_500MA:
496-
extcon_set_cable_state_(info->edev, EXTCON_SLOW_CHARGER,
497+
extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_SLOW,
497498
attached);
498499
break;
499500
case MAX8997_CHARGER_TYPE_1A:
500-
extcon_set_cable_state_(info->edev, EXTCON_FAST_CHARGER,
501+
extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_FAST,
501502
attached);
502503
break;
503504
default:

‎drivers/extcon/extcon-rt8973a.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ static struct reg_data rt8973a_reg_data[] = {
9393
static const unsigned int rt8973a_extcon_cable[] = {
9494
EXTCON_USB,
9595
EXTCON_USB_HOST,
96-
EXTCON_TA,
96+
EXTCON_CHG_USB_DCP,
9797
EXTCON_JIG,
9898
EXTCON_NONE,
9999
};
@@ -333,7 +333,7 @@ static int rt8973a_muic_cable_handler(struct rt8973a_muic_info *info,
333333
con_sw = DM_DP_SWITCH_USB;
334334
break;
335335
case RT8973A_MUIC_ADC_TA:
336-
id = EXTCON_TA;
336+
id = EXTCON_CHG_USB_DCP;
337337
con_sw = DM_DP_SWITCH_OPEN;
338338
break;
339339
case RT8973A_MUIC_ADC_FACTORY_MODE_BOOT_OFF_USB:

‎drivers/extcon/extcon-sm5502.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ static struct reg_data sm5502_reg_data[] = {
9595
static const unsigned int sm5502_extcon_cable[] = {
9696
EXTCON_USB,
9797
EXTCON_USB_HOST,
98-
EXTCON_TA,
98+
EXTCON_CHG_USB_DCP,
9999
EXTCON_NONE,
100100
};
101101

@@ -389,7 +389,7 @@ static int sm5502_muic_cable_handler(struct sm5502_muic_info *info,
389389
vbus_sw = VBUSIN_SWITCH_VBUSOUT_WITH_USB;
390390
break;
391391
case SM5502_MUIC_ADC_OPEN_TA:
392-
id = EXTCON_TA;
392+
id = EXTCON_CHG_USB_DCP;
393393
con_sw = DM_DP_SWITCH_OPEN;
394394
vbus_sw = VBUSIN_SWITCH_VBUSOUT;
395395
break;

0 commit comments

Comments
 (0)