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

Commit 942e0239 authored by Chanwoo Choi's avatar Chanwoo Choi
Browse files

extcon: Alter MHL-TA cable name to TA cable name 



This patch alters the MHL-TA cable name to TA cable name because MHL-TA is not
standard name. The MHL-TA is MHL cable with charger cable (TA or USB). So, this
patch use the TA cable instead of MHL-TA to inform the charger cable state.
- MHL-TA -> TA

Signed-off-by: default avatarChanwoo Choi <cw00.choi@samsung.com>
Reviewed-by: default avatarKrzysztof Kozlowski <k.kozlowski@samsung.com>
parent d519c423

drivers/extcon/extcon-max77693.c

+5 −7
Original line number Original line Diff line number Diff line
@@ -208,7 +208,6 @@ enum { 
	EXTCON_CABLE_SLOW_CHARGER,

	EXTCON_CABLE_SLOW_CHARGER,

	EXTCON_CABLE_CHARGE_DOWNSTREAM,

	EXTCON_CABLE_CHARGE_DOWNSTREAM,

	EXTCON_CABLE_MHL,

	EXTCON_CABLE_MHL,

	EXTCON_CABLE_MHL_TA,

	EXTCON_CABLE_JIG,

	EXTCON_CABLE_JIG,

	EXTCON_CABLE_DOCK,

	EXTCON_CABLE_DOCK,
@@ -223,7 +222,6 @@ static const char *max77693_extcon_cable[] = { 
	[EXTCON_CABLE_SLOW_CHARGER]		= "Slow-charger",

	[EXTCON_CABLE_SLOW_CHARGER]		= "Slow-charger",

	[EXTCON_CABLE_CHARGE_DOWNSTREAM]	= "Charge-downstream",

	[EXTCON_CABLE_CHARGE_DOWNSTREAM]	= "Charge-downstream",

	[EXTCON_CABLE_MHL]			= "MHL",

	[EXTCON_CABLE_MHL]			= "MHL",

	[EXTCON_CABLE_MHL_TA]			= "MHL-TA",

	[EXTCON_CABLE_JIG]			= "JIG",

	[EXTCON_CABLE_JIG]			= "JIG",

	[EXTCON_CABLE_DOCK]			= "DOCK",

	[EXTCON_CABLE_DOCK]			= "DOCK",
@@ -802,19 +800,19 @@ static int max77693_muic_chg_handler(struct max77693_muic_info *info) 
		case MAX77693_MUIC_GND_MHL:

		case MAX77693_MUIC_GND_MHL:

		case MAX77693_MUIC_GND_MHL_VB:

		case MAX77693_MUIC_GND_MHL_VB:

			/*

			/*

			 * MHL cable with MHL-TA(USB/TA) cable

			 * MHL cable with USB/TA cable

			 * - MHL cable include two port(HDMI line and separate

			 * - MHL cable include two port(HDMI line and separate

			 * micro-usb port. When the target connect MHL cable,

			 * micro-usb port. When the target connect MHL cable,

			 * extcon driver check whether MHL-TA(USB/TA) cable is

			 * extcon driver check whether USB/TA cable is

			 * connected. If MHL-TA cable is connected, extcon

			 * connected. If USB/TA cable is connected, extcon

			 * driver notify state to notifiee for charging battery.

			 * driver notify state to notifiee for charging battery.

			 *

			 *

			 * Features of 'MHL-TA(USB/TA) with MHL cable'

			 * Features of 'USB/TA with MHL cable'

			 * - Support MHL

			 * - Support MHL

			 * - Support charging through micro-usb port without

			 * - Support charging through micro-usb port without

			 *   data connection

			 *   data connection

			 */

			 */

			extcon_set_cable_state(info->edev, "MHL-TA", attached);

			extcon_set_cable_state(info->edev, "TA", attached);

			if (!cable_attached)

			if (!cable_attached)

				extcon_set_cable_state(info->edev,

				extcon_set_cable_state(info->edev,

						      "MHL", cable_attached);

						      "MHL", cable_attached);

drivers/extcon/extcon-max77843.c

+2 −4
Original line number Original line Diff line number Diff line
@@ -126,7 +126,6 @@ enum { 
	MAX77843_CABLE_FAST_CHARGER,

	MAX77843_CABLE_FAST_CHARGER,

	MAX77843_CABLE_SLOW_CHARGER,

	MAX77843_CABLE_SLOW_CHARGER,

	MAX77843_CABLE_MHL,

	MAX77843_CABLE_MHL,

	MAX77843_CABLE_MHL_TA,

	MAX77843_CABLE_JIG,

	MAX77843_CABLE_JIG,





	MAX77843_CABLE_NUM,

	MAX77843_CABLE_NUM,
@@ -140,7 +139,6 @@ static const char *max77843_extcon_cable[] = { 
	[MAX77843_CABLE_FAST_CHARGER]		= "FAST-CHARGER",

	[MAX77843_CABLE_FAST_CHARGER]		= "FAST-CHARGER",

	[MAX77843_CABLE_SLOW_CHARGER]		= "SLOW-CHARGER",

	[MAX77843_CABLE_SLOW_CHARGER]		= "SLOW-CHARGER",

	[MAX77843_CABLE_MHL]			= "MHL",

	[MAX77843_CABLE_MHL]			= "MHL",

	[MAX77843_CABLE_MHL_TA]			= "MHL-TA",

	[MAX77843_CABLE_JIG]			= "JIG",

	[MAX77843_CABLE_JIG]			= "JIG",

};

};
@@ -529,9 +527,9 @@ static int max77843_muic_chg_handler(struct max77843_muic_info *info) 




		/* Charger cable on MHL accessory is attach or detach */

		/* Charger cable on MHL accessory is attach or detach */

		if (gnd_type == MAX77843_MUIC_GND_MHL_VB)

		if (gnd_type == MAX77843_MUIC_GND_MHL_VB)

			extcon_set_cable_state(info->edev, "MHL-TA", true);

			extcon_set_cable_state(info->edev, "TA", true);

		else if (gnd_type == MAX77843_MUIC_GND_MHL)

		else if (gnd_type == MAX77843_MUIC_GND_MHL)

			extcon_set_cable_state(info->edev, "MHL-TA", false);

			extcon_set_cable_state(info->edev, "TA", false);

		break;

		break;

	case MAX77843_MUIC_CHG_NONE:

	case MAX77843_MUIC_CHG_NONE:

		break;

		break;