There are a few over-lapping methods for voltage selection operating
in the AB8500 regulator driver currently. This patch removes unused,
unnecessary variables from the regulator_info structures and provides
voltage tables for those regulators which have fixed voltages.
Signed-off-by: Lee Jones <lee.jo...@linaro.org>
---
drivers/regulator/ab8500.c | 89 ++++++++++++++++++++------------------------
1 file changed, 41 insertions(+), 48 deletions(-)
diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c
index 3040985..3ffc8b1 100644
--- a/drivers/regulator/ab8500.c
+++ b/drivers/regulator/ab8500.c
@@ -142,6 +142,26 @@ static const int ldo_sdio_voltages[] = {
3050000,
};
+static const int fixed_1200000_voltage[] = {
+ 1200000,
+};
+
+static const int fixed_1800000_voltage[] = {
+ 1800000,
+};
+
+static const int fixed_2000000_voltage[] = {
+ 2000000,
+};
+
+static const int fixed_2050000_voltage[] = {
+ 2050000,
+};
+
+static const int fixed_3300000_voltage[] = {
+ 3300000,
+};
+
static int ab8500_regulator_enable(struct regulator_dev *rdev)
{
int ret;
@@ -400,7 +420,6 @@ static struct regulator_ops ab8500_regulator_mode_ops = {
.get_optimum_mode = ab8500_regulator_get_optimum_mode,
.set_mode = ab8500_regulator_set_mode,
.get_mode = ab8500_regulator_get_mode,
- .get_voltage_sel = ab8500_regulator_get_voltage_sel,
.list_voltage = regulator_list_voltage_table,
.set_voltage_time_sel = ab8500_regulator_set_voltage_time_sel,
};
@@ -409,7 +428,6 @@ static struct regulator_ops ab8500_regulator_ops = {
.enable = ab8500_regulator_enable,
.disable = ab8500_regulator_disable,
.is_enabled = ab8500_regulator_is_enabled,
- .get_voltage_sel = ab8500_regulator_get_voltage_sel,
.list_voltage = regulator_list_voltage_table,
};
@@ -521,7 +539,7 @@ static struct ab8500_regulator_info
.id = AB8500_LDO_TVOUT,
.owner = THIS_MODULE,
.n_voltages = 1,
- .min_uV = 2000000,
+ .volt_table = fixed_2000000_voltage,
.enable_time = 500,
},
.delay = 500,
@@ -541,7 +559,7 @@ static struct ab8500_regulator_info
.id = AB8500_LDO_AUDIO,
.owner = THIS_MODULE,
.n_voltages = 1,
- .min_uV = 2000000,
+ .volt_table = fixed_2000000_voltage,
},
.update_bank = 0x03,
.update_reg = 0x83,
@@ -556,7 +574,7 @@ static struct ab8500_regulator_info
.id = AB8500_LDO_ANAMIC1,
.owner = THIS_MODULE,
.n_voltages = 1,
- .min_uV = 2050000,
+ .volt_table = fixed_2050000_voltage,
},
.update_bank = 0x03,
.update_reg = 0x83,
@@ -571,7 +589,7 @@ static struct ab8500_regulator_info
.id = AB8500_LDO_ANAMIC2,
.owner = THIS_MODULE,
.n_voltages = 1,
- .min_uV = 2050000,
+ .volt_table = fixed_2050000_voltage,
},
.update_bank = 0x03,
.update_reg = 0x83,
@@ -586,7 +604,7 @@ static struct ab8500_regulator_info
.id = AB8500_LDO_DMIC,
.owner = THIS_MODULE,
.n_voltages = 1,
- .min_uV = 1800000,
+ .volt_table = fixed_1800000_voltage,
},
.update_bank = 0x03,
.update_reg = 0x83,
@@ -605,7 +623,7 @@ static struct ab8500_regulator_info
.id = AB8500_LDO_ANA,
.owner = THIS_MODULE,
.n_voltages = 1,
- .min_uV = 1200000,
+ .volt_table = fixed_1200000_voltage,
},
.load_lp_uA = 1000,
.update_bank = 0x04,
@@ -635,8 +653,6 @@ static struct ab8500_regulator_info
.owner = THIS_MODULE,
.n_voltages = ARRAY_SIZE(ldo_vauxn_voltages),
},
- .min_uV = 1100000,
- .max_uV = 3300000,
.load_lp_uA = 5000,
.update_bank = 0x04,
.update_reg = 0x09,
@@ -659,8 +675,6 @@ static struct ab8500_regulator_info
.owner = THIS_MODULE,
.n_voltages = ARRAY_SIZE(ldo_vauxn_voltages),
},
- .min_uV = 1100000,
- .max_uV = 3300000,
.load_lp_uA = 5000,
.update_bank = 0x04,
.update_reg = 0x09,
@@ -683,8 +697,6 @@ static struct ab8500_regulator_info
.owner = THIS_MODULE,
.n_voltages = ARRAY_SIZE(ldo_vaux3_voltages),
},
- .min_uV = 1100000,
- .max_uV = 3300000,
.load_lp_uA = 5000,
.update_bank = 0x04,
.update_reg = 0x0a,
@@ -707,8 +719,6 @@ static struct ab8500_regulator_info
.owner = THIS_MODULE,
.n_voltages = ARRAY_SIZE(ldo_vauxn_voltages),
},
- .min_uV = 1100000,
- .max_uV = 3300000,
.load_lp_uA = 5000,
/* values for Vaux4Regu register */
.update_bank = 0x04,
@@ -733,8 +743,6 @@ static struct ab8500_regulator_info
.owner = THIS_MODULE,
.n_voltages = ARRAY_SIZE(ldo_vaux56_voltages),
},
- .min_uV = 1050000,
- .max_uV = 2790000,
.load_lp_uA = 2000,
/* values for CtrlVaux5 register */
.update_bank = 0x01,
@@ -758,8 +766,6 @@ static struct ab8500_regulator_info
.owner = THIS_MODULE,
.n_voltages = ARRAY_SIZE(ldo_vaux56_voltages),
},
- .min_uV = 1050000,
- .max_uV = 2790000,
.load_lp_uA = 2000,
/* values for CtrlVaux6 register */
.update_bank = 0x01,
@@ -783,8 +789,6 @@ static struct ab8500_regulator_info
.owner = THIS_MODULE,
.n_voltages = ARRAY_SIZE(ldo_vintcore_voltages),
},
- .min_uV = 1100000,
- .max_uV = 3300000,
.load_lp_uA = 5000,
.update_bank = 0x03,
.update_reg = 0x80,
@@ -812,9 +816,9 @@ static struct ab8500_regulator_info
.id = AB8505_LDO_ADC,
.owner = THIS_MODULE,
.n_voltages = 1,
+ .volt_table = fixed_2000000_voltage,
},
.delay = 10000,
- .fixed_uV = 2000000,
.load_lp_uA = 1000,
.update_bank = 0x03,
.update_reg = 0x80,
@@ -831,8 +835,8 @@ static struct ab8500_regulator_info
.id = AB9540_LDO_USB,
.owner = THIS_MODULE,
.n_voltages = 1,
+ .volt_table = fixed_3300000_voltage,
},
- .fixed_uV = 3300000,
.update_bank = 0x03,
.update_reg = 0x82,
.update_mask = 0x03,
@@ -848,8 +852,8 @@ static struct ab8500_regulator_info
.id = AB8500_LDO_AUDIO,
.owner = THIS_MODULE,
.n_voltages = 1,
+ .volt_table = fixed_2000000_voltage,
},
- .fixed_uV = 2000000,
.update_bank = 0x03,
.update_reg = 0x83,
.update_mask = 0x02,
@@ -863,8 +867,8 @@ static struct ab8500_regulator_info
.id = AB8500_LDO_ANAMIC1,
.owner = THIS_MODULE,
.n_voltages = 1,
+ .volt_table = fixed_2050000_voltage,
},
- .fixed_uV = 2050000,
.update_bank = 0x03,
.update_reg = 0x83,
.update_mask = 0x08,
@@ -878,8 +882,8 @@ static struct ab8500_regulator_info
.id = AB8500_LDO_ANAMIC2,
.owner = THIS_MODULE,
.n_voltages = 1,
+ .volt_table = fixed_2050000_voltage,
},
- .fixed_uV = 2050000,
.update_bank = 0x03,
.update_reg = 0x83,
.update_mask = 0x10,
@@ -893,8 +897,8 @@ static struct ab8500_regulator_info
.id = AB8505_LDO_AUX8,
.owner = THIS_MODULE,
.n_voltages = 1,
+ .volt_table = fixed_1800000_voltage,
},
- .fixed_uV = 1800000,
.update_bank = 0x03,
.update_reg = 0x83,
.update_mask = 0x04,
@@ -911,8 +915,8 @@ static struct ab8500_regulator_info
.id = AB8500_LDO_ANA,
.owner = THIS_MODULE,
.n_voltages = 1,
+ .volt_table = fixed_1200000_voltage,
},
- .fixed_uV = 1200000,
.load_lp_uA = 1000,
.update_bank = 0x04,
.update_reg = 0x06,
@@ -941,8 +945,6 @@ static struct ab8500_regulator_info
.owner = THIS_MODULE,
.n_voltages = ARRAY_SIZE(ldo_vauxn_voltages),
},
- .min_uV = 1100000,
- .max_uV = 3300000,
.load_lp_uA = 5000,
.update_bank = 0x04,
.update_reg = 0x09,
@@ -965,8 +967,6 @@ static struct ab8500_regulator_info
.owner = THIS_MODULE,
.n_voltages = ARRAY_SIZE(ldo_vauxn_voltages),
},
- .min_uV = 1100000,
- .max_uV = 3300000,
.load_lp_uA = 5000,
.update_bank = 0x04,
.update_reg = 0x09,
@@ -989,8 +989,6 @@ static struct ab8500_regulator_info
.owner = THIS_MODULE,
.n_voltages = ARRAY_SIZE(ldo_vaux3_voltages),
},
- .min_uV = 1100000,
- .max_uV = 3300000,
.load_lp_uA = 5000,
.update_bank = 0x04,
.update_reg = 0x0a,
@@ -1013,8 +1011,6 @@ static struct ab8500_regulator_info
.owner = THIS_MODULE,
.n_voltages = ARRAY_SIZE(ldo_vauxn_voltages),
},
- .min_uV = 1100000,
- .max_uV = 3300000,
.load_lp_uA = 5000,
/* values for Vaux4Regu register */
.update_bank = 0x04,
@@ -1039,8 +1035,6 @@ static struct ab8500_regulator_info
.owner = THIS_MODULE,
.n_voltages = ARRAY_SIZE(ldo_vintcore_voltages),
},
- .min_uV = 1100000,
- .max_uV = 3300000,
.load_lp_uA = 5000,
.update_bank = 0x03,
.update_reg = 0x80,
@@ -1068,9 +1062,9 @@ static struct ab8500_regulator_info
.id = AB8500_LDO_TVOUT,
.owner = THIS_MODULE,
.n_voltages = 1,
+ .volt_table = fixed_2000000_voltage,
},
.delay = 10000,
- .fixed_uV = 2000000,
.load_lp_uA = 1000,
.update_bank = 0x03,
.update_reg = 0x80,
@@ -1087,8 +1081,8 @@ static struct ab8500_regulator_info
.id = AB9540_LDO_USB,
.owner = THIS_MODULE,
.n_voltages = 1,
+ .volt_table = fixed_3300000_voltage,
},
- .fixed_uV = 3300000,
.update_bank = 0x03,
.update_reg = 0x82,
.update_mask = 0x03,
@@ -1104,8 +1098,8 @@ static struct ab8500_regulator_info
.id = AB8500_LDO_AUDIO,
.owner = THIS_MODULE,
.n_voltages = 1,
+ .volt_table = fixed_2000000_voltage,
},
- .fixed_uV = 2000000,
.update_bank = 0x03,
.update_reg = 0x83,
.update_mask = 0x02,
@@ -1119,8 +1113,8 @@ static struct ab8500_regulator_info
.id = AB8500_LDO_ANAMIC1,
.owner = THIS_MODULE,
.n_voltages = 1,
+ .volt_table = fixed_2050000_voltage,
},
- .fixed_uV = 2050000,
.update_bank = 0x03,
.update_reg = 0x83,
.update_mask = 0x08,
@@ -1134,8 +1128,8 @@ static struct ab8500_regulator_info
.id = AB8500_LDO_ANAMIC2,
.owner = THIS_MODULE,
.n_voltages = 1,
+ .volt_table = fixed_2050000_voltage,
},
- .fixed_uV = 2050000,
.update_bank = 0x03,
.update_reg = 0x83,
.update_mask = 0x10,
@@ -1149,8 +1143,8 @@ static struct ab8500_regulator_info
.id = AB8500_LDO_DMIC,
.owner = THIS_MODULE,
.n_voltages = 1,
+ .volt_table = fixed_1800000_voltage,
},
- .fixed_uV = 1800000,
.update_bank = 0x03,
.update_reg = 0x83,
.update_mask = 0x04,
@@ -1168,8 +1162,8 @@ static struct ab8500_regulator_info
.id = AB8500_LDO_ANA,
.owner = THIS_MODULE,
.n_voltages = 1,
+ .volt_table = fixed_1200000_voltage,
},
- .fixed_uV = 1200000,
.load_lp_uA = 1000,
.load_lp_uA = 1000,
.update_bank = 0x04,
@@ -1198,6 +1192,7 @@ static struct ab8500_regulator_info
.id = AB8500_LDO_AUX1,
.owner = THIS_MODULE,
.n_voltages = ARRAY_SIZE(ldo_vauxn_voltages),
+ .volt_table = ldo_vauxn_voltages,
},
.load_lp_uA = 5000,
.update_bank = 0x04,
@@ -1412,8 +1407,6 @@ static struct ab8500_regulator_info
.owner = THIS_MODULE,
.n_voltages = ARRAY_SIZE(ldo_sdio_voltages),
},
- .min_uV = 1050000,
- .max_uV = 3050000,
.load_lp_uA = 5000,
.update_bank = 0x03,
.update_reg = 0x88,
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
