diff options
| author | Axel Lin <axel.lin@gmail.com> | 2012-06-08 03:41:48 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-06-17 16:01:21 -0400 |
| commit | 34e74f39fa9a2c1489444266cc9e973dc1b3a419 (patch) | |
| tree | bfa49ea87b6779fb19be3673b28f8bb191e11865 /drivers/regulator/mc13xxx.h | |
| parent | ee5e6253ac22210da892435711890fa2272daa41 (diff) | |
regulator: mc13xxx: Convert to regulator_list_voltage_table
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/regulator/mc13xxx.h')
| -rw-r--r-- | drivers/regulator/mc13xxx.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/regulator/mc13xxx.h b/drivers/regulator/mc13xxx.h index 044aba4d28ec..9a8f72ce718e 100644 --- a/drivers/regulator/mc13xxx.h +++ b/drivers/regulator/mc13xxx.h | |||
| @@ -22,7 +22,6 @@ struct mc13xxx_regulator { | |||
| 22 | int vsel_shift; | 22 | int vsel_shift; |
| 23 | int vsel_mask; | 23 | int vsel_mask; |
| 24 | int hi_bit; | 24 | int hi_bit; |
| 25 | int const *voltages; | ||
| 26 | }; | 25 | }; |
| 27 | 26 | ||
| 28 | struct mc13xxx_regulator_priv { | 27 | struct mc13xxx_regulator_priv { |
| @@ -35,8 +34,6 @@ struct mc13xxx_regulator_priv { | |||
| 35 | 34 | ||
| 36 | extern int mc13xxx_sw_regulator(struct regulator_dev *rdev); | 35 | extern int mc13xxx_sw_regulator(struct regulator_dev *rdev); |
| 37 | extern int mc13xxx_sw_regulator_is_enabled(struct regulator_dev *rdev); | 36 | extern int mc13xxx_sw_regulator_is_enabled(struct regulator_dev *rdev); |
| 38 | extern int mc13xxx_regulator_list_voltage(struct regulator_dev *rdev, | ||
| 39 | unsigned selector); | ||
| 40 | extern int mc13xxx_fixed_regulator_set_voltage(struct regulator_dev *rdev, | 37 | extern int mc13xxx_fixed_regulator_set_voltage(struct regulator_dev *rdev, |
| 41 | int min_uV, int max_uV, unsigned *selector); | 38 | int min_uV, int max_uV, unsigned *selector); |
| 42 | extern int mc13xxx_fixed_regulator_get_voltage(struct regulator_dev *rdev); | 39 | extern int mc13xxx_fixed_regulator_get_voltage(struct regulator_dev *rdev); |
| @@ -68,6 +65,7 @@ extern struct regulator_ops mc13xxx_fixed_regulator_ops; | |||
| 68 | .desc = { \ | 65 | .desc = { \ |
| 69 | .name = #_name, \ | 66 | .name = #_name, \ |
| 70 | .n_voltages = ARRAY_SIZE(_voltages), \ | 67 | .n_voltages = ARRAY_SIZE(_voltages), \ |
| 68 | .volt_table = _voltages, \ | ||
| 71 | .ops = &_ops, \ | 69 | .ops = &_ops, \ |
| 72 | .type = REGULATOR_VOLTAGE, \ | 70 | .type = REGULATOR_VOLTAGE, \ |
| 73 | .id = prefix ## _name, \ | 71 | .id = prefix ## _name, \ |
| @@ -78,7 +76,6 @@ extern struct regulator_ops mc13xxx_fixed_regulator_ops; | |||
| 78 | .vsel_reg = prefix ## _vsel_reg, \ | 76 | .vsel_reg = prefix ## _vsel_reg, \ |
| 79 | .vsel_shift = prefix ## _vsel_reg ## _ ## _name ## VSEL,\ | 77 | .vsel_shift = prefix ## _vsel_reg ## _ ## _name ## VSEL,\ |
| 80 | .vsel_mask = prefix ## _vsel_reg ## _ ## _name ## VSEL_M,\ | 78 | .vsel_mask = prefix ## _vsel_reg ## _ ## _name ## VSEL_M,\ |
| 81 | .voltages = _voltages, \ | ||
| 82 | } | 79 | } |
| 83 | 80 | ||
| 84 | #define MC13xxx_FIXED_DEFINE(prefix, _name, _reg, _voltages, _ops) \ | 81 | #define MC13xxx_FIXED_DEFINE(prefix, _name, _reg, _voltages, _ops) \ |
| @@ -86,6 +83,7 @@ extern struct regulator_ops mc13xxx_fixed_regulator_ops; | |||
| 86 | .desc = { \ | 83 | .desc = { \ |
| 87 | .name = #_name, \ | 84 | .name = #_name, \ |
| 88 | .n_voltages = ARRAY_SIZE(_voltages), \ | 85 | .n_voltages = ARRAY_SIZE(_voltages), \ |
| 86 | .volt_table = _voltages, \ | ||
| 89 | .ops = &_ops, \ | 87 | .ops = &_ops, \ |
| 90 | .type = REGULATOR_VOLTAGE, \ | 88 | .type = REGULATOR_VOLTAGE, \ |
| 91 | .id = prefix ## _name, \ | 89 | .id = prefix ## _name, \ |
| @@ -93,7 +91,6 @@ extern struct regulator_ops mc13xxx_fixed_regulator_ops; | |||
| 93 | }, \ | 91 | }, \ |
| 94 | .reg = prefix ## _reg, \ | 92 | .reg = prefix ## _reg, \ |
| 95 | .enable_bit = prefix ## _reg ## _ ## _name ## EN, \ | 93 | .enable_bit = prefix ## _reg ## _ ## _name ## EN, \ |
| 96 | .voltages = _voltages, \ | ||
| 97 | } | 94 | } |
| 98 | 95 | ||
| 99 | #define MC13xxx_GPO_DEFINE(prefix, _name, _reg, _voltages, _ops) \ | 96 | #define MC13xxx_GPO_DEFINE(prefix, _name, _reg, _voltages, _ops) \ |
| @@ -101,6 +98,7 @@ extern struct regulator_ops mc13xxx_fixed_regulator_ops; | |||
| 101 | .desc = { \ | 98 | .desc = { \ |
| 102 | .name = #_name, \ | 99 | .name = #_name, \ |
| 103 | .n_voltages = ARRAY_SIZE(_voltages), \ | 100 | .n_voltages = ARRAY_SIZE(_voltages), \ |
| 101 | .volt_table = _voltages, \ | ||
| 104 | .ops = &_ops, \ | 102 | .ops = &_ops, \ |
| 105 | .type = REGULATOR_VOLTAGE, \ | 103 | .type = REGULATOR_VOLTAGE, \ |
| 106 | .id = prefix ## _name, \ | 104 | .id = prefix ## _name, \ |
| @@ -108,7 +106,6 @@ extern struct regulator_ops mc13xxx_fixed_regulator_ops; | |||
| 108 | }, \ | 106 | }, \ |
| 109 | .reg = prefix ## _reg, \ | 107 | .reg = prefix ## _reg, \ |
| 110 | .enable_bit = prefix ## _reg ## _ ## _name ## EN, \ | 108 | .enable_bit = prefix ## _reg ## _ ## _name ## EN, \ |
| 111 | .voltages = _voltages, \ | ||
| 112 | } | 109 | } |
| 113 | 110 | ||
| 114 | #define MC13xxx_DEFINE_SW(_name, _reg, _vsel_reg, _voltages, ops) \ | 111 | #define MC13xxx_DEFINE_SW(_name, _reg, _vsel_reg, _voltages, ops) \ |