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

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

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

Chanwoo writes:

Update extcon for 4.16

Detailed description for this pull request:
1. Add support to notify USB connector for "ChromeOS Embedded Controller".
- extcon-usbc-cros-ec driver detects the EXTCON_USB and EXTCON_USB_HOST
  connector type and then notify the state/properties to the consumer device.

2. Update the detection on probe time and clean-up code for "X-Power AXP288".
- Detect the state of connector after a couple of seconds after probe()
  becasue extcon-axp288.c driver depends on other device driver like mux.
  In order to guarantee the correct state, the extcon-axp288.c uses the
  delayed_work.
- Set EXTCON_CHG_USB_SDP type as the safe default type if unknown connector
  is attached because the data sheet of axp288 doesn't handle
  the all exception cases.
- Remove unused code

3. Fix the minor issue of extcon driver
- Fix platform get_irq's error checking for extcon-adc-jack.
- Delete unneeded initialization for extcon-max8997/max77693.
parents 337ccce6 ca90a64d

drivers/extcon/extcon-adc-jack.c

+1 −1
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ static int adc_jack_probe(struct platform_device *pdev) 
		return err;



	data->irq = platform_get_irq(pdev, 0);

	if (!data->irq) {

	if (data->irq < 0) {

		dev_err(&pdev->dev, "platform_get_irq failed\n");

		return -ENODEV;

	}

drivers/extcon/extcon-axp288.c

+36 −39
Original line number Diff line number Diff line 
/*

 * extcon-axp288.c - X-Power AXP288 PMIC extcon cable detection driver

 *

 * Copyright (C) 2016-2017 Hans de Goede <hdegoede@redhat.com>

 * Copyright (C) 2015 Intel Corporation

 * Author: Ramakrishna Pallala <ramakrishna.pallala@intel.com>

 *
@@ -24,8 +25,6 @@ 
#include <linux/notifier.h>

#include <linux/extcon-provider.h>

#include <linux/regmap.h>

#include <linux/gpio.h>

#include <linux/gpio/consumer.h>

#include <linux/mfd/axp20x.h>



/* Power source status register */
@@ -79,11 +78,6 @@ enum axp288_extcon_reg { 
	AXP288_BC_DET_STAT_REG		= 0x2f,

};



enum axp288_mux_select {

	EXTCON_GPIO_MUX_SEL_PMIC = 0,

	EXTCON_GPIO_MUX_SEL_SOC,

};



enum axp288_extcon_irq {

	VBUS_FALLING_IRQ = 0,

	VBUS_RISING_IRQ,
@@ -104,11 +98,11 @@ struct axp288_extcon_info { 
	struct device *dev;

	struct regmap *regmap;

	struct regmap_irq_chip_data *regmap_irqc;

	struct gpio_desc *gpio_mux_cntl;

	struct delayed_work det_work;

	int irq[EXTCON_IRQ_END];

	struct extcon_dev *edev;

	struct notifier_block extcon_nb;

	unsigned int previous_cable;

	bool first_detect_done;

};



/* Power up/down reason string array */
@@ -146,6 +140,25 @@ static void axp288_extcon_log_rsi(struct axp288_extcon_info *info) 
	regmap_write(info->regmap, AXP288_PS_BOOT_REASON_REG, clear_mask);

}



static void axp288_chrg_detect_complete(struct axp288_extcon_info *info)

{

	/*

	 * We depend on other drivers to do things like mux the data lines,

	 * enable/disable vbus based on the id-pin, etc. Sometimes the BIOS has

	 * not set these things up correctly resulting in the initial charger

	 * cable type detection giving a wrong result and we end up not charging

	 * or charging at only 0.5A.

	 *

	 * So we schedule a second cable type detection after 2 seconds to

	 * give the other drivers time to load and do their thing.

	 */

	if (!info->first_detect_done) {

		queue_delayed_work(system_wq, &info->det_work,

				   msecs_to_jiffies(2000));

		info->first_detect_done = true;

	}

}



static int axp288_handle_chrg_det_event(struct axp288_extcon_info *info)

{

	int ret, stat, cfg, pwr_stat;
@@ -192,20 +205,11 @@ static int axp288_handle_chrg_det_event(struct axp288_extcon_info *info) 
		cable = EXTCON_CHG_USB_DCP;

		break;

	default:

		dev_warn(info->dev,

			"disconnect or unknown or ID event\n");

		dev_warn(info->dev, "unknown (reserved) bc detect result\n");

		cable = EXTCON_CHG_USB_SDP;

	}



no_vbus:

	/*

	 * If VBUS is absent Connect D+/D- lines to PMIC for BC

	 * detection. Else connect them to SOC for USB communication.

	 */

	if (info->gpio_mux_cntl)

		gpiod_set_value(info->gpio_mux_cntl,

			vbus_attach ? EXTCON_GPIO_MUX_SEL_SOC

					: EXTCON_GPIO_MUX_SEL_PMIC);



	extcon_set_state_sync(info->edev, info->previous_cable, false);

	if (info->previous_cable == EXTCON_CHG_USB_SDP)

		extcon_set_state_sync(info->edev, EXTCON_USB, false);
@@ -219,6 +223,8 @@ no_vbus: 
		info->previous_cable = cable;

	}



	axp288_chrg_detect_complete(info);



	return 0;



