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

Commit 4c257ec3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'char-misc-4.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc 

Pull char/misc updates from Greg KH:
 "Here's the big set of char/misc patches for 4.5-rc1.

  Nothing major, lots of different driver subsystem updates, full
  details in the shortlog.  All of these have been in linux-next for a
  while"

* tag 'char-misc-4.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (71 commits)
  mei: fix fasync return value on error
  parport: avoid assignment in if
  parport: remove unneeded space
  parport: change style of NULL comparison
  parport: remove unnecessary out of memory message
  parport: remove braces
  parport: quoted strings should not be split
  parport: code indent should use tabs
  parport: fix coding style
  parport: EXPORT_SYMBOL should follow function
  parport: remove trailing white space
  parport: fix a trivial typo
  coresight: Fix a typo in Kconfig
  coresight: checking for NULL string in coresight_name_match()
  Drivers: hv: vmbus: Treat Fibre Channel devices as performance critical
  Drivers: hv: utils: fix hvt_op_poll() return value on transport destroy
  Drivers: hv: vmbus: fix the building warning with hyperv-keyboard
  extcon: add Maxim MAX3355 driver
  Drivers: hv: ring_buffer: eliminate hv_ringbuffer_peek()
  Drivers: hv: remove code duplication between vmbus_recvpacket()/vmbus_recvpacket_raw()
  ...
parents 39272dde ed6dc538

Documentation/devicetree/bindings/extcon/extcon-arizona.txt

+60 −0
Original line number Diff line number Diff line
@@ -13,3 +13,63 @@ Optional properties: 
    ARIZONA_ACCDET_MODE_HPR or 2 - Headphone detect mode is set to HPDETR

    If this node is not mentioned or if the value is unknown, then

    headphone detection mode is set to HPDETL.



  - wlf,use-jd2 : Use the additional JD input along with JD1 for dual pin jack

    detection.

  - wlf,use-jd2-nopull : Internal pull on JD2 is disabled when used for

    jack detection.

  - wlf,jd-invert : Invert the polarity of the jack detection switch



  - wlf,micd-software-compare : Use a software comparison to determine mic

    presence

  - wlf,micd-detect-debounce : Additional software microphone detection

    debounce specified in milliseconds.

  - wlf,micd-pol-gpio : GPIO specifier for the GPIO controlling the headset

    polarity if one exists.

  - wlf,micd-bias-start-time : Time allowed for MICBIAS to startup prior to

    performing microphone detection, specified as per the ARIZONA_MICD_TIME_XXX

    defines.

  - wlf,micd-rate : Delay between successive microphone detection measurements,

    specified as per the ARIZONA_MICD_TIME_XXX defines.

  - wlf,micd-dbtime : Microphone detection hardware debounces specified as the

    number of measurements to take, valid values being 2 and 4.

  - wlf,micd-timeout-ms : Timeout for microphone detection, specified in

    milliseconds.

  - wlf,micd-force-micbias : Force MICBIAS continuously on during microphone

    detection.

  - wlf,micd-configs : Headset polarity configurations (generally used for

    detection of CTIA / OMTP headsets), the field can be of variable length

    but should always be a multiple of 3 cells long, each three cell group

    represents one polarity configuration.

    The first cell defines the accessory detection pin, zero will use MICDET1

    and all other values will use MICDET2.

    The second cell represents the MICBIAS to be used.

    The third cell represents the value of the micd-pol-gpio pin.



  - wlf,gpsw : Settings for the general purpose switch



Example:



codec: wm8280@0 {

	compatible = "wlf,wm8280";

	reg = <0>;

	...



	wlf,use-jd2;

	wlf,use-jd2-nopull;

	wlf,jd-invert;



	wlf,micd-software-compare;

	wlf,micd-detect-debounce = <0>;

	wlf,micd-pol-gpio = <&codec 2 0>;

	wlf,micd-rate = <ARIZONA_MICD_TIME_8MS>;

	wlf,micd-dbtime = <4>;

	wlf,micd-timeout-ms = <100>;

	wlf,micd-force-micbias;

	wlf,micd-configs = <

		0 1 0 /* MICDET1 MICBIAS1 GPIO=low */

		1 2 1 /* MICDET2 MICBIAS2 GPIO=high */

	>;



	wlf,gpsw = <0>;

};

Documentation/devicetree/bindings/extcon/extcon-max3355.txt

0 → 100644
+21 −0
Original line number Diff line number Diff line 
Maxim Integrated MAX3355 USB OTG chip

-------------------------------------



MAX3355 integrates a charge pump and comparators to enable a system with an

integrated USB OTG dual-role transceiver to function as a USB OTG dual-role

device.



Required properties:

- compatible: should be "maxim,max3355";

- maxim,shdn-gpios: should contain a phandle and GPIO specifier for the GPIO pin

		    connected to the MAX3355's SHDN# pin;

- id-gpios: should contain a phandle and GPIO specifier for the GPIO pin

	    connected to the MAX3355's ID_OUT pin.



Example:



	usb-otg {

		compatible = "maxim,max3355";

		maxim,shdn-gpios = <&gpio2 4 GPIO_ACTIVE_LOW>;

		id-gpios = <&gpio5 31 GPIO_ACTIVE_HIGH>;

	};

