Merge tag 'regulator-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator

Pull regulator updates from Mark Brown:
 "A couple of nice new features this month, the ability to map
  regulators in order to allow voltage control by external coprocessors
  is something people have been asking for for a long time.

   - improved support for switch only "regulators", allowing current
     state to be read from the parent regulator but no setting.

   - support for obtaining the register access method used to set
     voltages, for use in systems which can offload control of this to a
     coprocessor (typically for DVFS).

   - support for Active-Semi AC8846, Dialog DA9211 and Texas Instruments
     TPS65917"

* tag 'regulator-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: (58 commits)
  regulator: act8865: fix build when OF is not enabled
  regulator: act8865: add act8846 to DT binding documentation
  regulator: act8865: add support for act8846
  regulator: act8865: prepare support for other act88xx devices
  regulator: act8865: set correct number of regulators in pdata
  regulator: act8865: Remove error variable in act8865_pmic_probe
  regulator: act8865: fix parsing of platform data
  regulator: tps65090: Set voltage for fixed regulators
  regulator: core: Allow to get voltage count and list from parent
  regulator: core: Get voltage from parent if not available
  regulator: Add missing statics and inlines for stub functions
  regulator: lp872x: Don't set constraints within the regulator driver
  regmap: Fix return code for stub regmap_get_device()
  regulator: s2mps11: Update module description and Kconfig to add S2MPU02 support
  regulator: Add helpers for low-level register access
  regmap: Allow regmap_get_device() to be used by modules
  regmap: Add regmap_get_device
  regulator: da9211: Remove unnecessary devm_regulator_unregister() calls
  regulator: Add DT bindings for tps65218 PMIC regulators.
  regulator: da9211: new regulator driver
  ...

6 files changed, 924 insertions, 15 deletions

diff --git a/include/linux/mfd/palmas.h b/include/linux/mfd/palmas.h
index 3420e09e2e20..fb0390a1a498 100644
--- a/include/linux/mfd/palmas.h
+++ b/include/linux/mfd/palmas.h
@@ -30,6 +30,8 @@
 #define PALMAS_CHIP_ID                  0xC035
 #define PALMAS_CHIP_CHARGER_ID          0xC036
 
+#define TPS65917_RESERVED               -1
+
 #define is_palmas(a)    (((a) == PALMAS_CHIP_OLD_ID) || \
                         ((a) == PALMAS_CHIP_ID))
 #define is_palmas_charger(a) ((a) == PALMAS_CHIP_CHARGER_ID)
@@ -51,6 +53,8 @@ struct palmas_pmic;
 struct palmas_gpadc;
 struct palmas_resource;
 struct palmas_usb;
