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

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

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

Chanwoo writes:

Update extcon for 4.17

Detailed description for this pull request:
1. Add exported extcon function in order to support OF graph binding
- The extcon consumer driver used the "extcon = <&extcon's phandle"
  property in device-tree in order to bind between extcon provider
  and consumer driver. But, OF graph method is better than 'extcon' property.
  So, extcon subsystem adds the following function to support OF graph binding.
  : extcon_find_edev_by_node(struct device_node *node)

- Create the immutable branch ("ib-extcon-drm-dt-v4.17") for both drm-misc
  and device-tree subsystem. This immutable branch contains the use-case of
  OF graph binding for EXTCON_HDMI connector between MHL device driver
  and extcon provider driver.

2. Fix minor issues of extcon device drivers
- Remove platform_data and covert to fully use GPIO descriptor for extcon-gpio.c
- Remove workaround code for id pin direction from extcon-inte-int3496.c
  because GPIO ACPI library does support it with generic way.
- Set direction and drv flags for V5 boost GPIO because of fixing
  the firmware bug.
parents 6f005302 eb7768e7

Documentation/devicetree/bindings/connector/samsung,usb-connector-11pin.txt

0 → 100644
+49 −0
Original line number Diff line number Diff line 
Samsung micro-USB 11-pin connector

==================================



Samsung micro-USB 11-pin connector is an extension of micro-USB connector.

It is present in multiple Samsung mobile devices.

It has additional pins to route MHL traffic simultanously with USB.



The bindings are superset of usb-connector bindings for micro-USB connector[1].



Required properties:

- compatible: must be: "samsung,usb-connector-11pin", "usb-b-connector",

- type: must be "micro".



Required nodes:

- any data bus to the connector should be modeled using the OF graph bindings

  specified in bindings/graph.txt, unless the bus is between parent node and

  the connector. Since single connector can have multpile data buses every bus

  has assigned OF graph port number as follows:

    0: High Speed (HS),

    3: Mobile High-Definition Link (MHL), specific to 11-pin Samsung micro-USB.



[1]: bindings/connector/usb-connector.txt



Example

-------



Micro-USB connector with HS lines routed via controller (MUIC) and MHL lines

connected to HDMI-MHL bridge (sii8620):



muic-max77843@66 {

	...

	usb_con: connector {

		compatible = "samsung,usb-connector-11pin", "usb-b-connector";

		label = "micro-USB";

		type = "micro";



		ports {

			#address-cells = <1>;

			#size-cells = <0>;



			port@3 {

				reg = <3>;

				usb_con_mhl: endpoint {

					remote-endpoint = <&sii8620_mhl>;

				};

			};

		};

	};

};

Documentation/devicetree/bindings/connector/usb-connector.txt

0 → 100644
+75 −0
Original line number Diff line number Diff line 
USB Connector

=============



USB connector node represents physical USB connector. It should be

a child of USB interface controller.



Required properties:

- compatible: describes type of the connector, must be one of:

    "usb-a-connector",

    "usb-b-connector",

    "usb-c-connector".



Optional properties:

- label: symbolic name for the connector,

- type: size of the connector, should be specified in case of USB-A, USB-B

  non-fullsize connectors: "mini", "micro".



Required nodes:

- any data bus to the connector should be modeled using the OF graph bindings

  specified in bindings/graph.txt, unless the bus is between parent node and

  the connector. Since single connector can have multpile data buses every bus

  has assigned OF graph port number as follows:

    0: High Speed (HS), present in all connectors,

    1: Super Speed (SS), present in SS capable connectors,

    2: Sideband use (SBU), present in USB-C.



Examples

--------



1. Micro-USB connector with HS lines routed via controller (MUIC):



muic-max77843@66 {

	...

	usb_con: connector {

		compatible = "usb-b-connector";

		label = "micro-USB";

		type = "micro";

	};

};



2. USB-C connector attached to CC controller (s2mm005), HS lines routed

to companion PMIC (max77865), SS lines to USB3 PHY and SBU to DisplayPort.

DisplayPort video lines are routed to the connector via SS mux in USB3 PHY.



ccic: s2mm005@33 {

	...

	usb_con: connector {

		compatible = "usb-c-connector";

		label = "USB-C";



		ports {

			#address-cells = <1>;

			#size-cells = <0>;



			port@0 {

				reg = <0>;

				usb_con_hs: endpoint {

					remote-endpoint = <&max77865_usbc_hs>;

				};

			};

			port@1 {

				reg = <1>;

				usb_con_ss: endpoint {

					remote-endpoint = <&usbdrd_phy_ss>;

				};

			};

			port@2 {

				reg = <2>;

				usb_con_sbu: endpoint {

					remote-endpoint = <&dp_aux>;

				};

			};

		};

	};

};

