Merge remote-tracking branch 'mfd/for-next'

Conflicts:
	drivers/input/touchscreen/ti_tscadc.c
	drivers/mfd/twl-core.c
	drivers/mmc/host/Kconfig

diff --cc drivers/base/regmap/internal.h
Simple merge

diff --cc drivers/base/regmap/regmap.c
Simple merge

diff --cc drivers/gpio/Kconfig
Simple merge

diff --cc drivers/i2c/busses/Kconfig
Simple merge

diff --cc drivers/i2c/busses/Makefile
Simple merge

diff --cc drivers/input/misc/da9052_onkey.c
Simple merge

diff --cc drivers/input/touchscreen/Kconfig
Simple merge

diff --cc drivers/input/touchscreen/Makefile
Simple merge

diff --cc drivers/input/touchscreen/da9052_tsi.c
Simple merge

diff --cc drivers/mfd/arizona-core.c
index dae9db0b5f788f5dd3d36afe470188ae15fcc3b3,f59773da8adfee7292de01e61d007b14e39ee226..10a1b8140b808f3f49a33f2da088044cca29e09b
--- 1/drivers/mfd/arizona-core.c
--- 2/drivers/mfd/arizona-core.c
+++ b/drivers/mfd/arizona-core.c
@@@ -412,13 -413,8 +413,10 @@@ int __devinit arizona_dev_init(struct a
  
        dev_info(dev, "%s revision %c\n", type_name, arizona->rev + 'A');
  
-       if (ret != 0)
-               dev_err(arizona->dev, "Failed to apply patch: %d\n", ret);
- 
        /* If we have a /RESET GPIO we'll already be reset */
        if (!arizona->pdata.reset) {
 +              regcache_mark_dirty(arizona->regmap);
 +
                ret = regmap_write(arizona->regmap, ARIZONA_SOFTWARE_RESET, 0);
                if (ret != 0) {
                        dev_err(dev, "Failed to reset device: %d\n", ret);

diff --cc drivers/mfd/stmpe.c
Simple merge

diff --cc drivers/mfd/twl4030-irq.c
Simple merge

diff --cc drivers/mfd/wm5102-tables.c
Simple merge

diff --cc drivers/mfd/wm8994-core.c
Simple merge

diff --cc drivers/mmc/host/Kconfig
index 6b6b6cb1aa6ae599128cd2ed90569580f71a006f,dfa6d56ff0ff3db0e7137e0ca19f538923375846..f284c9d88049fd14d5447d84b8266d53bdd96e4a
--- 1/drivers/mmc/host/Kconfig
--- 2/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@@ -602,14 -622,9 +602,21 @@@ config MMC_USH
          Note: These controllers only support SDIO cards and do not
          support MMC or SD memory cards.
  
 +config MMC_WMT
 +      tristate "Wondermedia SD/MMC Host Controller support"
 +      depends on ARCH_VT8500
 +      default y
 +      help
 +        This selects support for the SD/MMC Host Controller on
 +        Wondermedia WM8505/WM8650 based SoCs.
 +
 +        To compile this driver as a module, choose M here: the
 +        module will be called wmt-sdmmc.
 +
++
+ config MMC_REALTEK_PCI
+       tristate "Realtek PCI-E SD/MMC Card Interface Driver"
+       depends on MFD_RTSX_PCI
+       help
+         Say Y here to include driver code to support SD/MMC card interface
+         of Realtek PCI-E card reader

diff --cc drivers/mmc/host/Makefile
index 39d5e123470934d45c41151f366355f46770c647,8aa592d14c4eac95e18ef61729ca949ad4a02799..809019a0e96a686658012ced9e1c2b743b8f4a7e
--- 1/drivers/mmc/host/Makefile
--- 2/drivers/mmc/host/Makefile
+++ b/drivers/mmc/host/Makefile
@@@ -44,8 -45,9 +44,10 @@@ obj-$(CONFIG_MMC_SH_MMCIF)   += sh_mmcif.
  obj-$(CONFIG_MMC_JZ4740)      += jz4740_mmc.o
  obj-$(CONFIG_MMC_VUB300)      += vub300.o
  obj-$(CONFIG_MMC_USHC)                += ushc.o
 +obj-$(CONFIG_MMC_WMT)         += wmt-sdmmc.o
  
+ obj-$(CONFIG_MMC_REALTEK_PCI) += rtsx_pci_sdmmc.o
+ 
  obj-$(CONFIG_MMC_SDHCI_PLTFM)         += sdhci-pltfm.o
  obj-$(CONFIG_MMC_SDHCI_CNS3XXX)               += sdhci-cns3xxx.o
  obj-$(CONFIG_MMC_SDHCI_ESDHC_IMX)     += sdhci-esdhc-imx.o

diff --cc include/linux/regmap.h
Simple merge