From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 29 Jan 2018 18:59:24 +0000 (-0800)
Subject: Merge tag 'mfd-next-4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd
X-Git-Tag: v4.19~1772
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bc4e118355caf83f472a5d31b850e73adddcf0ab;p=platform%2Fkernel%2Flinux-rpi3.git

Merge tag 'mfd-next-4.16' of git://git./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()
  ...
---

bc4e118355caf83f472a5d31b850e73adddcf0ab
diff --cc drivers/mfd/cros_ec_spi.c
index 59c82cd,54cb7603..1b52b85
--- a/drivers/mfd/cros_ec_spi.c
+++ b/drivers/mfd/cros_ec_spi.c
@@@ -377,8 -376,8 +376,9 @@@ static int cros_ec_pkt_xfer_spi(struct 
  	u8 *ptr;
  	u8 *rx_buf;
  	u8 sum;
 +	u8 rx_byte;
  	int ret = 0, final_ret;
+ 	unsigned long delay;
  
  	len = cros_ec_prepare_tx(ec_dev, ec_msg);
  	dev_dbg(ec_dev->dev, "prepared, len=%d\n", len);
@@@ -506,9 -504,9 +502,10 @@@ static int cros_ec_cmd_xfer_spi(struct 
  	int i, len;
  	u8 *ptr;
  	u8 *rx_buf;
 +	u8 rx_byte;
  	int sum;
  	int ret = 0, final_ret;
+ 	unsigned long delay;
  
  	len = cros_ec_prepare_tx(ec_dev, ec_msg);
  	dev_dbg(ec_dev->dev, "prepared, len=%d\n", len);