drivers/extcon/extcon-gpio.c

+45 −58
Original line number Diff line number Diff line
@@ -18,8 +18,6 @@ 
 */



#include <linux/extcon-provider.h>

#include <linux/extcon/extcon-gpio.h>

#include <linux/gpio.h>

#include <linux/gpio/consumer.h>

#include <linux/init.h>

#include <linux/interrupt.h>
@@ -29,14 +27,30 @@ 
#include <linux/slab.h>

#include <linux/workqueue.h>



/**

 * struct gpio_extcon_data - A simple GPIO-controlled extcon device state container.

 * @edev:		Extcon device.

 * @irq:		Interrupt line for the external connector.

 * @work:		Work fired by the interrupt.

 * @debounce_jiffies:	Number of jiffies to wait for the GPIO to stabilize, from the debounce

 *			value.

 * @gpiod:		GPIO descriptor for this external connector.

 * @extcon_id:		The unique id of specific external connector.

 * @debounce:		Debounce time for GPIO IRQ in ms.

 * @irq_flags:		IRQ Flags (e.g., IRQF_TRIGGER_LOW).

 * @check_on_resume:	Boolean describing whether to check the state of gpio

 *			while resuming from sleep.

 */

struct gpio_extcon_data {

	struct extcon_dev *edev;

	int irq;

	struct delayed_work work;

	unsigned long debounce_jiffies;



	struct gpio_desc *id_gpiod;

	struct gpio_extcon_pdata *pdata;

	struct gpio_desc *gpiod;

	unsigned int extcon_id;

	unsigned long debounce;

	unsigned long irq_flags;

	bool check_on_resume;

};



static void gpio_extcon_work(struct work_struct *work)
@@ -46,11 +60,8 @@ static void gpio_extcon_work(struct work_struct *work) 
		container_of(to_delayed_work(work), struct gpio_extcon_data,

			     work);



	state = gpiod_get_value_cansleep(data->id_gpiod);

	if (data->pdata->gpio_active_low)

		state = !state;



	extcon_set_state_sync(data->edev, data->pdata->extcon_id, state);

	state = gpiod_get_value_cansleep(data->gpiod);

	extcon_set_state_sync(data->edev, data->extcon_id, state);

}



static irqreturn_t gpio_irq_handler(int irq, void *dev_id)
@@ -62,65 +73,41 @@ static irqreturn_t gpio_irq_handler(int irq, void *dev_id) 
	return IRQ_HANDLED;

}



static int gpio_extcon_init(struct device *dev, struct gpio_extcon_data *data)

{

	struct gpio_extcon_pdata *pdata = data->pdata;

	int ret;



	ret = devm_gpio_request_one(dev, pdata->gpio, GPIOF_DIR_IN,

				dev_name(dev));

	if (ret < 0)

		return ret;



	data->id_gpiod = gpio_to_desc(pdata->gpio);

	if (!data->id_gpiod)

		return -EINVAL;



	if (pdata->debounce) {

		ret = gpiod_set_debounce(data->id_gpiod,

					pdata->debounce * 1000);

		if (ret < 0)

			data->debounce_jiffies =

				msecs_to_jiffies(pdata->debounce);

	}



	data->irq = gpiod_to_irq(data->id_gpiod);

	if (data->irq < 0)

		return data->irq;



	return 0;

}



static int gpio_extcon_probe(struct platform_device *pdev)

