Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 11eecf91 authored by Chanwoo Choi's avatar Chanwoo Choi
Browse files

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 85efc8a1 ("power_supply: Add types for USB chargers")

Signed-off-by: default avatarChanwoo Choi <cw00.choi@samsung.com>
[ckeepax: For the Arizona changes]
Acked-by: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Reviewed-by: default avatarRoger Quadros <rogerq@ti.com>
parent de992acb

drivers/extcon/extcon-arizona.c

+9 −9
Original line number Diff line number Diff line
@@ -137,9 +137,9 @@ static const int arizona_micd_levels[] = { 


static const unsigned int arizona_cable[] = {

	EXTCON_MECHANICAL,

	EXTCON_MICROPHONE,

	EXTCON_HEADPHONE,

	EXTCON_LINE_OUT,

	EXTCON_JACK_MICROPHONE,

	EXTCON_JACK_HEADPHONE,

	EXTCON_JACK_LINE_OUT,

	EXTCON_NONE,

};
@@ -600,7 +600,7 @@ static irqreturn_t arizona_hpdet_irq(int irq, void *data) 
	struct arizona_extcon_info *info = data;

	struct arizona *arizona = info->arizona;

	int id_gpio = arizona->pdata.hpdet_id_gpio;

	unsigned int report = EXTCON_HEADPHONE;

	unsigned int report = EXTCON_JACK_HEADPHONE;

	int ret, reading;

	bool mic = false;
@@ -645,9 +645,9 @@ static irqreturn_t arizona_hpdet_irq(int irq, void *data) 


	/* Report high impedence cables as line outputs */

	if (reading >= 5000)

		report = EXTCON_LINE_OUT;

		report = EXTCON_JACK_LINE_OUT;

	else

		report = EXTCON_HEADPHONE;

		report = EXTCON_JACK_HEADPHONE;



	ret = extcon_set_cable_state_(info->edev, report, true);

	if (ret != 0)
@@ -732,7 +732,7 @@ static void arizona_identify_headphone(struct arizona_extcon_info *info) 
			   ARIZONA_ACCDET_MODE_MASK, ARIZONA_ACCDET_MODE_MIC);



	/* Just report headphone */

	ret = extcon_set_cable_state_(info->edev, EXTCON_HEADPHONE, true);

	ret = extcon_set_cable_state_(info->edev, EXTCON_JACK_HEADPHONE, true);

	if (ret != 0)

		dev_err(arizona->dev, "Failed to report headphone: %d\n", ret);
@@ -789,7 +789,7 @@ static void arizona_start_hpdet_acc_id(struct arizona_extcon_info *info) 
			   ARIZONA_ACCDET_MODE_MASK, ARIZONA_ACCDET_MODE_MIC);



	/* Just report headphone */

	ret = extcon_set_cable_state_(info->edev, EXTCON_HEADPHONE, true);

	ret = extcon_set_cable_state_(info->edev, EXTCON_JACK_HEADPHONE, true);

	if (ret != 0)

		dev_err(arizona->dev, "Failed to report headphone: %d\n", ret);
@@ -915,7 +915,7 @@ static void arizona_micd_detect(struct work_struct *work) 
		arizona_identify_headphone(info);



		ret = extcon_set_cable_state_(info->edev,

					      EXTCON_MICROPHONE, true);

					      EXTCON_JACK_MICROPHONE, true);

		if (ret != 0)

			dev_err(arizona->dev, "Headset report failed: %d\n",

				ret);

drivers/extcon/extcon-axp288.c

+6 −6
Original line number Diff line number Diff line
@@ -102,9 +102,9 @@ enum axp288_extcon_irq { 
};



