Merge remote-tracking branches 'regulator/topic/qcom-spmi', 'regulator/topic/rn5t618...

[sfrench/cifs-2.6.git] / drivers / regulator / qcom_smd-regulator.c

diff --git a/drivers/regulator/qcom_smd-regulator.c b/drivers/regulator/qcom_smd-regulator.c
index 526bf23dcb49a543032c6ac17da76c2e09009545..5022fa8d10c6bc399970c26b2392fcea5dd54385 100644 (file)
--- a/drivers/regulator/qcom_smd-regulator.c
+++ b/drivers/regulator/qcom_smd-regulator.c
@@ -152,7 +152,6 @@ static const struct regulator_ops rpm_smps_ldo_ops_fixed = {
        .enable = rpm_reg_enable,
        .disable = rpm_reg_disable,
        .is_enabled = rpm_reg_is_enabled,
-       .list_voltage = regulator_list_voltage_linear_range,
 
        .get_voltage = rpm_reg_get_voltage,
        .set_voltage = rpm_reg_set_voltage,
@@ -212,7 +211,7 @@ static const struct regulator_desc pma8084_switch = {
 static const struct regulator_desc pm8x41_hfsmps = {
        .linear_ranges = (struct regulator_linear_range[]) {
                REGULATOR_LINEAR_RANGE( 375000,  0,  95, 12500),
-               REGULATOR_LINEAR_RANGE(1550000, 96, 158, 25000),
+               REGULATOR_LINEAR_RANGE(1575000, 96, 158, 25000),
        },
        .n_linear_ranges = 2,
        .n_voltages = 159,