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

Commit 4c883abe authored by Jaewon Kim's avatar Jaewon Kim Committed by Chanwoo Choi
Browse files

extcon: max77693: Use HOST term to express USB-HOST cable instead of OTG term 



This patch unifies the term called 'USB_OTG' and 'USB_HOST'
into USB_HOST. OTG(On-The-Go) function supports USB host and
this driver sents 'USB-Host event. So, unifies term to USB_HOST.

Signed-off-by: default avatarJaewon Kim <jaewon02.kim@samsung.com>
[cw00.choi: Fix patch title to indicate the correct meaning of patch]
Signed-off-by: default avatarChanwoo Choi <cw00.choi@samsung.com>
parent 4f0be26a

drivers/extcon/extcon-max77693.c

+10 −10
Original line number Diff line number Diff line
@@ -190,8 +190,8 @@ enum max77693_muic_acc_type { 
	/* The below accessories have same ADC value so ADCLow and

	   ADC1K bit is used to separate specific accessory */

						/* ADC|VBVolot|ADCLow|ADC1K| */

	MAX77693_MUIC_GND_USB_OTG = 0x100,	/* 0x0|      0|     0|    0| */

	MAX77693_MUIC_GND_USB_OTG_VB = 0x104,	/* 0x0|      1|     0|    0| */

	MAX77693_MUIC_GND_USB_HOST = 0x100,	/* 0x0|      0|     0|    0| */

	MAX77693_MUIC_GND_USB_HOST_VB = 0x104,	/* 0x0|      1|     0|    0| */

	MAX77693_MUIC_GND_AV_CABLE_LOAD = 0x102,/* 0x0|      0|     1|    0| */

	MAX77693_MUIC_GND_MHL = 0x103,		/* 0x0|      0|     1|    1| */

	MAX77693_MUIC_GND_MHL_VB = 0x107,	/* 0x0|      1|     1|    1| */
@@ -403,8 +403,8 @@ static int max77693_muic_get_cable_type(struct max77693_muic_info *info, 


			/**

			 * [0x1|VBVolt|ADCLow|ADC1K]

			 * [0x1|     0|     0|    0] USB_OTG

			 * [0x1|     1|     0|    0] USB_OTG_VB

			 * [0x1|     0|     0|    0] USB_HOST

			 * [0x1|     1|     0|    0] USB_HSOT_VB

			 * [0x1|     0|     1|    0] Audio Video cable with load

			 * [0x1|     0|     1|    1] MHL without charging cable

			 * [0x1|     1|     1|    1] MHL with charging cable
@@ -523,7 +523,7 @@ static int max77693_muic_dock_handler(struct max77693_muic_info *info, 
		 * - Support charging and data connection through micro-usb port

		 *           if USB cable is connected between target and host

		 *	     device.

		 * - Support OTG device (Mouse/Keyboard)

		 * - Support OTG(On-The-Go) device (Ex: Mouse/Keyboard)

		 */

		ret = max77693_muic_set_path(info, info->path_usb, attached);

		if (ret < 0)
@@ -609,9 +609,9 @@ static int max77693_muic_adc_ground_handler(struct max77693_muic_info *info) 
				MAX77693_CABLE_GROUP_ADC_GND, &attached);



	switch (cable_type_gnd) {

	case MAX77693_MUIC_GND_USB_OTG:

	case MAX77693_MUIC_GND_USB_OTG_VB:

		/* USB_OTG, PATH: AP_USB */

	case MAX77693_MUIC_GND_USB_HOST:

	case MAX77693_MUIC_GND_USB_HOST_VB:

		/* USB_HOST, PATH: AP_USB */

		ret = max77693_muic_set_path(info, CONTROL1_SW_USB, attached);

		if (ret < 0)

			return ret;
@@ -704,7 +704,7 @@ static int max77693_muic_adc_handler(struct max77693_muic_info *info) 


	switch (cable_type) {

	case MAX77693_MUIC_ADC_GROUND:

		/* USB_OTG/MHL/Audio */

		/* USB_HOST/MHL/Audio */

		max77693_muic_adc_ground_handler(info);

		break;

	case MAX77693_MUIC_ADC_FACTORY_MODE_USB_OFF:
@@ -886,7 +886,7 @@ static int max77693_muic_chg_handler(struct max77693_muic_info *info) 
			 * - Support charging and data connection through micro-

			 *   usb port if USB cable is connected between target

			 *   and host device

			 * - Support OTG device (Mouse/Keyboard)

			 * - Support OTG(On-The-Go) device (Ex: Mouse/Keyboard)

			 */

			ret = max77693_muic_set_path(info, info->path_usb,

						    attached);