Commit cf7eb033 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'extcon-next-for-5.2' of... 

Merge tag 'extcon-next-for-5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into char-misc-next

Chanwoo writes:

Update extcon for v5.2

Detailed description for this pull request:
1. Add new extcon-intel-mrfld.c extcon provider driver
- On Intel Merrifield the Basin Cove PMIC provides a feature to detect
the USB connection type. This driver utilizes the feature in order
to support the USB dual role detection.

2. Update the extcon provider drivers
- For extcon-intel-cht-wc.c, make charger detection co-existed
  with OTG host mode and enable external charger.
- For intel extcon driver, add common header file (extcon-intel.h)
  in order to remove the duplicate definitions.
- For extcon-arizonal.c, disable microphone detection on driver removal.

3.
- Edit comment of extcon_unregister_notifer() to fix a build warning
- Add CONFIG_ACPI dependency to Kconfig to fix a build error for extcon-axp.c

* tag 'extcon-next-for-5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon:
  extcon: arizona: Disable mic detect if running when driver is removed
  extcon: axp288: Add a depends on ACPI to the Kconfig entry
  extcon: mrfld: Introduce extcon driver for Basin Cove PMIC
  extcon: intel: Split out some definitions to a common header
  extcon: Fix build warning for extcon_unregister_notifier comment
  extcon: intel-cht-wc: Enable external charger
  extcon: intel-cht-wc: Make charger detection co-existed with OTG host mode
parents ba2e5440 00053de5

drivers/extcon/Kconfig

+8 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ config EXTCON_ARIZONA 


config EXTCON_AXP288

	tristate "X-Power AXP288 EXTCON support"

	depends on MFD_AXP20X && USB_SUPPORT && X86

	depends on MFD_AXP20X && USB_SUPPORT && X86 && ACPI

	select USB_ROLE_SWITCH

	help

	  Say Y here to enable support for USB peripheral detection
@@ -60,6 +60,13 @@ config EXTCON_INTEL_CHT_WC 
	  Say Y here to enable extcon support for charger detection / control

	  on the Intel Cherrytrail Whiskey Cove PMIC.



config EXTCON_INTEL_MRFLD

	tristate "Intel Merrifield Basin Cove PMIC extcon driver"

	depends on INTEL_SOC_PMIC_MRFLD

	help

	  Say Y here to enable extcon support for charger detection / control

	  on the Intel Merrifield Basin Cove PMIC.



config EXTCON_MAX14577

	tristate "Maxim MAX14577/77836 EXTCON Support"

	depends on MFD_MAX14577

drivers/extcon/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ obj-$(CONFIG_EXTCON_AXP288) += extcon-axp288.o 
obj-$(CONFIG_EXTCON_GPIO)	+= extcon-gpio.o

obj-$(CONFIG_EXTCON_INTEL_INT3496) += extcon-intel-int3496.o

obj-$(CONFIG_EXTCON_INTEL_CHT_WC) += extcon-intel-cht-wc.o

obj-$(CONFIG_EXTCON_INTEL_MRFLD) += extcon-intel-mrfld.o

obj-$(CONFIG_EXTCON_MAX14577)	+= extcon-max14577.o

obj-$(CONFIG_EXTCON_MAX3355)	+= extcon-max3355.o

obj-$(CONFIG_EXTCON_MAX77693)	+= extcon-max77693.o

drivers/extcon/devres.c

+1 −1
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ EXPORT_SYMBOL(devm_extcon_register_notifier); 


/**

 * devm_extcon_unregister_notifier()

			- Resource-managed extcon_unregister_notifier()

 *			- Resource-managed extcon_unregister_notifier()

 * @dev:	the device owning the extcon device being created

 * @edev:	the extcon device

 * @id:		the unique id among the extcon enumeration

drivers/extcon/extcon-arizona.c

+10 −0
Original line number Diff line number Diff line
@@ -1726,6 +1726,16 @@ static int arizona_extcon_remove(struct platform_device *pdev) 
	struct arizona_extcon_info *info = platform_get_drvdata(pdev);

	struct arizona *arizona = info->arizona;

	int jack_irq_rise, jack_irq_fall;

	bool change;



	regmap_update_bits_check(arizona->regmap, ARIZONA_MIC_DETECT_1,

				 ARIZONA_MICD_ENA, 0,

				 &change);



	if (change) {

		regulator_disable(info->micvdd);

		pm_runtime_put(info->dev);

	}



	gpiod_put(info->micd_pol_gpio);

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

+65 −16
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 
#include <linux/regmap.h>

#include <linux/slab.h>



#include "extcon-intel.h"



#define CHT_WC_PHYCTRL			0x5e07



#define CHT_WC_CHGRCTRL0		0x5e16
@@ -30,6 +32,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)
@@ -48,6 +58,13 @@ 
#define CHT_WC_USBSRC_TYPE_OTHER	8

#define CHT_WC_USBSRC_TYPE_DCP_EXTPHY	9



#define CHT_WC_CHGDISCTRL		0x5e2f

#define CHT_WC_CHGDISCTRL_OUT		BIT(0)

/* 0 - open drain, 1 - regular push-pull output */

