Skip to content

L
linux
Commit 0b946411 authored by Lee Jones's avatar Lee Jones Committed by Mark Brown
Browse files
Options

regulator: ab8500: Supply platform specific regulator id values 

The regulator ID in the regulator info array should be the same
values as the position of the element within the array.
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 0fe17e20
Hide whitespace changes
Inline Side-by-side
Showing with 31 additions and 31 deletions
drivers/regulator/ab8500.c
View file @ 0b946411
...@@ -659,7 +659,7 @@ static struct ab8500_regulator_info ...@@ -659,7 +659,7 @@ static struct ab8500_regulator_info
.name = "LDO-AUX1", .name = "LDO-AUX1",
.ops = &ab8500_regulator_volt_mode_ops, .ops = &ab8500_regulator_volt_mode_ops,
.type = REGULATOR_VOLTAGE, .type = REGULATOR_VOLTAGE,
.id = AB8500_LDO_AUX1, .id = AB8505_LDO_AUX1,
.owner = THIS_MODULE, .owner = THIS_MODULE,
.n_voltages = ARRAY_SIZE(ldo_vauxn_voltages), .n_voltages = ARRAY_SIZE(ldo_vauxn_voltages),
.volt_table = ldo_vauxn_voltages, .volt_table = ldo_vauxn_voltages,
...@@ -680,7 +680,7 @@ static struct ab8500_regulator_info ...@@ -680,7 +680,7 @@ static struct ab8500_regulator_info
.name = "LDO-AUX2", .name = "LDO-AUX2",
.ops = &ab8500_regulator_volt_mode_ops, .ops = &ab8500_regulator_volt_mode_ops,
.type = REGULATOR_VOLTAGE, .type = REGULATOR_VOLTAGE,
.id = AB8500_LDO_AUX2, .id = AB8505_LDO_AUX2,
.owner = THIS_MODULE, .owner = THIS_MODULE,
.n_voltages = ARRAY_SIZE(ldo_vauxn_voltages), .n_voltages = ARRAY_SIZE(ldo_vauxn_voltages),
.volt_table = ldo_vauxn_voltages, .volt_table = ldo_vauxn_voltages,
...@@ -701,7 +701,7 @@ static struct ab8500_regulator_info ...@@ -701,7 +701,7 @@ static struct ab8500_regulator_info
.name = "LDO-AUX3", .name = "LDO-AUX3",
.ops = &ab8500_regulator_volt_mode_ops, .ops = &ab8500_regulator_volt_mode_ops,
.type = REGULATOR_VOLTAGE, .type = REGULATOR_VOLTAGE,
.id = AB8500_LDO_AUX3, .id = AB8505_LDO_AUX3,
.owner = THIS_MODULE, .owner = THIS_MODULE,
.n_voltages = ARRAY_SIZE(ldo_vaux3_voltages), .n_voltages = ARRAY_SIZE(ldo_vaux3_voltages),
.volt_table = ldo_vaux3_voltages, .volt_table = ldo_vaux3_voltages,
...@@ -722,7 +722,7 @@ static struct ab8500_regulator_info ...@@ -722,7 +722,7 @@ static struct ab8500_regulator_info
.name = "LDO-AUX4", .name = "LDO-AUX4",
.ops = &ab8500_regulator_volt_mode_ops, .ops = &ab8500_regulator_volt_mode_ops,
.type = REGULATOR_VOLTAGE, .type = REGULATOR_VOLTAGE,
.id = AB9540_LDO_AUX4, .id = AB8505_LDO_AUX4,
.owner = THIS_MODULE, .owner = THIS_MODULE,
.n_voltages = ARRAY_SIZE(ldo_vauxn_voltages), .n_voltages = ARRAY_SIZE(ldo_vauxn_voltages),
.volt_table = ldo_vauxn_voltages, .volt_table = ldo_vauxn_voltages,
...@@ -789,7 +789,7 @@ static struct ab8500_regulator_info ...@@ -789,7 +789,7 @@ static struct ab8500_regulator_info
.name = "LDO-INTCORE", .name = "LDO-INTCORE",
.ops = &ab8500_regulator_volt_mode_ops, .ops = &ab8500_regulator_volt_mode_ops,
.type = REGULATOR_VOLTAGE, .type = REGULATOR_VOLTAGE,
.id = AB8500_LDO_INTCORE, .id = AB8505_LDO_INTCORE,
.owner = THIS_MODULE, .owner = THIS_MODULE,
.n_voltages = ARRAY_SIZE(ldo_vintcore_voltages), .n_voltages = ARRAY_SIZE(ldo_vintcore_voltages),
.volt_table = ldo_vintcore_voltages, .volt_table = ldo_vintcore_voltages,
...@@ -836,7 +836,7 @@ static struct ab8500_regulator_info ...@@ -836,7 +836,7 @@ static struct ab8500_regulator_info
.name = "LDO-USB", .name = "LDO-USB",
.ops = &ab8500_regulator_mode_ops, .ops = &ab8500_regulator_mode_ops,
.type = REGULATOR_VOLTAGE, .type = REGULATOR_VOLTAGE,
.id = AB9540_LDO_USB, .id = AB8505_LDO_USB,
.owner = THIS_MODULE, .owner = THIS_MODULE,
.n_voltages = 1, .n_voltages = 1,
.volt_table = fixed_3300000_voltage, .volt_table = fixed_3300000_voltage,
...@@ -853,7 +853,7 @@ static struct ab8500_regulator_info ...@@ -853,7 +853,7 @@ static struct ab8500_regulator_info
.name = "LDO-AUDIO", .name = "LDO-AUDIO",
.ops = &ab8500_regulator_ops, .ops = &ab8500_regulator_ops,
.type = REGULATOR_VOLTAGE, .type = REGULATOR_VOLTAGE,
.id = AB8500_LDO_AUDIO, .id = AB8505_LDO_AUDIO,
.owner = THIS_MODULE, .owner = THIS_MODULE,
.n_voltages = 1, .n_voltages = 1,
.volt_table = fixed_2000000_voltage, .volt_table = fixed_2000000_voltage,
...@@ -868,7 +868,7 @@ static struct ab8500_regulator_info ...@@ -868,7 +868,7 @@ static struct ab8500_regulator_info
.name = "LDO-ANAMIC1", .name = "LDO-ANAMIC1",
.ops = &ab8500_regulator_ops, .ops = &ab8500_regulator_ops,
.type = REGULATOR_VOLTAGE, .type = REGULATOR_VOLTAGE,
.id = AB8500_LDO_ANAMIC1, .id = AB8505_LDO_ANAMIC1,
.owner = THIS_MODULE, .owner = THIS_MODULE,
.n_voltages = 1, .n_voltages = 1,
.volt_table = fixed_2050000_voltage, .volt_table = fixed_2050000_voltage,
...@@ -883,7 +883,7 @@ static struct ab8500_regulator_info ...@@ -883,7 +883,7 @@ static struct ab8500_regulator_info
.name = "LDO-ANAMIC2", .name = "LDO-ANAMIC2",
.ops = &ab8500_regulator_ops, .ops = &ab8500_regulator_ops,
.type = REGULATOR_VOLTAGE, .type = REGULATOR_VOLTAGE,
.id = AB8500_LDO_ANAMIC2, .id = AB8505_LDO_ANAMIC2,
.owner = THIS_MODULE, .owner = THIS_MODULE,
.n_voltages = 1, .n_voltages = 1,
.volt_table = fixed_2050000_voltage, .volt_table = fixed_2050000_voltage,
...@@ -916,7 +916,7 @@ static struct ab8500_regulator_info ...@@ -916,7 +916,7 @@ static struct ab8500_regulator_info
.name = "LDO-ANA", .name = "LDO-ANA",
.ops = &ab8500_regulator_mode_ops, .ops = &ab8500_regulator_mode_ops,
.type = REGULATOR_VOLTAGE, .type = REGULATOR_VOLTAGE,
.id = AB8500_LDO_ANA, .id = AB8505_LDO_ANA,
.owner = THIS_MODULE, .owner = THIS_MODULE,
.n_voltages = 1, .n_voltages = 1,
.volt_table = fixed_1200000_voltage, .volt_table = fixed_1200000_voltage,
...@@ -945,7 +945,7 @@ static struct ab8500_regulator_info ...@@ -945,7 +945,7 @@ static struct ab8500_regulator_info
.name = "LDO-AUX1", .name = "LDO-AUX1",
.ops = &ab8500_regulator_volt_mode_ops, .ops = &ab8500_regulator_volt_mode_ops,
.type = REGULATOR_VOLTAGE, .type = REGULATOR_VOLTAGE,
.id = AB8500_LDO_AUX1, .id = AB9540_LDO_AUX1,
.owner = THIS_MODULE, .owner = THIS_MODULE,
.n_voltages = ARRAY_SIZE(ldo_vauxn_voltages), .n_voltages = ARRAY_SIZE(ldo_vauxn_voltages),
.volt_table = ldo_vauxn_voltages, .volt_table = ldo_vauxn_voltages,
...@@ -966,7 +966,7 @@ static struct ab8500_regulator_info ...@@ -966,7 +966,7 @@ static struct ab8500_regulator_info
.name = "LDO-AUX2", .name = "LDO-AUX2",
.ops = &ab8500_regulator_volt_mode_ops, .ops = &ab8500_regulator_volt_mode_ops,
.type = REGULATOR_VOLTAGE, .type = REGULATOR_VOLTAGE,
.id = AB8500_LDO_AUX2, .id = AB9540_LDO_AUX2,
.owner = THIS_MODULE, .owner = THIS_MODULE,
.n_voltages = ARRAY_SIZE(ldo_vauxn_voltages), .n_voltages = ARRAY_SIZE(ldo_vauxn_voltages),
.volt_table = ldo_vauxn_voltages, .volt_table = ldo_vauxn_voltages,
...@@ -987,7 +987,7 @@ static struct ab8500_regulator_info ...@@ -987,7 +987,7 @@ static struct ab8500_regulator_info
.name = "LDO-AUX3", .name = "LDO-AUX3",
.ops = &ab8500_regulator_volt_mode_ops, .ops = &ab8500_regulator_volt_mode_ops,
.type = REGULATOR_VOLTAGE, .type = REGULATOR_VOLTAGE,
.id = AB8500_LDO_AUX3, .id = AB9540_LDO_AUX3,
.owner = THIS_MODULE, .owner = THIS_MODULE,
.n_voltages = ARRAY_SIZE(ldo_vaux3_voltages), .n_voltages = ARRAY_SIZE(ldo_vaux3_voltages),
.volt_table = ldo_vaux3_voltages, .volt_table = ldo_vaux3_voltages,
...@@ -1031,7 +1031,7 @@ static struct ab8500_regulator_info ...@@ -1031,7 +1031,7 @@ static struct ab8500_regulator_info
.name = "LDO-INTCORE", .name = "LDO-INTCORE",
.ops = &ab8500_regulator_volt_mode_ops, .ops = &ab8500_regulator_volt_mode_ops,
.type = REGULATOR_VOLTAGE, .type = REGULATOR_VOLTAGE,
.id = AB8500_LDO_INTCORE, .id = AB9540_LDO_INTCORE,
.owner = THIS_MODULE, .owner = THIS_MODULE,
.n_voltages = ARRAY_SIZE(ldo_vintcore_voltages), .n_voltages = ARRAY_SIZE(ldo_vintcore_voltages),
.volt_table = ldo_vintcore_voltages, .volt_table = ldo_vintcore_voltages,
...@@ -1059,7 +1059,7 @@ static struct ab8500_regulator_info ...@@ -1059,7 +1059,7 @@ static struct ab8500_regulator_info
.name = "LDO-TVOUT", .name = "LDO-TVOUT",
.ops = &ab8500_regulator_mode_ops, .ops = &ab8500_regulator_mode_ops,
.type = REGULATOR_VOLTAGE, .type = REGULATOR_VOLTAGE,
.id = AB8500_LDO_TVOUT, .id = AB9540_LDO_TVOUT,
.owner = THIS_MODULE, .owner = THIS_MODULE,
.n_voltages = 1, .n_voltages = 1,
.volt_table = fixed_2000000_voltage, .volt_table = fixed_2000000_voltage,
...@@ -1095,7 +1095,7 @@ static struct ab8500_regulator_info ...@@ -1095,7 +1095,7 @@ static struct ab8500_regulator_info
.name = "LDO-AUDIO", .name = "LDO-AUDIO",
.ops = &ab8500_regulator_ops, .ops = &ab8500_regulator_ops,
.type = REGULATOR_VOLTAGE, .type = REGULATOR_VOLTAGE,
.id = AB8500_LDO_AUDIO, .id = AB9540_LDO_AUDIO,
.owner = THIS_MODULE, .owner = THIS_MODULE,
.n_voltages = 1, .n_voltages = 1,
.volt_table = fixed_2000000_voltage, .volt_table = fixed_2000000_voltage,
...@@ -1110,7 +1110,7 @@ static struct ab8500_regulator_info ...@@ -1110,7 +1110,7 @@ static struct ab8500_regulator_info
.name = "LDO-ANAMIC1", .name = "LDO-ANAMIC1",
.ops = &ab8500_regulator_ops, .ops = &ab8500_regulator_ops,
.type = REGULATOR_VOLTAGE, .type = REGULATOR_VOLTAGE,
.id = AB8500_LDO_ANAMIC1, .id = AB9540_LDO_ANAMIC1,
.owner = THIS_MODULE, .owner = THIS_MODULE,
.n_voltages = 1, .n_voltages = 1,
.volt_table = fixed_2050000_voltage, .volt_table = fixed_2050000_voltage,
...@@ -1125,7 +1125,7 @@ static struct ab8500_regulator_info ...@@ -1125,7 +1125,7 @@ static struct ab8500_regulator_info
.name = "LDO-ANAMIC2", .name = "LDO-ANAMIC2",
.ops = &ab8500_regulator_ops, .ops = &ab8500_regulator_ops,
.type = REGULATOR_VOLTAGE, .type = REGULATOR_VOLTAGE,
.id = AB8500_LDO_ANAMIC2, .id = AB9540_LDO_ANAMIC2,
.owner = THIS_MODULE, .owner = THIS_MODULE,
.n_voltages = 1, .n_voltages = 1,
.volt_table = fixed_2050000_voltage, .volt_table = fixed_2050000_voltage,
...@@ -1140,7 +1140,7 @@ static struct ab8500_regulator_info ...@@ -1140,7 +1140,7 @@ static struct ab8500_regulator_info
.name = "LDO-DMIC", .name = "LDO-DMIC",
.ops = &ab8500_regulator_ops, .ops = &ab8500_regulator_ops,
.type = REGULATOR_VOLTAGE, .type = REGULATOR_VOLTAGE,
.id = AB8500_LDO_DMIC, .id = AB9540_LDO_DMIC,
.owner = THIS_MODULE, .owner = THIS_MODULE,
.n_voltages = 1, .n_voltages = 1,
.volt_table = fixed_1800000_voltage, .volt_table = fixed_1800000_voltage,
...@@ -1159,7 +1159,7 @@ static struct ab8500_regulator_info ...@@ -1159,7 +1159,7 @@ static struct ab8500_regulator_info
.name = "LDO-ANA", .name = "LDO-ANA",
.ops = &ab8500_regulator_mode_ops, .ops = &ab8500_regulator_mode_ops,
.type = REGULATOR_VOLTAGE, .type = REGULATOR_VOLTAGE,
.id = AB8500_LDO_ANA, .id = AB9540_LDO_ANA,
.owner = THIS_MODULE, .owner = THIS_MODULE,
.n_voltages = 1, .n_voltages = 1,
.volt_table = fixed_1200000_voltage, .volt_table = fixed_1200000_voltage,
...@@ -1188,7 +1188,7 @@ static struct ab8500_regulator_info ...@@ -1188,7 +1188,7 @@ static struct ab8500_regulator_info
.name = "LDO-AUX1", .name = "LDO-AUX1",
.ops = &ab8500_regulator_volt_mode_ops, .ops = &ab8500_regulator_volt_mode_ops,
.type = REGULATOR_VOLTAGE, .type = REGULATOR_VOLTAGE,
.id = AB8500_LDO_AUX1, .id = AB8540_LDO_AUX1,
.owner = THIS_MODULE, .owner = THIS_MODULE,
.n_voltages = ARRAY_SIZE(ldo_vauxn_voltages), .n_voltages = ARRAY_SIZE(ldo_vauxn_voltages),
.volt_table = ldo_vauxn_voltages, .volt_table = ldo_vauxn_voltages,
...@@ -1209,7 +1209,7 @@ static struct ab8500_regulator_info ...@@ -1209,7 +1209,7 @@ static struct ab8500_regulator_info
.name = "LDO-AUX2", .name = "LDO-AUX2",
.ops = &ab8500_regulator_volt_mode_ops, .ops = &ab8500_regulator_volt_mode_ops,
.type = REGULATOR_VOLTAGE, .type = REGULATOR_VOLTAGE,
.id = AB8500_LDO_AUX2, .id = AB8540_LDO_AUX2,
.owner = THIS_MODULE, .owner = THIS_MODULE,
.n_voltages = ARRAY_SIZE(ldo_vauxn_voltages), .n_voltages = ARRAY_SIZE(ldo_vauxn_voltages),
.volt_table = ldo_vauxn_voltages, .volt_table = ldo_vauxn_voltages,
...@@ -1230,7 +1230,7 @@ static struct ab8500_regulator_info ...@@ -1230,7 +1230,7 @@ static struct ab8500_regulator_info
.name = "LDO-AUX3", .name = "LDO-AUX3",
.ops = &ab8500_regulator_volt_mode_ops, .ops = &ab8500_regulator_volt_mode_ops,
.type = REGULATOR_VOLTAGE, .type = REGULATOR_VOLTAGE,
.id = AB8500_LDO_AUX3, .id = AB8540_LDO_AUX3,
.owner = THIS_MODULE, .owner = THIS_MODULE,
.n_voltages = ARRAY_SIZE(ldo_vaux3_ab8540_voltages), .n_voltages = ARRAY_SIZE(ldo_vaux3_ab8540_voltages),
.volt_table = ldo_vaux3_ab8540_voltages, .volt_table = ldo_vaux3_ab8540_voltages,
...@@ -1251,7 +1251,7 @@ static struct ab8500_regulator_info ...@@ -1251,7 +1251,7 @@ static struct ab8500_regulator_info
.name = "LDO-AUX4", .name = "LDO-AUX4",
.ops = &ab8500_regulator_volt_mode_ops, .ops = &ab8500_regulator_volt_mode_ops,
.type = REGULATOR_VOLTAGE, .type = REGULATOR_VOLTAGE,
.id = AB9540_LDO_AUX4, .id = AB8540_LDO_AUX4,
.owner = THIS_MODULE, .owner = THIS_MODULE,
.n_voltages = ARRAY_SIZE(ldo_vauxn_voltages), .n_voltages = ARRAY_SIZE(ldo_vauxn_voltages),
.volt_table = ldo_vauxn_voltages, .volt_table = ldo_vauxn_voltages,
...@@ -1274,7 +1274,7 @@ static struct ab8500_regulator_info ...@@ -1274,7 +1274,7 @@ static struct ab8500_regulator_info
.name = "LDO-INTCORE", .name = "LDO-INTCORE",
.ops = &ab8500_regulator_volt_mode_ops, .ops = &ab8500_regulator_volt_mode_ops,
.type = REGULATOR_VOLTAGE, .type = REGULATOR_VOLTAGE,
.id = AB8500_LDO_INTCORE, .id = AB8540_LDO_INTCORE,
.owner = THIS_MODULE, .owner = THIS_MODULE,
.n_voltages = ARRAY_SIZE(ldo_vintcore_voltages), .n_voltages = ARRAY_SIZE(ldo_vintcore_voltages),
.volt_table = ldo_vintcore_voltages, .volt_table = ldo_vintcore_voltages,
...@@ -1302,7 +1302,7 @@ static struct ab8500_regulator_info ...@@ -1302,7 +1302,7 @@ static struct ab8500_regulator_info
.name = "LDO-TVOUT", .name = "LDO-TVOUT",
.ops = &ab8500_regulator_mode_ops, .ops = &ab8500_regulator_mode_ops,
.type = REGULATOR_VOLTAGE, .type = REGULATOR_VOLTAGE,
.id = AB8500_LDO_TVOUT, .id = AB8540_LDO_TVOUT,
.owner = THIS_MODULE, .owner = THIS_MODULE,
.n_voltages = 1, .n_voltages = 1,
}, },
...@@ -1320,7 +1320,7 @@ static struct ab8500_regulator_info ...@@ -1320,7 +1320,7 @@ static struct ab8500_regulator_info
.name = "LDO-AUDIO", .name = "LDO-AUDIO",
.ops = &ab8500_regulator_ops, .ops = &ab8500_regulator_ops,
.type = REGULATOR_VOLTAGE, .type = REGULATOR_VOLTAGE,
.id = AB8500_LDO_AUDIO, .id = AB8540_LDO_AUDIO,
.owner = THIS_MODULE, .owner = THIS_MODULE,
.n_voltages = 1, .n_voltages = 1,
.volt_table = fixed_2000000_voltage, .volt_table = fixed_2000000_voltage,
...@@ -1335,7 +1335,7 @@ static struct ab8500_regulator_info ...@@ -1335,7 +1335,7 @@ static struct ab8500_regulator_info
.name = "LDO-ANAMIC1", .name = "LDO-ANAMIC1",
.ops = &ab8500_regulator_ops, .ops = &ab8500_regulator_ops,
.type = REGULATOR_VOLTAGE, .type = REGULATOR_VOLTAGE,
.id = AB8500_LDO_ANAMIC1, .id = AB8540_LDO_ANAMIC1,
.owner = THIS_MODULE, .owner = THIS_MODULE,
.n_voltages = 1, .n_voltages = 1,
.volt_table = fixed_2050000_voltage, .volt_table = fixed_2050000_voltage,
...@@ -1350,7 +1350,7 @@ static struct ab8500_regulator_info ...@@ -1350,7 +1350,7 @@ static struct ab8500_regulator_info
.name = "LDO-ANAMIC2", .name = "LDO-ANAMIC2",
.ops = &ab8500_regulator_ops, .ops = &ab8500_regulator_ops,
.type = REGULATOR_VOLTAGE, .type = REGULATOR_VOLTAGE,
.id = AB8500_LDO_ANAMIC2, .id = AB8540_LDO_ANAMIC2,
.owner = THIS_MODULE, .owner = THIS_MODULE,
.n_voltages = 1, .n_voltages = 1,
.volt_table = fixed_2050000_voltage, .volt_table = fixed_2050000_voltage,
...@@ -1365,7 +1365,7 @@ static struct ab8500_regulator_info ...@@ -1365,7 +1365,7 @@ static struct ab8500_regulator_info
.name = "LDO-DMIC", .name = "LDO-DMIC",
.ops = &ab8500_regulator_ops, .ops = &ab8500_regulator_ops,
.type = REGULATOR_VOLTAGE, .type = REGULATOR_VOLTAGE,
.id = AB8500_LDO_DMIC, .id = AB8540_LDO_DMIC,
.owner = THIS_MODULE, .owner = THIS_MODULE,
.n_voltages = 1, .n_voltages = 1,
}, },
...@@ -1383,7 +1383,7 @@ static struct ab8500_regulator_info ...@@ -1383,7 +1383,7 @@ static struct ab8500_regulator_info
.name = "LDO-ANA", .name = "LDO-ANA",
.ops = &ab8500_regulator_mode_ops, .ops = &ab8500_regulator_mode_ops,
.type = REGULATOR_VOLTAGE, .type = REGULATOR_VOLTAGE,
.id = AB8500_LDO_ANA, .id = AB8540_LDO_ANA,
.owner = THIS_MODULE, .owner = THIS_MODULE,
.n_voltages = 1, .n_voltages = 1,
.volt_table = fixed_1200000_voltage, .volt_table = fixed_1200000_voltage,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7