static const unsigned int axp288_extcon_cables[] = {

	EXTCON_SLOW_CHARGER,

	EXTCON_CHARGE_DOWNSTREAM,

	EXTCON_FAST_CHARGER,

	EXTCON_CHG_USB_SDP,

	EXTCON_CHG_USB_CDP,

	EXTCON_CHG_USB_DCP,

	EXTCON_NONE,

};
@@ -192,18 +192,18 @@ static int axp288_handle_chrg_det_event(struct axp288_extcon_info *info) 
		dev_dbg(info->dev, "sdp cable is connecetd\n");

		notify_otg = true;

		notify_charger = true;

		cable = EXTCON_SLOW_CHARGER;

		cable = EXTCON_CHG_USB_SDP;

		break;

	case DET_STAT_CDP:

		dev_dbg(info->dev, "cdp cable is connecetd\n");

		notify_otg = true;

		notify_charger = true;

		cable = EXTCON_CHARGE_DOWNSTREAM;

		cable = EXTCON_CHG_USB_CDP;

		break;

	case DET_STAT_DCP:

		dev_dbg(info->dev, "dcp cable is connecetd\n");

		notify_charger = true;

		cable = EXTCON_FAST_CHARGER;

		cable = EXTCON_CHG_USB_DCP;

		break;

	default:

		dev_warn(info->dev,

drivers/extcon/extcon-max14577.c

+9 −8
Original line number Diff line number Diff line
@@ -150,10 +150,10 @@ enum max14577_muic_acc_type { 


static const unsigned int max14577_extcon_cable[] = {

	EXTCON_USB,

	EXTCON_TA,

	EXTCON_FAST_CHARGER,

	EXTCON_SLOW_CHARGER,

	EXTCON_CHARGE_DOWNSTREAM,

	EXTCON_CHG_USB_DCP,

	EXTCON_CHG_USB_FAST,

	EXTCON_CHG_USB_SLOW,

	EXTCON_CHG_USB_CDP,

	EXTCON_JIG,

	EXTCON_NONE,

};
@@ -456,18 +456,19 @@ static int max14577_muic_chg_handler(struct max14577_muic_info *info) 
		extcon_set_cable_state_(info->edev, EXTCON_USB, attached);

		break;

	case MAX14577_CHARGER_TYPE_DEDICATED_CHG:

		extcon_set_cable_state_(info->edev, EXTCON_TA, attached);

		extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_DCP,

					attached);

		break;

	case MAX14577_CHARGER_TYPE_DOWNSTREAM_PORT:

		extcon_set_cable_state_(info->edev, EXTCON_CHARGE_DOWNSTREAM,

		extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_CDP,

					attached);

		break;

	case MAX14577_CHARGER_TYPE_SPECIAL_500MA:

		extcon_set_cable_state_(info->edev, EXTCON_SLOW_CHARGER,

		extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_SLOW,

					attached);

		break;

	case MAX14577_CHARGER_TYPE_SPECIAL_1A:

		extcon_set_cable_state_(info->edev, EXTCON_FAST_CHARGER,

		extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_FAST,

					attached);

		break;

	case MAX14577_CHARGER_TYPE_NONE:

drivers/extcon/extcon-max77693.c

+17 −15
Original line number Diff line number Diff line
@@ -204,11 +204,11 @@ enum max77693_muic_acc_type { 
static const unsigned int max77693_extcon_cable[] = {

	EXTCON_USB,

	EXTCON_USB_HOST,

	EXTCON_TA,

	EXTCON_FAST_CHARGER,

	EXTCON_SLOW_CHARGER,

	EXTCON_CHARGE_DOWNSTREAM,

	EXTCON_MHL,

	EXTCON_CHG_USB_DCP,

	EXTCON_CHG_USB_FAST,

	EXTCON_CHG_USB_SLOW,

	EXTCON_CHG_USB_CDP,

	EXTCON_DISP_MHL,

	EXTCON_JIG,

	EXTCON_DOCK,

	EXTCON_NONE,
@@ -505,7 +505,7 @@ static int max77693_muic_dock_handler(struct max77693_muic_info *info, 
			return ret;



		extcon_set_cable_state_(info->edev, EXTCON_DOCK, attached);

		extcon_set_cable_state_(info->edev, EXTCON_MHL, attached);

		extcon_set_cable_state_(info->edev, EXTCON_DISP_MHL, attached);

		goto out;

	case MAX77693_MUIC_ADC_AUDIO_MODE_REMOTE:	/* Dock-Desk */

		dock_id = EXTCON_DOCK;
@@ -605,7 +605,7 @@ static int max77693_muic_adc_ground_handler(struct max77693_muic_info *info) 
	case MAX77693_MUIC_GND_MHL:

	case MAX77693_MUIC_GND_MHL_VB:

		/* MHL or MHL with USB/TA cable */

		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 cable of gnd type\n",
@@ -801,10 +801,11 @@ static int max77693_muic_chg_handler(struct max77693_muic_info *info) 
			 * - Support charging through micro-usb port without

			 *   data connection

			 */

			extcon_set_cable_state_(info->edev, EXTCON_TA, attached);

			extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_DCP,

						attached);

			if (!cable_attached)

				extcon_set_cable_state_(info->edev, EXTCON_MHL,

							cable_attached);

				extcon_set_cable_state_(info->edev,

					EXTCON_DISP_MHL, cable_attached);

			break;

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


			extcon_set_cable_state_(info->edev, EXTCON_DOCK,

						attached);

			extcon_set_cable_state_(info->edev, EXTCON_MHL,

			extcon_set_cable_state_(info->edev, EXTCON_DISP_MHL,

						attached);

			break;

		}
@@ -901,20 +902,21 @@ static int max77693_muic_chg_handler(struct max77693_muic_info *info) 
			break;

		case MAX77693_CHARGER_TYPE_DEDICATED_CHG:

			/* Only TA cable */

			extcon_set_cable_state_(info->edev, EXTCON_TA, attached);

			extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_DCP,

						attached);

			break;

		}

		break;

	case MAX77693_CHARGER_TYPE_DOWNSTREAM_PORT:

		extcon_set_cable_state_(info->edev, EXTCON_CHARGE_DOWNSTREAM,

		extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_CDP,

					attached);

		break;

	case MAX77693_CHARGER_TYPE_APPLE_500MA:

		extcon_set_cable_state_(info->edev, EXTCON_SLOW_CHARGER,

		extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_SLOW,

					attached);

		break;

	case MAX77693_CHARGER_TYPE_APPLE_1A_2A:

		extcon_set_cable_state_(info->edev, EXTCON_FAST_CHARGER,

		extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_FAST,

					attached);

		break;

	case MAX77693_CHARGER_TYPE_DEAD_BATTERY:

drivers/extcon/extcon-max77843.c

+15 −12
Original line number Diff line number Diff line
@@ -122,11 +122,11 @@ enum max77843_muic_charger_type { 
static const unsigned int max77843_extcon_cable[] = {

	EXTCON_USB,

	EXTCON_USB_HOST,

	EXTCON_TA,

	EXTCON_CHARGE_DOWNSTREAM,

	EXTCON_FAST_CHARGER,

	EXTCON_SLOW_CHARGER,

	EXTCON_MHL,

	EXTCON_CHG_USB_DCP,

	EXTCON_CHG_USB_CDP,

	EXTCON_CHG_USB_FAST,

	EXTCON_CHG_USB_SLOW,

	EXTCON_DISP_MHL,

	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;



		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",
@@ -494,7 +494,7 @@ static int max77843_muic_chg_handler(struct max77843_muic_info *info) 
		if (ret < 0)

			return ret;



		extcon_set_cable_state_(info->edev, EXTCON_CHARGE_DOWNSTREAM,

		extcon_set_cable_state_(info->edev, EXTCON_CHG_USB_CDP,

					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;



		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,
@@ -513,7 +514,7 @@ static int max77843_muic_chg_handler(struct max77843_muic_info *info) 
		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:
@@ -523,7 +524,7 @@ static int max77843_muic_chg_handler(struct max77843_muic_info *info) 
		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:
@@ -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)

			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)

			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;