From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 18 Mar 2016 17:15:11 +0000 (-0700)
Subject: Merge tag 'mfd-for-linus-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=12e7b0a62752234497de51356903f5f4e6bd2f77;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge tag 'mfd-for-linus-4.6' of git://git./linux/kernel/git/lee/mfd

Pull MFD updates from Lee Jones:
 "New Drivers:
   - Freescale Touch Screen ADC
   - X-Powers AXP PMIC with RSB
   - TI TPS65086 Power Management IC (PMIC)

  New Device Support:
   - Supply device PCI IDs for Intel Broxton

  Fix-ups:
   - Move to clkdev_create() API; intel_quark_i2c_gpio
   - Complete re-write of TI's TPS65912 Power Management IC (PMIC)
   - Remove unnecessary function argument; axp20x
   - Separate out bus related code; axp20x
   - Coding Style changes; axp20x
   - Allow more drivers to be compiled as modules
   - Work around false positive 'used uninitialised' warning; db8500-prcmu

  Bug Fixes:
   - Remove do_div(); fsl-imx25-gcq
   - Fix driver init when built-in; tps65010
   - Fix clock-unregister leak; intel-lpss"

* tag 'mfd-for-linus-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (53 commits)
  mfd: intel-lpss: Pass I2C configuration via properties on BXT
  mfd: imx6sx: Add PCIe register definitions for iomuxc gpr
  mfd: ipaq-micro: Use __maybe_unused to hide pm functions
  mfd: max77686: Add max77802 to I2C device ID table
  mfd: max77686: Export OF module alias information
  mfd: max77686: Allow driver to be built as a module
  mfd: stmpe: Add the proper PWM resources
  mfd: tps65090: Set regmap config reg counts properly
  mfd: syscon: Return ENOTSUPP instead of ENOSYS when disabled
  mfd: as3711: Set regmap config reg counts properly
  mfd: rc5t583: Set regmap config reg counts properly
  gpio: tps65086: Add GPO driver for the TPS65086 PMIC
  mfd: mt6397: Add platform device ID table
  mfd: da9063: Fix missing volatile registers in the core regmap_range volatile lists
  mfd: mt6397: Add MT6323 support to MT6397 driver
  mfd: mt6397: Add support for different Slave types
  mfd: mt6397: int_con and int_status may vary in location
  dt-bindings: mfd: Add bindings for the MediaTek MT6323 PMIC
  mfd: da9062: Fix missing volatile registers in the core regmap_range volatile lists
  mfd: Add documentation for ACT8945A DT bindings
  ...
---

12e7b0a62752234497de51356903f5f4e6bd2f77
diff --cc drivers/gpio/Kconfig
index 4808e4657de5,2b80903965d1..5f3429f0bf46
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@@ -898,13 -844,12 +898,19 @@@ config GPIO_TIMBERDAL
  	---help---
  	Add support for the GPIO IP in the timberdale FPGA.
  
+ config GPIO_TPS65086
+ 	tristate "TI TPS65086 GPO"
+ 	depends on MFD_TPS65086
+ 	help
+ 	  This driver supports the GPO on TI TPS65086x PMICs.
+ 
 +config GPIO_TPS65218
 +	tristate "TPS65218 GPIO"
 +	depends on MFD_TPS65218
 +	help
 +	  Select this option to enable GPIO driver for the TPS65218
 +	  chip family.
 +
  config GPIO_TPS6586X
  	bool "TPS6586X GPIO"
  	depends on MFD_TPS6586X
diff --cc drivers/gpio/Makefile
index 25decedba943,c759190b73fa..1e0b74f3b1ed
--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@@ -98,8 -95,7 +98,9 @@@ obj-$(CONFIG_GPIO_TC3589X)	+= gpio-tc35
  obj-$(CONFIG_ARCH_TEGRA)	+= gpio-tegra.o
  obj-$(CONFIG_GPIO_TIMBERDALE)	+= gpio-timberdale.o
  obj-$(CONFIG_GPIO_PALMAS)	+= gpio-palmas.o
 +obj-$(CONFIG_GPIO_TPIC2810)	+= gpio-tpic2810.o
+ obj-$(CONFIG_GPIO_TPS65086)	+= gpio-tps65086.o
 +obj-$(CONFIG_GPIO_TPS65218)	+= gpio-tps65218.o
  obj-$(CONFIG_GPIO_TPS6586X)	+= gpio-tps6586x.o
  obj-$(CONFIG_GPIO_TPS65910)	+= gpio-tps65910.o
  obj-$(CONFIG_GPIO_TPS65912)	+= gpio-tps65912.o
diff --cc drivers/input/touchscreen/Makefile
index 4b518c76e0d7,49134efce85f..f42975e719e0
--- a/drivers/input/touchscreen/Makefile
+++ b/drivers/input/touchscreen/Makefile
@@@ -46,9 -46,9 +46,10 @@@ obj-$(CONFIG_TOUCHSCREEN_INTEL_MID)	+= 
  obj-$(CONFIG_TOUCHSCREEN_IPROC)		+= bcm_iproc_tsc.o
  obj-$(CONFIG_TOUCHSCREEN_LPC32XX)	+= lpc32xx_ts.o
  obj-$(CONFIG_TOUCHSCREEN_MAX11801)	+= max11801_ts.o
+ obj-$(CONFIG_TOUCHSCREEN_MX25)		+= fsl-imx25-tcq.o
  obj-$(CONFIG_TOUCHSCREEN_MC13783)	+= mc13783_ts.o
  obj-$(CONFIG_TOUCHSCREEN_MCS5000)	+= mcs5000_ts.o
 +obj-$(CONFIG_TOUCHSCREEN_MELFAS_MIP4)	+= melfas_mip4.o
  obj-$(CONFIG_TOUCHSCREEN_MIGOR)		+= migor_ts.o
  obj-$(CONFIG_TOUCHSCREEN_MMS114)	+= mms114.o
  obj-$(CONFIG_TOUCHSCREEN_MTOUCH)	+= mtouch.o