projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0fe17e2)
regulator: ab8500: Supply platform specific regulator id values
authorLee Jones <lee.jones@linaro.org>
Tue, 2 Apr 2013 12:24:07 +0000 (13:24 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 2 Apr 2013 22:01:42 +0000 (23:01 +0100)
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: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
drivers/regulator/ab8500.c patch | blob | blame | history

diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c
index 16f5cf7ec13b70ede8b5ac6a7ab8ea53d906fdae..f89a17a66433b2b1317fb41fbe6e8fcbfb6b6108 100644 (file)
--- a/drivers/regulator/ab8500.c
+++ b/drivers/regulator/ab8500.c
@@ -659,7 +659,7 @@ static struct ab8500_regulator_info
                        .name           = "LDO-AUX1",
                        .ops            = &ab8500_regulator_volt_mode_ops,
                        .type           = REGULATOR_VOLTAGE,
-                       .id             = AB8500_LDO_AUX1,
+                       .id             = AB8505_LDO_AUX1,
                        .owner          = THIS_MODULE,
                        .n_voltages     = ARRAY_SIZE(ldo_vauxn_voltages),
                        .volt_table     = ldo_vauxn_voltages,
@@ -680,7 +680,7 @@ static struct ab8500_regulator_info
                        .name           = "LDO-AUX2",
                        .ops            = &ab8500_regulator_volt_mode_ops,
                        .type           = REGULATOR_VOLTAGE,
-                       .id             = AB8500_LDO_AUX2,
+                       .id             = AB8505_LDO_AUX2,
                        .owner          = THIS_MODULE,
                        .n_voltages     = ARRAY_SIZE(ldo_vauxn_voltages),
                        .volt_table     = ldo_vauxn_voltages,
@@ -701,7 +701,7 @@ static struct ab8500_regulator_info
                        .name           = "LDO-AUX3",
                        .ops            = &ab8500_regulator_volt_mode_ops,
                        .type           = REGULATOR_VOLTAGE,
-                       .id             = AB8500_LDO_AUX3,
+                       .id             = AB8505_LDO_AUX3,
                        .owner          = THIS_MODULE,
                        .n_voltages     = ARRAY_SIZE(ldo_vaux3_voltages),
                        .volt_table     = ldo_vaux3_voltages,
@@ -722,7 +722,7 @@ static struct ab8500_regulator_info
                        .name           = "LDO-AUX4",
                        .ops            = &ab8500_regulator_volt_mode_ops,
                        .type           = REGULATOR_VOLTAGE,
-                       .id             = AB9540_LDO_AUX4,
+                       .id             = AB8505_LDO_AUX4,
                        .owner          = THIS_MODULE,
                        .n_voltages     = ARRAY_SIZE(ldo_vauxn_voltages),
                        .volt_table     = ldo_vauxn_voltages,
@@ -789,7 +789,7 @@ static struct ab8500_regulator_info
                        .name           = "LDO-INTCORE",
                        .ops            = &ab8500_regulator_volt_mode_ops,
                        .type           = REGULATOR_VOLTAGE,
-                       .id             = AB8500_LDO_INTCORE,
+                       .id             = AB8505_LDO_INTCORE,
                        .owner          = THIS_MODULE,
                        .n_voltages     = ARRAY_SIZE(ldo_vintcore_voltages),
                        .volt_table     = ldo_vintcore_voltages,
@@ -836,7 +836,7 @@ static struct ab8500_regulator_info
                        .name           = "LDO-USB",
                        .ops            = &ab8500_regulator_mode_ops,
                        .type           = REGULATOR_VOLTAGE,
-                       .id             = AB9540_LDO_USB,
+                       .id             = AB8505_LDO_USB,
                        .owner          = THIS_MODULE,
                        .n_voltages     = 1,
                        .volt_table     = fixed_3300000_voltage,
@@ -853,7 +853,7 @@ static struct ab8500_regulator_info
                        .name           = "LDO-AUDIO",
                        .ops            = &ab8500_regulator_ops,
                        .type           = REGULATOR_VOLTAGE,
-                       .id             = AB8500_LDO_AUDIO,
+                       .id             = AB8505_LDO_AUDIO,
                        .owner          = THIS_MODULE,
                        .n_voltages     = 1,
                        .volt_table     = fixed_2000000_voltage,
@@ -868,7 +868,7 @@ static struct ab8500_regulator_info
                        .name           = "LDO-ANAMIC1",
                        .ops            = &ab8500_regulator_ops,
                        .type           = REGULATOR_VOLTAGE,
-                       .id             = AB8500_LDO_ANAMIC1,
+                       .id             = AB8505_LDO_ANAMIC1,
                        .owner          = THIS_MODULE,
                        .n_voltages     = 1,
                        .volt_table     = fixed_2050000_voltage,
@@ -883,7 +883,7 @@ static struct ab8500_regulator_info
                        .name           = "LDO-ANAMIC2",
                        .ops            = &ab8500_regulator_ops,
                        .type           = REGULATOR_VOLTAGE,
-                       .id             = AB8500_LDO_ANAMIC2,
+                       .id             = AB8505_LDO_ANAMIC2,
                        .owner          = THIS_MODULE,
                        .n_voltages     = 1,
                        .volt_table     = fixed_2050000_voltage,
@@ -916,7 +916,7 @@ static struct ab8500_regulator_info
                        .name           = "LDO-ANA",
                        .ops            = &ab8500_regulator_mode_ops,
                        .type           = REGULATOR_VOLTAGE,
-                       .id             = AB8500_LDO_ANA,
+                       .id             = AB8505_LDO_ANA,
                        .owner          = THIS_MODULE,
                        .n_voltages     = 1,
                        .volt_table     = fixed_1200000_voltage,
@@ -945,7 +945,7 @@ static struct ab8500_regulator_info
                        .name           = "LDO-AUX1",
                        .ops            = &ab8500_regulator_volt_mode_ops,
                        .type           = REGULATOR_VOLTAGE,
-                       .id             = AB8500_LDO_AUX1,
+                       .id             = AB9540_LDO_AUX1,
                        .owner          = THIS_MODULE,
                        .n_voltages     = ARRAY_SIZE(ldo_vauxn_voltages),
                        .volt_table     = ldo_vauxn_voltages,
@@ -966,7 +966,7 @@ static struct ab8500_regulator_info
                        .name           = "LDO-AUX2",
                        .ops            = &ab8500_regulator_volt_mode_ops,
                        .type           = REGULATOR_VOLTAGE,
-                       .id             = AB8500_LDO_AUX2,
+                       .id             = AB9540_LDO_AUX2,
                        .owner          = THIS_MODULE,
                        .n_voltages     = ARRAY_SIZE(ldo_vauxn_voltages),
                        .volt_table     = ldo_vauxn_voltages,
@@ -987,7 +987,7 @@ static struct ab8500_regulator_info
                        .name           = "LDO-AUX3",
                        .ops            = &ab8500_regulator_volt_mode_ops,
                        .type           = REGULATOR_VOLTAGE,
-                       .id             = AB8500_LDO_AUX3,
+                       .id             = AB9540_LDO_AUX3,
                        .owner          = THIS_MODULE,
                        .n_voltages     = ARRAY_SIZE(ldo_vaux3_voltages),
                        .volt_table     = ldo_vaux3_voltages,
@@ -1031,7 +1031,7 @@ static struct ab8500_regulator_info
                        .name           = "LDO-INTCORE",
                        .ops            = &ab8500_regulator_volt_mode_ops,
                        .type           = REGULATOR_VOLTAGE,
-                       .id             = AB8500_LDO_INTCORE,
+                       .id             = AB9540_LDO_INTCORE,
                        .owner          = THIS_MODULE,
                        .n_voltages     = ARRAY_SIZE(ldo_vintcore_voltages),
                        .volt_table     = ldo_vintcore_voltages,
@@ -1059,7 +1059,7 @@ static struct ab8500_regulator_info
                        .name           = "LDO-TVOUT",
                        .ops            = &ab8500_regulator_mode_ops,
                        .type           = REGULATOR_VOLTAGE,
-                       .id             = AB8500_LDO_TVOUT,
+                       .id             = AB9540_LDO_TVOUT,
                        .owner          = THIS_MODULE,
                        .n_voltages     = 1,
                        .volt_table     = fixed_2000000_voltage,
@@ -1095,7 +1095,7 @@ static struct ab8500_regulator_info
                        .name           = "LDO-AUDIO",
                        .ops            = &ab8500_regulator_ops,
                        .type           = REGULATOR_VOLTAGE,
-                       .id             = AB8500_LDO_AUDIO,
+                       .id             = AB9540_LDO_AUDIO,
                        .owner          = THIS_MODULE,
                        .n_voltages     = 1,
                        .volt_table     = fixed_2000000_voltage,
@@ -1110,7 +1110,7 @@ static struct ab8500_regulator_info
                        .name           = "LDO-ANAMIC1",
                        .ops            = &ab8500_regulator_ops,
                        .type           = REGULATOR_VOLTAGE,
-                       .id             = AB8500_LDO_ANAMIC1,
+                       .id             = AB9540_LDO_ANAMIC1,
                        .owner          = THIS_MODULE,
                        .n_voltages     = 1,
                        .volt_table     = fixed_2050000_voltage,
@@ -1125,7 +1125,7 @@ static struct ab8500_regulator_info
                        .name           = "LDO-ANAMIC2",
                        .ops            = &ab8500_regulator_ops,
                        .type           = REGULATOR_VOLTAGE,
-                       .id             = AB8500_LDO_ANAMIC2,
+                       .id             = AB9540_LDO_ANAMIC2,
                        .owner          = THIS_MODULE,
                        .n_voltages     = 1,
                        .volt_table     = fixed_2050000_voltage,
@@ -1140,7 +1140,7 @@ static struct ab8500_regulator_info
                        .name           = "LDO-DMIC",
                        .ops            = &ab8500_regulator_ops,
                        .type           = REGULATOR_VOLTAGE,
-                       .id             = AB8500_LDO_DMIC,
+                       .id             = AB9540_LDO_DMIC,
                        .owner          = THIS_MODULE,
                        .n_voltages     = 1,
                        .volt_table     = fixed_1800000_voltage,
@@ -1159,7 +1159,7 @@ static struct ab8500_regulator_info
                        .name           = "LDO-ANA",
                        .ops            = &ab8500_regulator_mode_ops,
                        .type           = REGULATOR_VOLTAGE,
-                       .id             = AB8500_LDO_ANA,
+                       .id             = AB9540_LDO_ANA,
                        .owner          = THIS_MODULE,
                        .n_voltages     = 1,
                        .volt_table     = fixed_1200000_voltage,
@@ -1188,7 +1188,7 @@ static struct ab8500_regulator_info
                        .name           = "LDO-AUX1",
                        .ops            = &ab8500_regulator_volt_mode_ops,
                        .type           = REGULATOR_VOLTAGE,
-                       .id             = AB8500_LDO_AUX1,
+                       .id             = AB8540_LDO_AUX1,
                        .owner          = THIS_MODULE,
                        .n_voltages     = ARRAY_SIZE(ldo_vauxn_voltages),
                        .volt_table     = ldo_vauxn_voltages,
@@ -1209,7 +1209,7 @@ static struct ab8500_regulator_info
                        .name           = "LDO-AUX2",
                        .ops            = &ab8500_regulator_volt_mode_ops,
                        .type           = REGULATOR_VOLTAGE,
-                       .id             = AB8500_LDO_AUX2,
+                       .id             = AB8540_LDO_AUX2,
                        .owner          = THIS_MODULE,
                        .n_voltages     = ARRAY_SIZE(ldo_vauxn_voltages),
                        .volt_table     = ldo_vauxn_voltages,
@@ -1230,7 +1230,7 @@ static struct ab8500_regulator_info
                        .name           = "LDO-AUX3",
                        .ops            = &ab8500_regulator_volt_mode_ops,
                        .type           = REGULATOR_VOLTAGE,
-                       .id             = AB8500_LDO_AUX3,
+                       .id             = AB8540_LDO_AUX3,
                        .owner          = THIS_MODULE,
                        .n_voltages     = ARRAY_SIZE(ldo_vaux3_ab8540_voltages),
                        .volt_table     = ldo_vaux3_ab8540_voltages,
@@ -1251,7 +1251,7 @@ static struct ab8500_regulator_info
                        .name           = "LDO-AUX4",
                        .ops            = &ab8500_regulator_volt_mode_ops,
                        .type           = REGULATOR_VOLTAGE,
-                       .id             = AB9540_LDO_AUX4,
+                       .id             = AB8540_LDO_AUX4,
                        .owner          = THIS_MODULE,
                        .n_voltages     = ARRAY_SIZE(ldo_vauxn_voltages),
                        .volt_table     = ldo_vauxn_voltages,
@@ -1274,7 +1274,7 @@ static struct ab8500_regulator_info
                        .name           = "LDO-INTCORE",
                        .ops            = &ab8500_regulator_volt_mode_ops,
                        .type           = REGULATOR_VOLTAGE,
-                       .id             = AB8500_LDO_INTCORE,
+                       .id             = AB8540_LDO_INTCORE,
                        .owner          = THIS_MODULE,
                        .n_voltages     = ARRAY_SIZE(ldo_vintcore_voltages),
                        .volt_table     = ldo_vintcore_voltages,
@@ -1302,7 +1302,7 @@ static struct ab8500_regulator_info
                        .name           = "LDO-TVOUT",
                        .ops            = &ab8500_regulator_mode_ops,
                        .type           = REGULATOR_VOLTAGE,
-                       .id             = AB8500_LDO_TVOUT,
+                       .id             = AB8540_LDO_TVOUT,
                        .owner          = THIS_MODULE,
                        .n_voltages     = 1,
                },
