Merge branch 'fix/88pm800' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

Conflicts:
	drivers/regulator/88pm800.c

diff --cc drivers/regulator/88pm800.c
index 26c277f7c98e4371d21639ee3a2a7170448f9d1c,7fd4f511d78fd6bdc685c857e280f1581d20b035..a62a89674fb5f6f82b8223067a6e1ff2b62ade21
--- 1/drivers/regulator/88pm800.c
--- 2/drivers/regulator/88pm800.c
+++ b/drivers/regulator/88pm800.c
@@@ -121,24 -120,22 +121,24 @@@ struct pm800_regulators 
   * For all the LDOes, there are too many ranges. Using volt_table will be
   * simpler and faster.
   */
 -#define PM800_LDO(vreg, ereg, ebit, amax, ldo_volt_table)             \
 +#define PM800_LDO(match, vreg, ereg, ebit, amax, ldo_volt_table)      \
  {                                                                     \
        .desc   = {                                                     \
 -              .name   = #vreg,                                        \
 -              .ops    = &pm800_volt_table_ops,                        \
 -              .type   = REGULATOR_VOLTAGE,                            \
 -              .id     = PM800_ID_##vreg,                              \
 -              .owner  = THIS_MODULE,                                  \
 -              .n_voltages = ARRAY_SIZE(ldo_volt_table),               \
 -              .vsel_reg       = PM800_##vreg##_VOUT,                  \
 -              .vsel_mask      = 0xf,                                  \
 -              .enable_reg     = PM800_##ereg,                         \
 -              .enable_mask    = 1 << (ebit),                          \
 -              .volt_table     = ldo_volt_table,                       \
 +              .name                   = #vreg,                        \
 +              .of_match               = of_match_ptr(#match),         \
 +              .regulators_node        = of_match_ptr("regulators"),   \
 +              .ops                    = &pm800_volt_table_ops,        \
 +              .type                   = REGULATOR_VOLTAGE,            \
 +              .id                     = PM800_ID_##vreg,              \
 +              .owner                  = THIS_MODULE,                  \
 +              .n_voltages             = ARRAY_SIZE(ldo_volt_table),   \
 +              .vsel_reg               = PM800_##vreg##_VOUT,          \
-               .vsel_mask              = 0x1f,                         \
++              .vsel_mask              = 0xf,                          \
 +              .enable_reg             = PM800_##ereg,                 \
 +              .enable_mask            = 1 << (ebit),                  \
 +              .volt_table             = ldo_volt_table,               \
        },                                                              \
 -      .max_ua         = (amax),                                       \
 +      .max_ua = (amax),                                               \
  }
  
  /* Ranges are sorted in ascending order. */