The regulator framework offers a generic regulator_list_voltage_table()
function which can directly look-up a regulator's voltage capabilities
using a table provided through the desc structure. This patch ensures
that information is available.
Signed-off-by: Lee Jones <lee.jo...@linaro.org>
---
drivers/regulator/ab8500.c | 19 ++++++-------------
1 file changed, 6 insertions(+), 13 deletions(-)
diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c
index 13948c8..e82b0ad 100644
--- a/drivers/regulator/ab8500.c
+++ b/drivers/regulator/ab8500.c
@@ -926,7 +926,7 @@ static struct ab8500_regulator_info
* Variable Voltage Regulators
* name, min mV, max mV,
* update bank, reg, mask, enable val
- * volt bank, reg, mask, table, table length
+ * volt bank, reg, mask
*/
[AB8505_LDO_AUX1] = {
.desc = {
@@ -1140,8 +1140,6 @@ static struct ab8500_regulator_info
.voltage_reg = 0x57,
.voltage_mask = 0x7,
.voltage_shift = 4,
- .voltages = ldo_vaudio_voltages,
- .voltages_len = ARRAY_SIZE(ldo_vaudio_voltages),
},
[AB8505_LDO_ANAMIC1] = {
.desc = {
@@ -1223,8 +1221,6 @@ static struct ab8500_regulator_info
.voltage_bank = 0x04,
.voltage_reg = 0x29,
.voltage_mask = 0x7,
- .voltages = ldo_vana_voltages,
- .voltages_len = ARRAY_SIZE(ldo_vana_voltages),
},
};
@@ -1235,7 +1231,7 @@ static struct ab8500_regulator_info
* Variable Voltage Regulators
* name, min mV, max mV,
* update bank, reg, mask, enable val
- * volt bank, reg, mask, table, table length
+ * volt bank, reg, mask
*/
[AB9540_LDO_AUX1] = {
.desc = {
@@ -1478,7 +1474,7 @@ static struct ab8500_regulator_info
* Variable Voltage Regulators
* name, min mV, max mV,
* update bank, reg, mask, enable val
- * volt bank, reg, mask, table, table length
+ * volt bank, reg, mask
*/
[AB8540_LDO_AUX1] = {
.desc = {
@@ -1581,6 +1577,7 @@ static struct ab8500_regulator_info
.id = AB8540_LDO_AUX5,
.owner = THIS_MODULE,
.n_voltages =
ARRAY_SIZE(ldo_vaux56_ab8540_voltages),
+ .volt_table = ldo_vaux56_ab8540_voltages,
},
.load_lp_uA = 20000,
/* values for Vaux5Regu register */
@@ -1594,8 +1591,6 @@ static struct ab8500_regulator_info
.voltage_bank = 0x04,
.voltage_reg = 0x33,
.voltage_mask = 0x3f,
- .voltages = ldo_vaux56_ab8540_voltages,
- .voltages_len =
ARRAY_SIZE(ldo_vaux56_ab8540_voltages),
},
[AB8540_LDO_AUX6] = {
.desc = {
@@ -1605,6 +1600,7 @@ static struct ab8500_regulator_info
.id = AB8540_LDO_AUX6,
.owner = THIS_MODULE,
.n_voltages =
ARRAY_SIZE(ldo_vaux56_ab8540_voltages),
+ .volt_table = ldo_vaux56_ab8540_voltages,
},
.load_lp_uA = 20000,
/* values for Vaux6Regu register */
@@ -1618,8 +1614,6 @@ static struct ab8500_regulator_info
.voltage_bank = 0x04,
.voltage_reg = 0x36,
.voltage_mask = 0x3f,
- .voltages = ldo_vaux56_ab8540_voltages,
- .voltages_len =
ARRAY_SIZE(ldo_vaux56_ab8540_voltages),
},
[AB8540_LDO_INTCORE] = {
.desc = {
@@ -1732,6 +1726,7 @@ static struct ab8500_regulator_info
.id = AB8540_LDO_DMIC,
.owner = THIS_MODULE,
.n_voltages = ARRAY_SIZE(ldo_vdmic_voltages),
+ .volt_table = ldo_vdmic_voltages,
},
.load_lp_uA = 1000,
.update_bank = 0x03,
@@ -1741,8 +1736,6 @@ static struct ab8500_regulator_info
.voltage_bank = 0x03,
.voltage_reg = 0x83,
.voltage_mask = 0xc0,
- .voltages = ldo_vdmic_voltages,
- .voltages_len = ARRAY_SIZE(ldo_vdmic_voltages),
},
/*
--
1.7.10.4
--
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/