@@ -1320,7 +1320,7 @@ static struct ab8500_regulator_info
                        .name           = "LDO-AUDIO",
                        .ops            = &ab8500_regulator_ops,
                        .type           = REGULATOR_VOLTAGE,
-                       .id             = AB8500_LDO_AUDIO,
+                       .id             = AB8540_LDO_AUDIO,
                        .owner          = THIS_MODULE,
                        .n_voltages     = 1,
                        .volt_table     = fixed_2000000_voltage,
@@ -1335,7 +1335,7 @@ static struct ab8500_regulator_info
                        .name           = "LDO-ANAMIC1",
                        .ops            = &ab8500_regulator_ops,
                        .type           = REGULATOR_VOLTAGE,
-                       .id             = AB8500_LDO_ANAMIC1,
+                       .id             = AB8540_LDO_ANAMIC1,
                        .owner          = THIS_MODULE,
                        .n_voltages     = 1,
                        .volt_table     = fixed_2050000_voltage,
@@ -1350,7 +1350,7 @@ static struct ab8500_regulator_info
                        .name           = "LDO-ANAMIC2",
                        .ops            = &ab8500_regulator_ops,
                        .type           = REGULATOR_VOLTAGE,
-                       .id             = AB8500_LDO_ANAMIC2,
+                       .id             = AB8540_LDO_ANAMIC2,
                        .owner          = THIS_MODULE,
                        .n_voltages     = 1,
                        .volt_table     = fixed_2050000_voltage,
@@ -1365,7 +1365,7 @@ static struct ab8500_regulator_info
                        .name           = "LDO-DMIC",
                        .ops            = &ab8500_regulator_ops,
                        .type           = REGULATOR_VOLTAGE,
-                       .id             = AB8500_LDO_DMIC,
+                       .id             = AB8540_LDO_DMIC,
                        .owner          = THIS_MODULE,
                        .n_voltages     = 1,
                },
@@ -1383,7 +1383,7 @@ static struct ab8500_regulator_info
                        .name           = "LDO-ANA",
                        .ops            = &ab8500_regulator_mode_ops,
                        .type           = REGULATOR_VOLTAGE,
-                       .id             = AB8500_LDO_ANA,
+                       .id             = AB8540_LDO_ANA,
                        .owner          = THIS_MODULE,
                        .n_voltages     = 1,
                        .volt_table     = fixed_1200000_voltage,