Merge remote-tracking branches 'regulator/fix/pfuze100', 'regulator/fix/s5m8767'...

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

diff --cc drivers/regulator/arizona-micsupp.c
index fd3154d86901fcf3865139d42bc997d72b4ff608,fd3154d86901fcf3865139d42bc997d72b4ff608,724706a97dc40c5cf7e21d89f7c58bc2385f6226,724706a97dc40c5cf7e21d89f7c58bc2385f6226,724706a97dc40c5cf7e21d89f7c58bc2385f6226,724706a97dc40c5cf7e21d89f7c58bc2385f6226,3c75bf82eeb56734ecbf2d12889c54aea87760cb,724706a97dc40c5cf7e21d89f7c58bc2385f6226..034ece7070838991a59d45f88f0e0ace95c6abba
--- 1/drivers/regulator/arizona-micsupp.c
--- 2/drivers/regulator/arizona-micsupp.c
--- 3/drivers/regulator/arizona-micsupp.c
--- 4/drivers/regulator/arizona-micsupp.c
--- 5/drivers/regulator/arizona-micsupp.c
--- 6/drivers/regulator/arizona-micsupp.c
--- 7/drivers/regulator/arizona-micsupp.c
--- 8/drivers/regulator/arizona-micsupp.c
+++ b/drivers/regulator/arizona-micsupp.c
@@@@@@@@@ -159,48 -159,48 -159,21 -159,21 -159,21 -159,21 -126,24 -159,21 +126,51 @@@@@@@@@ static const struct regulator_desc ariz
                .name = "MICVDD",
                .supply_name = "CPVDD",
                .type = REGULATOR_VOLTAGE,
------ -        .n_voltages = ARIZONA_MICSUPP_MAX_SELECTOR + 1,
++++++ +        .n_voltages = 32,
  ++++ +        .ops = &arizona_micsupp_ops,
  ++++ +
  ++++ +        .vsel_reg = ARIZONA_LDO2_CONTROL_1,
  ++++ +        .vsel_mask = ARIZONA_LDO2_VSEL_MASK,
  ++++ +        .enable_reg = ARIZONA_MIC_CHARGE_PUMP_1,
  ++++ +        .enable_mask = ARIZONA_CPMIC_ENA,
  ++++ +        .bypass_reg = ARIZONA_MIC_CHARGE_PUMP_1,
  ++++ +        .bypass_mask = ARIZONA_CPMIC_BYPASS,
  ++++ +
++++++ +        .linear_ranges = arizona_micsupp_ranges,
++++++ +        .n_linear_ranges = ARRAY_SIZE(arizona_micsupp_ranges),
++++++ +
  ++++ +        .enable_time = 3000,
  ++++ +
  ++++ +        .owner = THIS_MODULE,
  ++++ +};
  ++++ +
  ++++++static const struct regulator_linear_range arizona_micsupp_ext_ranges[] = {
  ++++++        REGULATOR_LINEAR_RANGE(900000,  0,    0x14, 25000),
  ++++++        REGULATOR_LINEAR_RANGE(1500000, 0x15, 0x27, 100000),
  ++++++};
  ++++++
  ++++++static const struct regulator_desc arizona_micsupp_ext = {
  ++++++        .name = "MICVDD",
  ++++++        .supply_name = "CPVDD",
  ++++++        .type = REGULATOR_VOLTAGE,
  ++++++        .n_voltages = 40,
      +         .ops = &arizona_micsupp_ops,
      + 
      +         .vsel_reg = ARIZONA_LDO2_CONTROL_1,
      +         .vsel_mask = ARIZONA_LDO2_VSEL_MASK,
      +         .enable_reg = ARIZONA_MIC_CHARGE_PUMP_1,
      +         .enable_mask = ARIZONA_CPMIC_ENA,
      +         .bypass_reg = ARIZONA_MIC_CHARGE_PUMP_1,
      +         .bypass_mask = ARIZONA_CPMIC_BYPASS,
      + 
  ++++++        .linear_ranges = arizona_micsupp_ext_ranges,
  ++++++        .n_linear_ranges = ARRAY_SIZE(arizona_micsupp_ext_ranges),
  ++++++
      +         .enable_time = 3000,
      + 
      +         .owner = THIS_MODULE,
      + };
      + 
        static const struct regulator_init_data arizona_micsupp_default = {
                .constraints = {
                        .valid_ops_mask = REGULATOR_CHANGE_STATUS |

diff --cc drivers/regulator/as3722-regulator.c
Simple merge