+struct palmas_pmic_driver_data;
+struct palmas_pmic_platform_data;
 
 enum palmas_usb_state {
         PALMAS_USB_STATE_DISCONNECT,
@@ -74,6 +78,8 @@ struct palmas {
         struct mutex irq_lock;
         struct regmap_irq_chip_data *irq_data;
 
+        struct palmas_pmic_driver_data *pmic_ddata;
+
         /* Child Devices */
         struct palmas_pmic *pmic;
         struct palmas_gpadc *gpadc;
@@ -86,6 +92,46 @@ struct palmas {
         u8 pwm_muxed;
 };
 
+#define PALMAS_EXT_REQ (PALMAS_EXT_CONTROL_ENABLE1 |    \
+                        PALMAS_EXT_CONTROL_ENABLE2 |    \
+                        PALMAS_EXT_CONTROL_NSLEEP)
+
+struct palmas_sleep_requestor_info {
+        int id;
+        int reg_offset;
+        int bit_pos;
+};
+
+struct palmas_regs_info {
+        char    *name;
+        char    *sname;
+        u8      vsel_addr;
+        u8      ctrl_addr;
+        u8      tstep_addr;
+        int     sleep_id;
+};
+
+struct palmas_pmic_driver_data {
+        int smps_start;
+        int smps_end;
+        int ldo_begin;
+        int ldo_end;
+        int max_reg;
+        struct palmas_regs_info *palmas_regs_info;
+        struct of_regulator_match *palmas_matches;
+        struct palmas_sleep_requestor_info *sleep_req_info;
+        int (*smps_register)(struct palmas_pmic *pmic,
+                             struct palmas_pmic_driver_data *ddata,
+                             struct palmas_pmic_platform_data *pdata,
+                             const char *pdev_name,
+                             struct regulator_config config);
+        int (*ldo_register)(struct palmas_pmic *pmic,
+                            struct palmas_pmic_driver_data *ddata,
+                            struct palmas_pmic_platform_data *pdata,
+                            const char *pdev_name,
+                            struct regulator_config config);
+};
+
 struct palmas_gpadc_platform_data {
         /* Channel 3 current source is only enabled during conversion */
         int ch3_current;
@@ -184,6 +230,27 @@ enum palmas_regulators {
         PALMAS_NUM_REGS,
 };
 
+enum tps65917_regulators {
+        /* SMPS regulators */
+        TPS65917_REG_SMPS1,
+        TPS65917_REG_SMPS2,
+        TPS65917_REG_SMPS3,
+        TPS65917_REG_SMPS4,
+        TPS65917_REG_SMPS5,
+        /* LDO regulators */
+        TPS65917_REG_LDO1,
+        TPS65917_REG_LDO2,
+        TPS65917_REG_LDO3,
+        TPS65917_REG_LDO4,
+        TPS65917_REG_LDO5,
+        TPS65917_REG_REGEN1,
+        TPS65917_REG_REGEN2,
+        TPS65917_REG_REGEN3,
+
+        /* Total number of regulators */
+        TPS65917_NUM_REGS,
+};
+
 /* External controll signal name */
 enum {
         PALMAS_EXT_CONTROL_ENABLE1      = 0x1,
@@ -228,6 +295,24 @@ enum palmas_external_requestor_id {
         PALMAS_EXTERNAL_REQSTR_ID_MAX,
 };
 
+enum tps65917_external_requestor_id {
+        TPS65917_EXTERNAL_REQSTR_ID_REGEN1,
+        TPS65917_EXTERNAL_REQSTR_ID_REGEN2,
+        TPS65917_EXTERNAL_REQSTR_ID_REGEN3,
+        TPS65917_EXTERNAL_REQSTR_ID_SMPS1,
+        TPS65917_EXTERNAL_REQSTR_ID_SMPS2,
+        TPS65917_EXTERNAL_REQSTR_ID_SMPS3,
+        TPS65917_EXTERNAL_REQSTR_ID_SMPS4,
+        TPS65917_EXTERNAL_REQSTR_ID_SMPS5,
+        TPS65917_EXTERNAL_REQSTR_ID_LDO1,
+        TPS65917_EXTERNAL_REQSTR_ID_LDO2,
+        TPS65917_EXTERNAL_REQSTR_ID_LDO3,
+        TPS65917_EXTERNAL_REQSTR_ID_LDO4,
+        TPS65917_EXTERNAL_REQSTR_ID_LDO5,
+        /* Last entry */
+        TPS65917_EXTERNAL_REQSTR_ID_MAX,
+};
+
 struct palmas_pmic_platform_data {
         /* An array of pointers to regulator init data indexed by regulator
          * ID
@@ -349,6 +434,48 @@ struct palmas_gpadc_result {
 
 #define PALMAS_MAX_CHANNELS 16
 
+/* Define the tps65917 IRQ numbers */
+enum tps65917_irqs {
+        /* INT1 registers */
+        TPS65917_RESERVED1,
+        TPS65917_PWRON_IRQ,
+        TPS65917_LONG_PRESS_KEY_IRQ,
+        TPS65917_RESERVED2,
+        TPS65917_PWRDOWN_IRQ,
+        TPS65917_HOTDIE_IRQ,
+        TPS65917_VSYS_MON_IRQ,
+        TPS65917_RESERVED3,
+        /* INT2 registers */
+        TPS65917_RESERVED4,
+        TPS65917_OTP_ERROR_IRQ,
+        TPS65917_WDT_IRQ,
+        TPS65917_RESERVED5,
+        TPS65917_RESET_IN_IRQ,
+        TPS65917_FSD_IRQ,
+        TPS65917_SHORT_IRQ,
+        TPS65917_RESERVED6,
+        /* INT3 registers */
+        TPS65917_GPADC_AUTO_0_IRQ,
+        TPS65917_GPADC_AUTO_1_IRQ,
+        TPS65917_GPADC_EOC_SW_IRQ,
+        TPS65917_RESREVED6,
+        TPS65917_RESERVED7,
+        TPS65917_RESERVED8,
+        TPS65917_RESERVED9,
+        TPS65917_VBUS_IRQ,
+        /* INT4 registers */
+        TPS65917_GPIO_0_IRQ,
+        TPS65917_GPIO_1_IRQ,
+        TPS65917_GPIO_2_IRQ,
+        TPS65917_GPIO_3_IRQ,