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, 56 insertions, 0 deletions

diff --git a/include/linux/mfd/stw481x.h b/include/linux/mfd/stw481x.h
new file mode 100644
index 000000000000..eda121556e5d
--- /dev/null
+++ b/include/linux/mfd/stw481x.h
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2011 ST-Ericsson SA
+ * Written on behalf of Linaro for ST-Ericsson
+ *
+ * Author: Linus Walleij <linus.walleij@linaro.org>
+ *
+ * License terms: GNU General Public License (GPL) version 2
+ */
+#ifndef MFD_STW481X_H
+#define MFD_STW481X_H
+
+#include <linux/i2c.h>
+#include <linux/regulator/machine.h>
+#include <linux/regmap.h>
+#include <linux/bitops.h>
+
+/* These registers are accessed from more than one driver */
+#define STW_CONF1                       0x11U
+#define STW_CONF1_PDN_VMMC              0x01U
+#define STW_CONF1_VMMC_MASK             0x0eU
+#define STW_CONF1_VMMC_1_8V             0x02U
+#define STW_CONF1_VMMC_2_85V            0x04U
+#define STW_CONF1_VMMC_3V               0x06U
+#define STW_CONF1_VMMC_1_85V            0x08U
+#define STW_CONF1_VMMC_2_6V             0x0aU
+#define STW_CONF1_VMMC_2_7V             0x0cU
+#define STW_CONF1_VMMC_3_3V             0x0eU
+#define STW_CONF1_MMC_LS_STATUS         0x10U
+#define STW_PCTL_REG_LO                 0x1eU
+#define STW_PCTL_REG_HI                 0x1fU
+#define STW_CONF1_V_MONITORING          0x20U
+#define STW_CONF1_IT_WARN               0x40U
+#define STW_CONF1_PDN_VAUX              0x80U
+#define STW_CONF2                       0x20U
+#define STW_CONF2_MASK_TWARN            0x01U
+#define STW_CONF2_VMMC_EXT              0x02U
+#define STW_CONF2_MASK_IT_WAKE_UP       0x04U
+#define STW_CONF2_GPO1                  0x08U
+#define STW_CONF2_GPO2                  0x10U
+#define STW_VCORE_SLEEP                 0x21U
+
+/**
+ * struct stw481x - state holder for the Stw481x drivers
+ * @mutex: mutex to serialize I2C accesses
+ * @i2c_client: corresponding I2C client
+ * @regulator: regulator device for regulator children
+ * @map: regmap handle to access device registers
+ */
+struct stw481x {
+        struct mutex            lock;
+        struct i2c_client       *client;
+        struct regulator_dev    *vmmc_regulator;
+        struct regmap           *map;
+};
+
+#endif