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

Commit bc4e1183 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mfd-next-4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd 

Pull MFD updates from Lee Jones:
 "New Drivers:
   - Add support for RAVE Supervisory Processor

  Moved drivers:
   - Move Realtek Card Reader Driver to Misc

  New Device Support:
   - Add support for Pinctrl to axp20x

  New Functionality:
   - Add resume support to atmel-flexcom

  Fix-ups:
   - Split MFD (mfd) and userspace handlers (platform) in cros_ec
   - Fix trivial (whitespace, spelling) issue(s) in pcf50633-core
   - Clean-up error handling in ab8500-debugfs
   - General tidying up in tmio_core
   - Kconfig fix-ups for qcom-pm8xxx
   - Licensing changes (SPDX) to stm32-lptimer, stm32-timers
   - Device Tree fixups in mc13xxx
   - Simplify/remove unused code in cros_ec_spi, axp20x, ti_am335x_tscadc,
     kempld-core, intel_soc_pmic_core.c, ab8500-debugfs"

* tag 'mfd-next-4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (32 commits)
  mfd: lpc_ich: Do not touch SPI-NOR write protection bit on Apollo Lake
  mfd: axp20x: Mark axp288 CHRG_BAK_CTRL register volatile
  mfd: ab8500: Introduce DEFINE_SHOW_ATTRIBUTE() macro
  atmel_flexcom: Support resuming after a chip reset
  mfd: Remove duplicate includes
  dt-bindings: mfd: mc13xxx: Add the unit address to sysled
  mfd: stm32: Adopt SPDX identifier
  mfd: axp20x: Add pinctrl cell for AXP813
  mfd: pm8xxx: Make elegible for COMPILE_TEST
  mfd: kempld-core: Use resource_size function on resource object
  mfd: tmio: Move register macros to tmio_core.c
  mfd: cros ec: spi: Simplify delay handling between SPI messages
  mfd: palmas: Assign the right powerhold mask for tps65917
  mfd: ab8500-debugfs: Use common error handling code in ab8500_print_modem_registers()
  mfd: ti_am335x_tscadc: Remove redundant assignment to node
  mfd: pcf50633: Fix spelling mistake: 'Falied' -> 'Failed'
  dt-bindings: watchdog: Add bindings for RAVE SP watchdog driver
  watchdog: Add RAVE SP watchdog driver
  mfd: Add driver for RAVE Supervisory Processor
  serdev: Introduce devm_serdev_device_open()
  ...
parents 1c7385db 0f89ffef

Documentation/devicetree/bindings/mfd/mc13xxx.txt

+1 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ ecspi@70010000 { /* ECSPI1 */ 
			#size-cells = <0>;

			led-control = <0x000 0x000 0x0e0 0x000>;



			sysled {

			sysled@3 {

				reg = <3>;

				label = "system:red:live";

				linux,default-trigger = "heartbeat";

Documentation/devicetree/bindings/watchdog/zii,rave-sp-wdt.txt

0 → 100644
+39 −0
Original line number Diff line number Diff line 
Zodiac Inflight Innovations RAVE Supervisory Processor Watchdog Bindings



RAVE SP watchdog device is a "MFD cell" device corresponding to

watchdog functionality of RAVE Supervisory Processor. It is expected

that its Device Tree node is specified as a child of the node

corresponding to the parent RAVE SP device (as documented in

Documentation/devicetree/bindings/mfd/zii,rave-sp.txt)



Required properties:



- compatible: Depending on wire protocol implemented by RAVE SP

  firmware, should be one of:

	- "zii,rave-sp-watchdog"

	- "zii,rave-sp-watchdog-legacy"



Optional properties:



- wdt-timeout:	Two byte nvmem cell specified as per

		Documentation/devicetree/bindings/nvmem/nvmem.txt



Example:



	rave-sp {

		compatible = "zii,rave-sp-rdu1";

		current-speed = <38400>;



		eeprom {

			wdt_timeout: wdt-timeout@8E {

				reg = <0x8E 2>;

			};

		};



		watchdog {

			compatible = "zii,rave-sp-watchdog";

			nvmem-cells = <&wdt_timeout>;

			nvmem-cell-names = "wdt-timeout";

		};

	}

Documentation/driver-model/devres.txt

+3 −0
Original line number Diff line number Diff line
@@ -384,6 +384,9 @@ RESET 
  devm_reset_control_get()

  devm_reset_controller_register()



SERDEV

  devm_serdev_device_open()



SLAVE DMA ENGINE

  devm_acpi_dma_controller_register()

drivers/extcon/extcon-axp288.c

+4 −35
Original line number Diff line number Diff line
@@ -24,8 +24,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 +77,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,10 +97,8 @@ struct axp288_extcon_info { 
	struct device *dev;

	struct regmap *regmap;

	struct regmap_irq_chip_data *regmap_irqc;

	struct gpio_desc *gpio_mux_cntl;

	int irq[EXTCON_IRQ_END];

	struct extcon_dev *edev;

	struct notifier_block extcon_nb;

	unsigned int previous_cable;

};
@@ -197,15 +188,6 @@ static int axp288_handle_chrg_det_event(struct axp288_extcon_info *info) 
	}



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);
@@ -253,8 +235,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 +245,6 @@ 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;



	platform_set_drvdata(pdev, info);
@@ -286,21 +265,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,

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 */