{

	struct gpio_extcon_pdata *pdata = dev_get_platdata(&pdev->dev);

	struct gpio_extcon_data *data;

	struct device *dev = &pdev->dev;

	int ret;



	if (!pdata)

		return -EBUSY;

	if (!pdata->irq_flags || pdata->extcon_id > EXTCON_NONE)

		return -EINVAL;



	data = devm_kzalloc(&pdev->dev, sizeof(struct gpio_extcon_data),

				   GFP_KERNEL);

	data = devm_kzalloc(dev, sizeof(struct gpio_extcon_data), GFP_KERNEL);

	if (!data)

		return -ENOMEM;

	data->pdata = pdata;



	/* Initialize the gpio */

	ret = gpio_extcon_init(&pdev->dev, data);

	if (ret < 0)

		return ret;

	/*

	 * FIXME: extcon_id represents the unique identifier of external

	 * connectors such as EXTCON_USB, EXTCON_DISP_HDMI and so on. extcon_id

	 * is necessary to register the extcon device. But, it's not yet

	 * developed to get the extcon id from device-tree or others.

	 * On later, it have to be solved.

	 */

	if (!data->irq_flags || data->extcon_id > EXTCON_NONE)

		return -EINVAL;



	data->gpiod = devm_gpiod_get(dev, "extcon", GPIOD_IN);

	if (IS_ERR(data->gpiod))

		return PTR_ERR(data->gpiod);

	data->irq = gpiod_to_irq(data->gpiod);

	if (data->irq <= 0)

		return data->irq;



	/* Allocate the memory of extcon devie and register extcon device */

	data->edev = devm_extcon_dev_allocate(&pdev->dev, &pdata->extcon_id);

	data->edev = devm_extcon_dev_allocate(dev, &data->extcon_id);

	if (IS_ERR(data->edev)) {

		dev_err(&pdev->dev, "failed to allocate extcon device\n");

		dev_err(dev, "failed to allocate extcon device\n");

		return -ENOMEM;

	}



	ret = devm_extcon_dev_register(&pdev->dev, data->edev);

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

	if (ret < 0)

		return ret;
@@ -130,8 +117,8 @@ static int gpio_extcon_probe(struct platform_device *pdev) 
	 * Request the interrupt of gpio to detect whether external connector

	 * is attached or detached.

	 */

	ret = devm_request_any_context_irq(&pdev->dev, data->irq,

					gpio_irq_handler, pdata->irq_flags,

	ret = devm_request_any_context_irq(dev, data->irq,

					gpio_irq_handler, data->irq_flags,

					pdev->name, data);

	if (ret < 0)

		return ret;
@@ -158,7 +145,7 @@ static int gpio_extcon_resume(struct device *dev) 
	struct gpio_extcon_data *data;



	data = dev_get_drvdata(dev);

	if (data->pdata->check_on_resume)

	if (data->check_on_resume)

		queue_delayed_work(system_power_efficient_wq,

			&data->work, data->debounce_jiffies);

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

+7 −4
Original line number Diff line number Diff line
@@ -66,6 +66,8 @@ 


#define CHT_WC_VBUS_GPIO_CTLO		0x6e2d

#define CHT_WC_VBUS_GPIO_CTLO_OUTPUT	BIT(0)

#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,
@@ -183,14 +185,15 @@ static void cht_wc_extcon_set_5v_boost(struct cht_wc_extcon_data *ext, 
{

	int ret, val;



	val = enable ? CHT_WC_VBUS_GPIO_CTLO_OUTPUT : 0;



	/*

	 * The 5V boost converter is enabled through a gpio on the PMIC, since

	 * there currently is no gpio driver we access the gpio reg directly.

	 */

	ret = regmap_update_bits(ext->regmap, CHT_WC_VBUS_GPIO_CTLO,

				 CHT_WC_VBUS_GPIO_CTLO_OUTPUT, val);

	val = CHT_WC_VBUS_GPIO_CTLO_DRV_OD | CHT_WC_VBUS_GPIO_CTLO_DIR_OUT;

	if (enable)

		val |= CHT_WC_VBUS_GPIO_CTLO_OUTPUT;



	ret = regmap_write(ext->regmap, CHT_WC_VBUS_GPIO_CTLO, val);

	if (ret)

		dev_err(ext->dev, "Error writing Vbus GPIO CTLO: %d\n", ret);

}

drivers/extcon/extcon-intel-int3496.c

+5 −4
Original line number Diff line number Diff line
@@ -50,7 +50,11 @@ static const struct acpi_gpio_params vbus_gpios = { INT3496_GPIO_VBUS_EN, 0, fal 
static const struct acpi_gpio_params mux_gpios = { INT3496_GPIO_USB_MUX, 0, false };



static const struct acpi_gpio_mapping acpi_int3496_default_gpios[] = {

	{ "id-gpios", &id_gpios, 1 },

	/*

	 * Some platforms have a bug in ACPI GPIO description making IRQ

	 * GPIO to be output only. Ask the GPIO core to ignore this limit.

	 */

	{ "id-gpios", &id_gpios, 1, ACPI_GPIO_QUIRK_NO_IO_RESTRICTION },

	{ "vbus-gpios", &vbus_gpios, 1 },

	{ "mux-gpios", &mux_gpios, 1 },

	{ },
@@ -112,9 +116,6 @@ static int int3496_probe(struct platform_device *pdev) 
		ret = PTR_ERR(data->gpio_usb_id);

		dev_err(dev, "can't request USB ID GPIO: %d\n", ret);

		return ret;

	} else if (gpiod_get_direction(data->gpio_usb_id) != GPIOF_DIR_IN) {

		dev_warn(dev, FW_BUG "USB ID GPIO not in input mode, fixing\n");

		gpiod_direction_input(data->gpio_usb_id);

	}



	data->usb_id_irq = gpiod_to_irq(data->gpio_usb_id);

CRA Git | Maintained and supported by SUSTech CRA and CCSE