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

Pull regulator updates from Mark Brown:
 "The bulk of the changes for this release are a few new drivers however
  there are a couple of noticable core changes and the usual stream of
  cleanups and fixes:

   - move disable of unused regulators later in init so it comes after
     deferred probe has iterated making startup smoother.
   - fixes to reference counting of the DT nodes for constraints from
     Charles Keepax.  This has little practical impact since all real
     users of the regulator bindings use FDT which doesn't need the
     reference counting.
   - lots of cleanups, especially to the Samsung drivers.
   - support for Linear Technologies LTC3589, Texas Instruments
     TPS658640 and X-Powers AXP20x"

* tag 'regulator-v3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: (64 commits)
  regulator: pbias: remove unnecessary OOM messages
  regulator: max8649: remove unnecessary OOM messages
  regulator: core: Fix the init of DT defined fixed regulators
  regulator: core: Disable unused regulators after deferred probing is done
  regulator: Don't disable unused regulators we don't have permission for
  regulator: axp20x: Use regulator_map_voltage_ascend for LDO4
  regulator: use of_property_read_{bool|u32}()
  regulator: Fix regulator_get_{optional,exclusive}() documentation
  regulators: Add definition of regulator_set_voltage_time() for !CONFIG_REGULATOR
  regulator: arizona-ldo1: add missing #include
  regulator: pfuze100: Support enable/disable for fixed regulator
  regulator: ltc3589: Remove ltc3589_list_voltage_fixed function
  regulator: ltc3589: Fix module dependency
  regulator: tps6586x: Remove unused to_tps6586x_dev() function
  regulator: tps65218: Convert to use regulator_set_voltage_time_sel
  regulator: tps6586x: Add support for the TPS658640
  regulator: tps6586x: Prepare supporting fixed regulators
  regulator: pfuze100: Don't allocate an invalid gpio
  regulator: pfuze100: Support SWB enable/disable
  regulator: fixed: use of_property_read_{bool|u32}()
  ...

diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
Simple merge

diff --cc drivers/regulator/Kconfig
index f0cc9e6,c2fa0b4..789eb46
--- 1/drivers/regulator/Kconfig
--- 2/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@@ -265,13 -272,20 +272,21 @@@ config REGULATOR_LP878
        help
          This driver supports LP8788 voltage regulator chip.
  
+ config REGULATOR_LTC3589
+       tristate "LTC3589 8-output voltage regulator"
+       depends on I2C
+       select REGMAP_I2C
+       help
+         This enables support for the LTC3589, LTC3589-1, and LTC3589-2
+         8-output regulators controlled via I2C.
+ 
  config REGULATOR_MAX14577
 -      tristate "Maxim 14577 regulator"
 +      tristate "Maxim 14577/77836 regulator"
        depends on MFD_MAX14577
        help
 -        This driver controls a Maxim 14577 regulator via I2C bus.
 -        The regulators include safeout LDO and current regulator 'CHARGER'.
 +        This driver controls a Maxim MAX14577/77836 regulator via I2C bus.
 +        The MAX14577 regulators include safeout LDO and charger current
 +        regulator. The MAX77836 has two additional LDOs.
  
  config REGULATOR_MAX1586
        tristate "Maxim 1586/1587 voltage regulator"

diff --cc drivers/regulator/vexpress.c
index 2863428,147ecc7..02e7267
--- 1/drivers/regulator/vexpress.c
--- 2/drivers/regulator/vexpress.c
+++ b/drivers/regulator/vexpress.c
@@@ -96,9 -105,25 +96,9 @@@ static int vexpress_regulator_probe(str
        platform_set_drvdata(pdev, reg);
  
        return 0;
 -
 -error_regulator_register:
 -error_get_regulator_init_data:
 -      vexpress_config_func_put(reg->func);
 -error_get_func:
 -error_kzalloc:
 -      return err;
 -}
 -
 -static int vexpress_regulator_remove(struct platform_device *pdev)
 -{
 -      struct vexpress_regulator *reg = platform_get_drvdata(pdev);
 -
 -      vexpress_config_func_put(reg->func);
 -
 -      return 0;
  }
  
- static struct of_device_id vexpress_regulator_of_match[] = {
+ static const struct of_device_id vexpress_regulator_of_match[] = {
        { .compatible = "arm,vexpress-volt", },
        { }
  };