Merge tag 'mfd-3.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 10 Jul 2013 18:10:27 +0000 (11:10 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 10 Jul 2013 18:10:27 +0000 (11:10 -0700)
Pull MFD update from Samuel Ortiz:
 "For the 3.11 merge we only have one new MFD driver for the Kontron
  PLD.

  But we also have:
   - Support for the TPS659038 PMIC from the palmas driver.
   - Intel's Coleto Creek and Avoton SoCs support from the lpc_ich
     driver.
   - RTL8411B support from the rtsx driver.
   - More DT support for the Arizona, max8998, twl4030-power and the
     ti_am335x_tsadc drivers.
   - The SSBI driver move under MFD.
   - A conversion to the devm_* API for most of the MFD drivers.
   - The twl4030-power got split from twl-core into its own module.
   - A major ti_am335x_adc cleanup, leading to a proper DT support.
   - Our regular arizona and wm* updates and cleanups from the Wolfson
     folks.
   - A better error handling and initialization, and a regulator
     subdevice addition for the 88pm80x driver.
   - A bulk platform_set_drvdata() call removal that's no longer need
     since commit 0998d0631001 ("device-core: Ensure drvdata = NULL when
     no driver is bound")

* tag 'mfd-3.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-next: (102 commits)
  mfd: sec: Provide max_register to regmap
  mfd: wm8994: Remove duplicate check for active JACKDET
  MAINTAINERS: Add include directory to MFD file patterns
  mfd: sec: Remove fields not used since regmap conversion
  watchdog: Kontron PLD watchdog timer driver
  mfd: max8998: Add support for Device Tree
  regulator: max8998: Use arrays for specifying voltages in platform data
  mfd: max8998: Add irq domain support
  regulator: palmas: Add TPS659038 support
  mfd: Kontron PLD mfd driver
  mfd: palmas: Add TPS659038 PMIC support
  mfd: palmas: Add SMPS10_BOOST feature
  mfd: palmas: Check if irq is valid
  mfd: lpc_ich: iTCO_wdt patch for Intel Coleto Creek DeviceIDs
  mfd: twl-core: Change TWL6025 references to TWL6032
  mfd: davinci_voicecodec: Fix build breakage
  mfd: vexpress: Make the driver optional for arm and arm64
  mfd: htc-egpio: Use devm_ioremap_nocache() instead of ioremap_nocache()
  mfd: davinci_voicecodec: Convert to use devm_* APIs
  mfd: twl4030-power: Fix relocking on error
  ...

13 files changed:
1  2 
MAINTAINERS
arch/arm/boot/dts/am335x-evm.dts
arch/arm/boot/dts/am33xx.dtsi
drivers/Kconfig
drivers/Makefile
drivers/input/touchscreen/ti_am335x_tsc.c
drivers/mfd/ab8500-gpadc.c
drivers/mfd/dbx500-prcmu-regs.h
drivers/mfd/twl4030-irq.c
drivers/rtc/rtc-max8998.c
include/linux/mfd/davinci_voicecodec.h
include/linux/mfd/palmas.h
include/linux/mfd/wm8994/pdata.h

diff --cc MAINTAINERS
Simple merge
index 904ba83ef66d903de3e9baf9fd1180da5dc0cee1,0fa4c7f9539f98dc240b45d041dd5a301f15d21f..3aee1a43782db9068ac1d82cdd39216de5535a74
  
  &cpsw_emac1 {
        phy_id = <&davinci_mdio>, <1>;
 +      phy-mode = "rgmii-txid";
  };
+ &tscadc {
+       status = "okay";
+       tsc {
+               ti,wires = <4>;
+               ti,x-plate-resistance = <200>;
+               ti,coordiante-readouts = <5>;
+               ti,wire-config = <0x00 0x11 0x22 0x33>;
+       };
+       adc {
+               ti,adc-channels = <4 5 6 7>;
+       };
+ };
index 0d4df90477f7334f8ec4e25028bb6d4698d6d0e8,4ad7797b97b61e018ed34ea5c702ddcbd0ce1937..38b446ba1ce104b42fce6b2737ba2c8755fda4a1
                        ti,hwmods = "wkup_m3";
                };
  
 -
 +              elm: elm@48080000 {
 +                      compatible = "ti,am3352-elm";
 +                      reg = <0x48080000 0x2000>;
 +                      interrupts = <4>;
 +                      ti,hwmods = "elm";
 +                      status = "disabled";
 +              };
 +
+               tscadc: tscadc@44e0d000 {
+                       compatible = "ti,am3359-tscadc";
+                       reg = <0x44e0d000 0x1000>;
+                       interrupt-parent = <&intc>;
+                       interrupts = <16>;
+                       ti,hwmods = "adc_tsc";
+                       status = "disabled";
+                       tsc {
+                               compatible = "ti,am3359-tsc";
+                       };
+                       am335x_adc: adc {
+                               #io-channel-cells = <1>;
+                               compatible = "ti,am3359-adc";
+                       };
+               };
                gpmc: gpmc@50000000 {
                        compatible = "ti,am3352-gpmc";
                        ti,hwmods = "gpmc";
diff --cc drivers/Kconfig
Simple merge
Simple merge
index 50fb1293874e56053435f55a312b7e869ddfb6f8,0e9f02aeae6b3cdcd7a17de0fddb974ac11fade4..e1c5300cacfc2044f83175dccffd864a8bd01fbc
@@@ -334,8 -438,14 +438,13 @@@ static int titsc_remove(struct platform
  
        free_irq(ts_dev->irq, ts_dev);
  
+       /* total steps followed by the enable mask */
+       steps = 2 * ts_dev->coordinate_readouts + 2;
+       steps = (1 << steps) - 1;
+       am335x_tsc_se_clr(ts_dev->mfd_tscadc, steps);
        input_unregister_device(ts_dev->input);
  
 -      platform_set_drvdata(pdev, NULL);
        kfree(ts_dev);
        return 0;
  }
Simple merge
Simple merge
Simple merge
index 5388336a2c4cc89e9a872d77c27a00a8d82ec5df,042a8734bd28b6e8d4d001e06668a2feb37ee763..f098ad8382de021a7a66a442680c42d9393d7af6
@@@ -274,9 -274,18 +274,18 @@@ static int max8998_rtc_probe(struct pla
        if (IS_ERR(info->rtc_dev)) {
                ret = PTR_ERR(info->rtc_dev);
                dev_err(&pdev->dev, "Failed to register RTC device: %d\n", ret);
 -              goto out_rtc;
 +              return ret;
        }
  
+       if (!max8998->irq_domain)
+               goto no_irq;
+       info->irq = irq_create_mapping(max8998->irq_domain, MAX8998_IRQ_ALARM0);
+       if (!info->irq) {
+               dev_warn(&pdev->dev, "Failed to map alarm IRQ\n");
+               goto no_irq;
+       }
        ret = devm_request_threaded_irq(&pdev->dev, info->irq, NULL,
                                max8998_rtc_alarm_irq, 0, "rtc-alarm0", info);
  
index 7dd6524d2aac9becefa0103c69b60bb241a94bdf,810aee7e53eb3f2691e70c4cc94b66ccea5c4e20..13a1ee95a2334bdda6fed40c3e8dbf36a9784012
  #include <linux/kernel.h>
  #include <linux/platform_device.h>
  #include <linux/mfd/core.h>
 +#include <linux/platform_data/edma.h>
  
 -#include <mach/edma.h>
+ #include <mach/hardware.h>
  /*
   * Register values.
   */
Simple merge
Simple merge