Merge tag 'mfd-3.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-next

Pull MFD updates from Samuel Ortiz:
 "For the 3.13 merge window we have a couple of new drivers for the AMS
  AS3722 PMIC and for STMicroelectronics STw481x PMIC.

  Although this is a smaller update than usual, we also have:

   - Device tree support for the max77693 driver

   - linux/of.h inclusion for all DT compatible MFD drivers, to avoid
     build breakage in the future

   - Support for Intel Wildcat Point-LP PCH through the lpc_ich driver

   - A small arizona update for new wm5110 DSP registers and a few fixes

   - A small palmas update as well, including an of_device table
     addition and a few minor fixes

   - Two small mfd-core changes, one including a memory leak fix for
     when mfd_add_device() fails

   - Our usual round of minor cleanups and janitorial fixes"

* tag 'mfd-3.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-next: (63 commits)
  Documentation: mfd: Update s2mps11.txt
  mfd: pm8921: Potential NULL dereference in pm8921_remove()
  mfd: Fix memory leak in mfd_add_devices()
  mfd: Stop setting refcounting pointers in original mfd_cell arrays
  mfd: wm5110: Enable micd clamp functionality
  mfd: lpc_ich: Add Device IDs for Intel Wildcat Point-LP PCH
  mfd: max77693: Fix up bug of wrong interrupt number
  mfd: as3722: Don't export the regmap config
  mfd: twl6040: Remove obsolete cleanup for i2c clientdata
  mfd: tps65910: Remove warning during dt node parsing
  mfd: lpc_sch: Ignore resource conflicts when adding mfd cells
  mfd: ti_am335x_tscadc: Avoid possible deadlock of reg_lock
  mfd: syscon: Return -ENOSYS if CONFIG_MFD_SYSCON is not enabled
  mfd: Add support for ams AS3722 PMIC
  mfd: max77693: Include linux/of.h header
  mfd: tc3589x: Detect the precise version
  mfd: omap-usb: prepare/unprepare clock while enable/disable
  mfd: max77686: Include linux/of.h header
  mfd: max8907: Include linux/of.h header
  mfd: max8997: Include linux/of.h header
  ...

1 files changed, 52 insertions, 0 deletions

diff --git a/include/dt-bindings/mfd/as3722.h b/include/dt-bindings/mfd/as3722.h
new file mode 100644
index 000000000000..0e692562d77b
--- /dev/null
+++ b/include/dt-bindings/mfd/as3722.h
@@ -0,0 +1,52 @@
+/*
+ * This header provides macros for ams AS3722 device bindings.
+ *
+ * Copyright (c) 2013, NVIDIA Corporation.
+ *
+ * Author: Laxman Dewangan <ldewangan@nvidia.com>
+ *
+ */
+
+#ifndef __DT_BINDINGS_AS3722_H__
+#define __DT_BINDINGS_AS3722_H__
+
+/* External control pins */
+#define AS3722_EXT_CONTROL_PIN_ENABLE1 1
+#define AS3722_EXT_CONTROL_PIN_ENABLE2 2
+#define AS3722_EXT_CONTROL_PIN_ENABLE2 3
+
+/* Interrupt numbers for AS3722 */
+#define AS3722_IRQ_LID                  0
+#define AS3722_IRQ_ACOK                 1
+#define AS3722_IRQ_ENABLE1              2
+#define AS3722_IRQ_OCCUR_ALARM_SD0      3
+#define AS3722_IRQ_ONKEY_LONG_PRESS     4
+#define AS3722_IRQ_ONKEY                5
+#define AS3722_IRQ_OVTMP                6
+#define AS3722_IRQ_LOWBAT               7
+#define AS3722_IRQ_SD0_LV               8
+#define AS3722_IRQ_SD1_LV               9
+#define AS3722_IRQ_SD2_LV               10
+#define AS3722_IRQ_PWM1_OV_PROT         11
+#define AS3722_IRQ_PWM2_OV_PROT         12
+#define AS3722_IRQ_ENABLE2              13
+#define AS3722_IRQ_SD6_LV               14
+#define AS3722_IRQ_RTC_REP              15
+#define AS3722_IRQ_RTC_ALARM            16
+#define AS3722_IRQ_GPIO1                17
+#define AS3722_IRQ_GPIO2                18
+#define AS3722_IRQ_GPIO3                19
+#define AS3722_IRQ_GPIO4                20
+#define AS3722_IRQ_GPIO5                21
+#define AS3722_IRQ_WATCHDOG             22
+#define AS3722_IRQ_ENABLE3              23
+#define AS3722_IRQ_TEMP_SD0_SHUTDOWN    24
+#define AS3722_IRQ_TEMP_SD1_SHUTDOWN    25
+#define AS3722_IRQ_TEMP_SD2_SHUTDOWN    26
+#define AS3722_IRQ_TEMP_SD0_ALARM       27
+#define AS3722_IRQ_TEMP_SD1_ALARM       28
+#define AS3722_IRQ_TEMP_SD6_ALARM       29
+#define AS3722_IRQ_OCCUR_ALARM_SD6      30
+#define AS3722_IRQ_ADC                  31
+
+#endif /* __DT_BINDINGS_AS3722_H__ */