regulator: ab8500: Update voltage handling for fixed voltage regulators

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.jones@linaro.org>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c
index ec609ab747ae42b5060ecd1dc2b332fad57298ee..bade3e2a510df6afd4110e86d3a7714a5d44a572 100644 (file)
--- a/drivers/regulator/ab8500.c
+++ b/drivers/regulator/ab8500.c
@@ -140,6 +140,26 @@ static const int ldo_sdio_voltages[] = {
        3050000,
 };
 
+static const unsigned int fixed_1200000_voltage[] = {
+       1200000,
+};
+
+static const unsigned int fixed_1800000_voltage[] = {
+       1800000,
+};
+
+static const unsigned int fixed_2000000_voltage[] = {
+       2000000,
+};
+
+static const unsigned int fixed_2050000_voltage[] = {
+       2050000,
+};
+
+static const unsigned int fixed_3300000_voltage[] = {
+       3300000,
+};
+
 static int ab8500_regulator_enable(struct regulator_dev *rdev)
 {
        int ret;
@@ -403,7 +423,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_linear,
 };
 
@@ -411,7 +430,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_linear,
 };
 
@@ -527,7 +545,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,
                },
                .load_lp_uA             = 1000,
@@ -546,8 +564,8 @@ static struct ab8500_regulator_info
                        .id             = AB8500_LDO_AUDIO,
                        .owner          = THIS_MODULE,
                        .n_voltages     = 1,
-                       .min_uV         = 2000000,
                        .enable_time    = 140,
+                       .volt_table     = fixed_2000000_voltage,
                },
                .update_bank            = 0x03,
                .update_reg             = 0x83,
@@ -562,8 +580,8 @@ static struct ab8500_regulator_info
                        .id             = AB8500_LDO_ANAMIC1,
                        .owner          = THIS_MODULE,
                        .n_voltages     = 1,
-                       .min_uV         = 2050000,
                        .enable_time    = 500,
+                       .volt_table     = fixed_2050000_voltage,
                },
                .update_bank            = 0x03,
                .update_reg             = 0x83,
@@ -578,8 +596,8 @@ static struct ab8500_regulator_info
                        .id             = AB8500_LDO_ANAMIC2,
                        .owner          = THIS_MODULE,
                        .n_voltages     = 1,
-                       .min_uV         = 2050000,
                        .enable_time    = 500,
+                       .volt_table     = fixed_2050000_voltage,
                },
                .update_bank            = 0x03,
                .update_reg             = 0x83,
@@ -594,8 +612,8 @@ static struct ab8500_regulator_info
                        .id             = AB8500_LDO_DMIC,
                        .owner          = THIS_MODULE,
                        .n_voltages     = 1,
-                       .min_uV         = 1800000,
                        .enable_time    = 420,
+                       .volt_table     = fixed_1800000_voltage,
                },
                .update_bank            = 0x03,
                .update_reg             = 0x83,
@@ -614,8 +632,8 @@ static struct ab8500_regulator_info
                        .id             = AB8500_LDO_ANA,
                        .owner          = THIS_MODULE,
                        .n_voltages     = 1,
-                       .min_uV         = 1200000,
                        .enable_time    = 140,
+                       .volt_table     = fixed_1200000_voltage,
                },
                .load_lp_uA             = 1000,
                .update_bank            = 0x04,
@@ -645,8 +663,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,
@@ -669,8 +685,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,
@@ -693,8 +707,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,
@@ -717,8 +729,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,
@@ -743,8 +753,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,
@@ -768,8 +776,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,
@@ -793,8 +799,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,
@@ -823,9 +827,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,
@@ -842,8 +846,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,
@@ -859,8 +863,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,
@@ -874,8 +878,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,
@@ -889,8 +893,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,
@@ -904,8 +908,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,
@@ -922,8 +926,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,
@@ -952,8 +956,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,
@@ -976,8 +978,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,
@@ -1000,8 +1000,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,
@@ -1024,8 +1022,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,
@@ -1050,8 +1046,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,
@@ -1080,9 +1074,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,
@@ -1099,8 +1093,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,
@@ -1116,8 +1110,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,
@@ -1131,8 +1125,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,
@@ -1146,8 +1140,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,
@@ -1161,8 +1155,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,
@@ -1180,8 +1174,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,
@@ -1346,6 +1340,7 @@ static struct ab8500_regulator_info
                        .id             = AB8500_LDO_AUDIO,
                        .owner          = THIS_MODULE,
                        .n_voltages     = 1,
+                       .volt_table     = fixed_2000000_voltage,
                },
                .update_bank            = 0x03,
                .update_reg             = 0x83,
@@ -1360,6 +1355,7 @@ static struct ab8500_regulator_info
                        .id             = AB8500_LDO_ANAMIC1,
                        .owner          = THIS_MODULE,
                        .n_voltages     = 1,
+                       .volt_table     = fixed_2050000_voltage,
                },
                .update_bank            = 0x03,
                .update_reg             = 0x83,
@@ -1374,6 +1370,7 @@ static struct ab8500_regulator_info
                        .id             = AB8500_LDO_ANAMIC2,
                        .owner          = THIS_MODULE,
                        .n_voltages     = 1,
+                       .volt_table     = fixed_2050000_voltage,
                },
                .update_bank            = 0x03,
                .update_reg             = 0x83,
@@ -1406,6 +1403,7 @@ static struct ab8500_regulator_info
                        .id             = AB8500_LDO_ANA,
                        .owner          = THIS_MODULE,
                        .n_voltages     = 1,
+                       .volt_table     = fixed_1200000_voltage,
                },
                .load_lp_uA             = 1000,
                .update_bank            = 0x04,
@@ -1424,8 +1422,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,