#define CHT_WC_CHGDISCTRL_DRV		BIT(4)

/* 0 - pin is controlled by SW, 1 - by HW */

#define CHT_WC_CHGDISCTRL_FN		BIT(6)



#define CHT_WC_PWRSRC_IRQ		0x6e03

#define CHT_WC_PWRSRC_IRQ_MASK		0x6e0f

#define CHT_WC_PWRSRC_STS		0x6e1e
@@ -65,15 +82,6 @@ 
#define CHT_WC_VBUS_GPIO_CTLO_DRV_OD	BIT(4)

#define CHT_WC_VBUS_GPIO_CTLO_DIR_OUT	BIT(5)



enum cht_wc_usb_id {

	USB_ID_OTG,

	USB_ID_GND,

	USB_ID_FLOAT,

	USB_RID_A,

	USB_RID_B,

	USB_RID_C,

};



enum cht_wc_mux_select {

	MUX_SEL_PMIC = 0,

	MUX_SEL_SOC,
@@ -101,9 +109,9 @@ static int cht_wc_extcon_get_id(struct cht_wc_extcon_data *ext, int pwrsrc_sts) 
{

	switch ((pwrsrc_sts & CHT_WC_PWRSRC_USBID_MASK) >> CHT_WC_PWRSRC_USBID_SHIFT) {

	case CHT_WC_PWRSRC_RID_GND:

		return USB_ID_GND;

		return INTEL_USB_ID_GND;

	case CHT_WC_PWRSRC_RID_FLOAT:

		return USB_ID_FLOAT;

		return INTEL_USB_ID_FLOAT;

	case CHT_WC_PWRSRC_RID_ACA:

	default:

		/*
@@ -111,7 +119,7 @@ static int cht_wc_extcon_get_id(struct cht_wc_extcon_data *ext, int pwrsrc_sts) 
		 * the USBID GPADC channel here and determine ACA role

		 * based on that.

		 */

		return USB_ID_FLOAT;

		return INTEL_USB_ID_FLOAT;

	}

}
@@ -198,6 +206,30 @@ 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);

}



static void cht_wc_extcon_enable_charging(struct cht_wc_extcon_data *ext,

					  bool enable)

{

	unsigned int val = enable ? 0 : CHT_WC_CHGDISCTRL_OUT;

	int ret;



	ret = regmap_update_bits(ext->regmap, CHT_WC_CHGDISCTRL,

				 CHT_WC_CHGDISCTRL_OUT, val);

	if (ret)

		dev_err(ext->dev, "Error updating CHGDISCTRL 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)
@@ -221,11 +253,17 @@ 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) {

	if (id == INTEL_USB_ID_GND) {

		cht_wc_extcon_enable_charging(ext, false);

		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);

	cht_wc_extcon_enable_charging(ext, true);



	/* 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 */
@@ -248,7 +286,7 @@ set_state: 
		ext->previous_cable = cable;

	}



	ext->usb_host = ((id == USB_ID_GND) || (id == USB_RID_A));

	ext->usb_host = ((id == INTEL_USB_ID_GND) || (id == INTEL_USB_RID_A));

	extcon_set_state_sync(ext->edev, EXTCON_USB_HOST, ext->usb_host);

}
@@ -278,6 +316,14 @@ static int cht_wc_extcon_sw_control(struct cht_wc_extcon_data *ext, bool enable) 
{

	int ret, mask, val;



	val = enable ? 0 : CHT_WC_CHGDISCTRL_FN;

	ret = regmap_update_bits(ext->regmap, CHT_WC_CHGDISCTRL,

				 CHT_WC_CHGDISCTRL_FN, val);

	if (ret)

		dev_err(ext->dev,

			"Error setting sw control for CHGDIS pin: %d\n",

			ret);



	mask = CHT_WC_CHGRCTRL0_SWCONTROL | CHT_WC_CHGRCTRL0_CCSM_OFF;

	val = enable ? mask : 0;

	ret = regmap_update_bits(ext->regmap, CHT_WC_CHGRCTRL0, mask, val);
@@ -329,7 +375,10 @@ static int cht_wc_extcon_probe(struct platform_device *pdev) 
	/* Enable sw control */

	ret = cht_wc_extcon_sw_control(ext, true);

	if (ret)

		return ret;

		goto disable_sw_control;



	/* Disable charging by external battery charger */

	cht_wc_extcon_enable_charging(ext, false);



	/* Register extcon device */

	ret = devm_extcon_dev_register(ext->dev, ext->edev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE