Merge branch 'regulator-register' into regulator-drivers

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

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

diff --cc drivers/regulator/lp3971.c
index 2013525f4bf9b08874c11615198c6929ed960634,3e0d001b599eed451610f11381f2f8c088db9546..499986e00fb200a9880930f2a63686d90c681277
--- 1/drivers/regulator/lp3971.c
--- 2/drivers/regulator/lp3971.c
+++ b/drivers/regulator/lp3971.c
@@@ -278,10 -306,10 +278,10 @@@ static struct regulator_ops lp3971_dcdc
        .enable = lp3971_dcdc_enable,
        .disable = lp3971_dcdc_disable,
        .get_voltage = lp3971_dcdc_get_voltage,
 -      .set_voltage = lp3971_dcdc_set_voltage,
 +      .set_voltage_sel = lp3971_dcdc_set_voltage_sel,
  };
  
- static struct regulator_desc regulators[] = {
+ static const struct regulator_desc regulators[] = {
        {
                .name = "LDO1",
                .id = LP3971_LDO1,

diff --cc drivers/regulator/lp3972.c
index 4f28d36600a5754506229eca86c2bdd3bf4f663b,2e48621ef8b6ead0de8d16e0d33cea8096a5e691..fbe3a58a71f2435cf893399625969d7eb15a647d
--- 1/drivers/regulator/lp3972.c
--- 2/drivers/regulator/lp3972.c
+++ b/drivers/regulator/lp3972.c
@@@ -441,10 -468,10 +441,10 @@@ static struct regulator_ops lp3972_dcdc
        .enable = lp3972_dcdc_enable,
        .disable = lp3972_dcdc_disable,
        .get_voltage = lp3972_dcdc_get_voltage,
 -      .set_voltage = lp3972_dcdc_set_voltage,
 +      .set_voltage_sel = lp3972_dcdc_set_voltage_sel,
  };
  
- static struct regulator_desc regulators[] = {
+ static const struct regulator_desc regulators[] = {
        {
                .name = "LDO1",
                .id = LP3972_LDO1,

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

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

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

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

diff --cc drivers/regulator/pcf50633-regulator.c
index b62f4c856821d9010a9bb370b9998e22b1efe113,0f8ffed3dd229cd25bf822eb02e9f52d48c297b4..43163f14bec73bdef103856573e0a4e26ee05e44
--- 1/drivers/regulator/pcf50633-regulator.c
--- 2/drivers/regulator/pcf50633-regulator.c
+++ b/drivers/regulator/pcf50633-regulator.c
@@@ -267,9 -285,9 +267,9 @@@ static struct regulator_ops pcf50633_re
        .is_enabled = pcf50633_regulator_is_enabled,
  };
  
- static struct regulator_desc regulators[] = {
+ static const struct regulator_desc regulators[] = {
        [PCF50633_REGULATOR_AUTO] =
 -              PCF50633_REGULATOR("auto", PCF50633_REGULATOR_AUTO, 81),
 +              PCF50633_REGULATOR("auto", PCF50633_REGULATOR_AUTO, 128),
        [PCF50633_REGULATOR_DOWN1] =
                PCF50633_REGULATOR("down1", PCF50633_REGULATOR_DOWN1, 96),
        [PCF50633_REGULATOR_DOWN2] =