dev_det_ret:
@@ -240,8 +246,11 @@ static irqreturn_t axp288_extcon_isr(int irq, void *data) 
	return IRQ_HANDLED;

}



static void axp288_extcon_enable(struct axp288_extcon_info *info)

static void axp288_extcon_det_work(struct work_struct *work)

{

	struct axp288_extcon_info *info =

		container_of(work, struct axp288_extcon_info, det_work.work);



	regmap_update_bits(info->regmap, AXP288_BC_GLOBAL_REG,

						BC_GLOBAL_RUN, 0);

	/* Enable the charger detection logic */
@@ -253,8 +262,7 @@ static int axp288_extcon_probe(struct platform_device *pdev) 
{

	struct axp288_extcon_info *info;

	struct axp20x_dev *axp20x = dev_get_drvdata(pdev->dev.parent);

	struct axp288_extcon_pdata *pdata = pdev->dev.platform_data;

	int ret, i, pirq, gpio;

	int ret, i, pirq;



	info = devm_kzalloc(&pdev->dev, sizeof(*info), GFP_KERNEL);

	if (!info)
@@ -264,8 +272,7 @@ static int axp288_extcon_probe(struct platform_device *pdev) 
	info->regmap = axp20x->regmap;

	info->regmap_irqc = axp20x->regmap_irqc;

	info->previous_cable = EXTCON_NONE;

	if (pdata)

		info->gpio_mux_cntl = pdata->gpio_mux_cntl;

	INIT_DELAYED_WORK(&info->det_work, axp288_extcon_det_work);



	platform_set_drvdata(pdev, info);
@@ -286,21 +293,11 @@ static int axp288_extcon_probe(struct platform_device *pdev) 
		return ret;

	}



	/* Set up gpio control for USB Mux */

	if (info->gpio_mux_cntl) {

		gpio = desc_to_gpio(info->gpio_mux_cntl);

		ret = devm_gpio_request(&pdev->dev, gpio, "USB_MUX");

		if (ret < 0) {

			dev_err(&pdev->dev,

				"failed to request the gpio=%d\n", gpio);

			return ret;

		}

		gpiod_direction_output(info->gpio_mux_cntl,

						EXTCON_GPIO_MUX_SEL_PMIC);

	}



	for (i = 0; i < EXTCON_IRQ_END; i++) {

		pirq = platform_get_irq(pdev, i);

		if (pirq < 0)

			return pirq;



		info->irq[i] = regmap_irq_get_virq(info->regmap_irqc, pirq);

		if (info->irq[i] < 0) {

			dev_err(&pdev->dev,
@@ -321,7 +318,7 @@ static int axp288_extcon_probe(struct platform_device *pdev) 
	}



	/* Start charger cable type detection */

	axp288_extcon_enable(info);

	queue_delayed_work(system_wq, &info->det_work, 0);



	return 0;

}

drivers/extcon/extcon-max77693.c

+1 −1
Original line number Diff line number Diff line
@@ -266,7 +266,7 @@ static int max77693_muic_set_debounce_time(struct max77693_muic_info *info, 
static int max77693_muic_set_path(struct max77693_muic_info *info,

		u8 val, bool attached)

{

	int ret = 0;

	int ret;

	unsigned int ctrl1, ctrl2 = 0;



	if (attached)

drivers/extcon/extcon-max8997.c

+1 −1
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ static int max8997_muic_set_debounce_time(struct max8997_muic_info *info, 
static int max8997_muic_set_path(struct max8997_muic_info *info,

		u8 val, bool attached)

{

	int ret = 0;

	int ret;

	u8 ctrl1, ctrl2 = 0;



	if (attached)

drivers/extcon/extcon-usbc-cros-ec.c

+138 −4
Original line number Diff line number Diff line
@@ -34,16 +34,26 @@ struct cros_ec_extcon_info { 


	struct notifier_block notifier;



	unsigned int dr; /* data role */

	bool pr; /* power role (true if VBUS enabled) */

	bool dp; /* DisplayPort enabled */

	bool mux; /* SuperSpeed (usb3) enabled */

	unsigned int power_type;

};



static const unsigned int usb_type_c_cable[] = {

	EXTCON_USB,

	EXTCON_USB_HOST,

	EXTCON_DISP_DP,

	EXTCON_NONE,

};



enum usb_data_roles {

	DR_NONE,

	DR_HOST,

	DR_DEVICE,

};



/**

 * cros_ec_pd_command() - Send a command to the EC.

 * @info: pointer to struct cros_ec_extcon_info
@@ -150,6 +160,7 @@ static int cros_ec_usb_get_role(struct cros_ec_extcon_info *info, 
	pd_control.port = info->port_id;

	pd_control.role = USB_PD_CTRL_ROLE_NO_CHANGE;

	pd_control.mux = USB_PD_CTRL_MUX_NO_CHANGE;

	pd_control.swap = USB_PD_CTRL_SWAP_NONE;

	ret = cros_ec_pd_command(info, EC_CMD_USB_PD_CONTROL, 1,

				 &pd_control, sizeof(pd_control),

				 &resp, sizeof(resp));
@@ -183,11 +194,72 @@ static int cros_ec_pd_get_num_ports(struct cros_ec_extcon_info *info) 
	return resp.num_ports;

}



static const char *cros_ec_usb_role_string(unsigned int role)

{

	return role == DR_NONE ? "DISCONNECTED" :

		(role == DR_HOST ? "DFP" : "UFP");

}



static const char *cros_ec_usb_power_type_string(unsigned int type)

{

	switch (type) {

	case USB_CHG_TYPE_NONE:

		return "USB_CHG_TYPE_NONE";

	case USB_CHG_TYPE_PD:

		return "USB_CHG_TYPE_PD";

	case USB_CHG_TYPE_PROPRIETARY:

		return "USB_CHG_TYPE_PROPRIETARY";

	case USB_CHG_TYPE_C:

		return "USB_CHG_TYPE_C";

	case USB_CHG_TYPE_BC12_DCP:

		return "USB_CHG_TYPE_BC12_DCP";

	case USB_CHG_TYPE_BC12_CDP:

		return "USB_CHG_TYPE_BC12_CDP";

	case USB_CHG_TYPE_BC12_SDP:

		return "USB_CHG_TYPE_BC12_SDP";

	case USB_CHG_TYPE_OTHER:

		return "USB_CHG_TYPE_OTHER";

	case USB_CHG_TYPE_VBUS:

		return "USB_CHG_TYPE_VBUS";

	case USB_CHG_TYPE_UNKNOWN:

		return "USB_CHG_TYPE_UNKNOWN";

	default:

		return "USB_CHG_TYPE_UNKNOWN";

	}

}



static bool cros_ec_usb_power_type_is_wall_wart(unsigned int type,

						unsigned int role)

{

	switch (type) {

	/* FIXME : Guppy, Donnettes, and other chargers will be miscategorized

	 * because they identify with USB_CHG_TYPE_C, but we can't return true

	 * here from that code because that breaks Suzy-Q and other kinds of

	 * USB Type-C cables and peripherals.

	 */

	case USB_CHG_TYPE_PROPRIETARY:

	case USB_CHG_TYPE_BC12_DCP:

		return true;

	case USB_CHG_TYPE_PD:

	case USB_CHG_TYPE_C:

	case USB_CHG_TYPE_BC12_CDP:

	case USB_CHG_TYPE_BC12_SDP:

	case USB_CHG_TYPE_OTHER:

	case USB_CHG_TYPE_VBUS:

	case USB_CHG_TYPE_UNKNOWN:

	case USB_CHG_TYPE_NONE:

	default:

		return false;

	}

}



static int extcon_cros_ec_detect_cable(struct cros_ec_extcon_info *info,

				       bool force)

{

	struct device *dev = info->dev;

	int role, power_type;

	unsigned int dr = DR_NONE;

	bool pr = false;

	bool polarity = false;

	bool dp = false;

	bool mux = false;
@@ -206,9 +278,12 @@ static int extcon_cros_ec_detect_cable(struct cros_ec_extcon_info *info, 
			dev_err(dev, "failed getting role err = %d\n", role);

			return role;

		}

		dev_dbg(dev, "disconnected\n");

	} else {

		int pd_mux_state;



		dr = (role & PD_CTRL_RESP_ROLE_DATA) ? DR_HOST : DR_DEVICE;

		pr = (role & PD_CTRL_RESP_ROLE_POWER);

		pd_mux_state = cros_ec_usb_get_pd_mux_state(info);

		if (pd_mux_state < 0)

			pd_mux_state = USB_PD_MUX_USB_ENABLED;
@@ -216,20 +291,62 @@ static int extcon_cros_ec_detect_cable(struct cros_ec_extcon_info *info, 
		dp = pd_mux_state & USB_PD_MUX_DP_ENABLED;

		mux = pd_mux_state & USB_PD_MUX_USB_ENABLED;

		hpd = pd_mux_state & USB_PD_MUX_HPD_IRQ;

	}



	if (force || info->dp != dp || info->mux != mux ||

		info->power_type != power_type) {

		dev_dbg(dev,

			"connected role 0x%x pwr type %d dr %d pr %d pol %d mux %d dp %d hpd %d\n",

			role, power_type, dr, pr, polarity, mux, dp, hpd);

	}



	/*

	 * When there is no USB host (e.g. USB PD charger),

	 * we are not really a UFP for the AP.

	 */

	if (dr == DR_DEVICE &&

	    cros_ec_usb_power_type_is_wall_wart(power_type, role))

		dr = DR_NONE;



	if (force || info->dr != dr || info->pr != pr || info->dp != dp ||

	    info->mux != mux || info->power_type != power_type) {

		bool host_connected = false, device_connected = false;



		dev_dbg(dev, "Type/Role switch! type = %s role = %s\n",

			cros_ec_usb_power_type_string(power_type),

			cros_ec_usb_role_string(dr));

		info->dr = dr;

		info->pr = pr;

		info->dp = dp;

		info->mux = mux;

		info->power_type = power_type;



		extcon_set_state(info->edev, EXTCON_DISP_DP, dp);

		if (dr == DR_DEVICE)

			device_connected = true;

		else if (dr == DR_HOST)

			host_connected = true;



		extcon_set_state(info->edev, EXTCON_USB, device_connected);

		extcon_set_state(info->edev, EXTCON_USB_HOST, host_connected);

		extcon_set_state(info->edev, EXTCON_DISP_DP, dp);

		extcon_set_property(info->edev, EXTCON_USB,

				    EXTCON_PROP_USB_VBUS,

				    (union extcon_property_value)(int)pr);

		extcon_set_property(info->edev, EXTCON_USB_HOST,

				    EXTCON_PROP_USB_VBUS,

				    (union extcon_property_value)(int)pr);

		extcon_set_property(info->edev, EXTCON_USB,

				    EXTCON_PROP_USB_TYPEC_POLARITY,

				    (union extcon_property_value)(int)polarity);

		extcon_set_property(info->edev, EXTCON_USB_HOST,

				    EXTCON_PROP_USB_TYPEC_POLARITY,

				    (union extcon_property_value)(int)polarity);

		extcon_set_property(info->edev, EXTCON_DISP_DP,

				    EXTCON_PROP_USB_TYPEC_POLARITY,

				    (union extcon_property_value)(int)polarity);

		extcon_set_property(info->edev, EXTCON_USB,

				    EXTCON_PROP_USB_SS,

				    (union extcon_property_value)(int)mux);

		extcon_set_property(info->edev, EXTCON_USB_HOST,

				    EXTCON_PROP_USB_SS,

				    (union extcon_property_value)(int)mux);

		extcon_set_property(info->edev, EXTCON_DISP_DP,

				    EXTCON_PROP_USB_SS,

				    (union extcon_property_value)(int)mux);
@@ -237,6 +354,8 @@ static int extcon_cros_ec_detect_cable(struct cros_ec_extcon_info *info, 
				    EXTCON_PROP_DISP_HPD,

				    (union extcon_property_value)(int)hpd);



		extcon_sync(info->edev, EXTCON_USB);

		extcon_sync(info->edev, EXTCON_USB_HOST);

		extcon_sync(info->edev, EXTCON_DISP_DP);



	} else if (hpd) {
@@ -322,13 +441,28 @@ static int extcon_cros_ec_probe(struct platform_device *pdev) 
		return ret;

	}



	extcon_set_property_capability(info->edev, EXTCON_USB,

				       EXTCON_PROP_USB_VBUS);

	extcon_set_property_capability(info->edev, EXTCON_USB_HOST,

				       EXTCON_PROP_USB_VBUS);

	extcon_set_property_capability(info->edev, EXTCON_USB,

				       EXTCON_PROP_USB_TYPEC_POLARITY);

	extcon_set_property_capability(info->edev, EXTCON_USB_HOST,

				       EXTCON_PROP_USB_TYPEC_POLARITY);

	extcon_set_property_capability(info->edev, EXTCON_DISP_DP,

				       EXTCON_PROP_USB_TYPEC_POLARITY);

	extcon_set_property_capability(info->edev, EXTCON_USB,

				       EXTCON_PROP_USB_SS);

	extcon_set_property_capability(info->edev, EXTCON_USB_HOST,

				       EXTCON_PROP_USB_SS);

	extcon_set_property_capability(info->edev, EXTCON_DISP_DP,

				       EXTCON_PROP_USB_SS);

	extcon_set_property_capability(info->edev, EXTCON_DISP_DP,

				       EXTCON_PROP_DISP_HPD);



	info->dr = DR_NONE;

	info->pr = false;



	platform_set_drvdata(pdev, info);



	/* Get PD events from the EC */

CRA Git | Maintained and supported by SUSTech CRA and CCSE