drivers/extcon/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -52,6 +52,15 @@ config EXTCON_MAX14577 
	  Maxim MAX14577/77836. The MAX14577/77836 MUIC is a USB port accessory

	  detector and switch.



config EXTCON_MAX3355

	tristate "Maxim MAX3355 USB OTG EXTCON Support"

	depends on GPIOLIB || COMPILE_TEST

	help

	  If you say yes here you get support for the USB OTG role detection by

	  MAX3355. The MAX3355 chip integrates a charge pump and comparators to

	  enable a system with an integrated USB OTG dual-role transceiver to

	  function as an USB OTG dual-role device.



config EXTCON_MAX77693

	tristate "Maxim MAX77693 EXTCON Support"

	depends on MFD_MAX77693 && INPUT

drivers/extcon/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ obj-$(CONFIG_EXTCON_ARIZONA) += extcon-arizona.o 
obj-$(CONFIG_EXTCON_AXP288)	+= extcon-axp288.o

obj-$(CONFIG_EXTCON_GPIO)	+= extcon-gpio.o

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

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

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

obj-$(CONFIG_EXTCON_MAX77843)	+= extcon-max77843.o

obj-$(CONFIG_EXTCON_MAX8997)	+= extcon-max8997.o

drivers/extcon/extcon-arizona.c

+68 −3
Original line number Diff line number Diff line
@@ -1201,10 +1201,58 @@ static void arizona_micd_set_level(struct arizona *arizona, int index, 
	regmap_update_bits(arizona->regmap, reg, mask, level);

}



static int arizona_extcon_device_get_pdata(struct arizona *arizona)

static int arizona_extcon_get_micd_configs(struct device *dev,

					   struct arizona *arizona)

{

	const char * const prop = "wlf,micd-configs";

	const int entries_per_config = 3;

	struct arizona_micd_config *micd_configs;

	int nconfs, ret;

	int i, j;

	u32 *vals;



	nconfs = device_property_read_u32_array(arizona->dev, prop, NULL, 0);

	if (nconfs <= 0)

		return 0;



	vals = kcalloc(nconfs, sizeof(u32), GFP_KERNEL);

	if (!vals)

		return -ENOMEM;



	ret = device_property_read_u32_array(arizona->dev, prop, vals, nconfs);

	if (ret < 0)

		goto out;



	nconfs /= entries_per_config;



	micd_configs = devm_kzalloc(dev,

				    nconfs * sizeof(struct arizona_micd_range),

				    GFP_KERNEL);

	if (!micd_configs) {

		ret = -ENOMEM;

		goto out;

	}



	for (i = 0, j = 0; i < nconfs; ++i) {

		micd_configs[i].src = vals[j++] ? ARIZONA_ACCDET_SRC : 0;

		micd_configs[i].bias = vals[j++];

		micd_configs[i].gpio = vals[j++];

	}



	arizona->pdata.micd_configs = micd_configs;

	arizona->pdata.num_micd_configs = nconfs;



out:

	kfree(vals);

	return ret;

}



static int arizona_extcon_device_get_pdata(struct device *dev,

					   struct arizona *arizona)

{

	struct arizona_pdata *pdata = &arizona->pdata;

	unsigned int val = ARIZONA_ACCDET_MODE_HPL;

	int ret;



	device_property_read_u32(arizona->dev, "wlf,hpdet-channel", &val);

	switch (val) {
@@ -1230,12 +1278,29 @@ static int arizona_extcon_device_get_pdata(struct arizona *arizona) 
	device_property_read_u32(arizona->dev, "wlf,micd-dbtime",

				 &pdata->micd_dbtime);



	device_property_read_u32(arizona->dev, "wlf,micd-timeout",

	device_property_read_u32(arizona->dev, "wlf,micd-timeout-ms",

				 &pdata->micd_timeout);



	pdata->micd_force_micbias = device_property_read_bool(arizona->dev,

						"wlf,micd-force-micbias");



	pdata->micd_software_compare = device_property_read_bool(arizona->dev,

						"wlf,micd-software-compare");



	pdata->jd_invert = device_property_read_bool(arizona->dev,

						     "wlf,jd-invert");



	device_property_read_u32(arizona->dev, "wlf,gpsw", &pdata->gpsw);



	pdata->jd_gpio5 = device_property_read_bool(arizona->dev,

						    "wlf,use-jd2");

	pdata->jd_gpio5_nopull = device_property_read_bool(arizona->dev,

						"wlf,use-jd2-nopull");



	ret = arizona_extcon_get_micd_configs(dev, arizona);

	if (ret < 0)

		dev_err(arizona->dev, "Failed to read micd configs: %d\n", ret);



	return 0;

}
@@ -1257,7 +1322,7 @@ static int arizona_extcon_probe(struct platform_device *pdev) 
		return -ENOMEM;



	if (!dev_get_platdata(arizona->dev))

		arizona_extcon_device_get_pdata(arizona);

		arizona_extcon_device_get_pdata(&pdev->dev, arizona);



	info->micvdd = devm_regulator_get(&pdev->dev, "MICVDD");

	if (IS_ERR(info->micvdd)) {