Commit 3137301b authored by Yauhen Kharuzhy's avatar Yauhen Kharuzhy Committed by Chanwoo Choi
Browse files

extcon: intel-cht-wc: Make charger detection co-existed with OTG host mode 



Whiskey Cove Cherry Trail PMIC requires disabling OTG host mode before
of charger detection procedure. Do this by manipulationg of CHGRCTRL1
register.

Source: APCI DSDT code of Lenovo Yoga Book YB1-X91L and open-sourced
Intel's drivers.

Signed-off-by: default avatarYauhen Kharuzhy <jekhor@gmail.com>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: default avatarHans de Goede <hdegoede@redhat.com>
Tested-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarChanwoo Choi <cw00.choi@samsung.com>
parent 86baf800

drivers/extcon/extcon-intel-cht-wc.c

+25 −1
Original line number Diff line number Diff line
@@ -30,6 +30,14 @@ 
#define CHT_WC_CHGRCTRL0_CHR_WDT_NOKICK	BIT(7)



#define CHT_WC_CHGRCTRL1			0x5e17

#define CHT_WC_CHGRCTRL1_FUSB_INLMT_100		BIT(0)

#define CHT_WC_CHGRCTRL1_FUSB_INLMT_150		BIT(1)

#define CHT_WC_CHGRCTRL1_FUSB_INLMT_500		BIT(2)

#define CHT_WC_CHGRCTRL1_FUSB_INLMT_900		BIT(3)

#define CHT_WC_CHGRCTRL1_FUSB_INLMT_1500	BIT(4)

#define CHT_WC_CHGRCTRL1_FTEMP_EVENT		BIT(5)

#define CHT_WC_CHGRCTRL1_OTGMODE		BIT(6)

#define CHT_WC_CHGRCTRL1_DBPEN			BIT(7)



#define CHT_WC_USBSRC			0x5e29

#define CHT_WC_USBSRC_STS_MASK		GENMASK(1, 0)
@@ -198,6 +206,18 @@ static void cht_wc_extcon_set_5v_boost(struct cht_wc_extcon_data *ext, 
		dev_err(ext->dev, "Error writing Vbus GPIO CTLO: %d\n", ret);

}



static void cht_wc_extcon_set_otgmode(struct cht_wc_extcon_data *ext,

				      bool enable)

{

	unsigned int val = enable ? CHT_WC_CHGRCTRL1_OTGMODE : 0;

	int ret;



	ret = regmap_update_bits(ext->regmap, CHT_WC_CHGRCTRL1,

				 CHT_WC_CHGRCTRL1_OTGMODE, val);

	if (ret)

		dev_err(ext->dev, "Error updating CHGRCTRL1 reg: %d\n", ret);

}



/* Small helper to sync EXTCON_CHG_USB_SDP and EXTCON_USB state */

static void cht_wc_extcon_set_state(struct cht_wc_extcon_data *ext,

				    unsigned int cable, bool state)
@@ -222,10 +242,14 @@ static void cht_wc_extcon_pwrsrc_event(struct cht_wc_extcon_data *ext) 


	id = cht_wc_extcon_get_id(ext, pwrsrc_sts);

	if (id == USB_ID_GND) {

		cht_wc_extcon_set_otgmode(ext, true);



		/* The 5v boost causes a false VBUS / SDP detect, skip */

		goto charger_det_done;

	}



	cht_wc_extcon_set_otgmode(ext, false);



	/* Plugged into a host/charger or not connected? */

	if (!(pwrsrc_sts & CHT_WC_PWRSRC_VBUS)) {

		/* Route D+ and D- to PMIC for future charger detection */

CRA Git | Maintained and supported by SUSTech CRA and CCSE