diff options
author | Axel Lin <axel.lin@ingics.com> | 2013-01-06 21:28:31 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-01-17 02:13:59 -0500 |
commit | 510799eaba39251b9362cf00a11ad866846e9cbf (patch) | |
tree | 8c96fb5ee728992b4d922c34d34f42dbe3c99e7e /drivers/regulator/lp8755.c | |
parent | 240a529108a11d235328a140fe6b03cf76cef099 (diff) |
regulator: lp8755: Remove enum bucks
We already have enum lp8755_bucks in lp8755.h, so it looks pointless adding
enum bucks in lp8755.c.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Tested-by: Daniel Jeong <gshark.jeong@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/regulator/lp8755.c')
-rw-r--r-- | drivers/regulator/lp8755.c | 50 |
1 files changed, 17 insertions, 33 deletions
diff --git a/drivers/regulator/lp8755.c b/drivers/regulator/lp8755.c index 8c3f3f2094c6..8b1ce0f174b1 100644 --- a/drivers/regulator/lp8755.c +++ b/drivers/regulator/lp8755.c | |||
@@ -37,15 +37,6 @@ | |||
37 | #define LP8755_BUCK_LINEAR_OUT_MAX 0x76 | 37 | #define LP8755_BUCK_LINEAR_OUT_MAX 0x76 |
38 | #define LP8755_BUCK_VOUT_M 0x7F | 38 | #define LP8755_BUCK_VOUT_M 0x7F |
39 | 39 | ||
40 | enum bucks { | ||
41 | BUCK0 = 0, | ||
42 | BUCK1, | ||
43 | BUCK2, | ||
44 | BUCK3, | ||
45 | BUCK4, | ||
46 | BUCK5, | ||
47 | }; | ||
48 | |||
49 | struct lp8755_mphase { | 40 | struct lp8755_mphase { |
50 | int nreg; | 41 | int nreg; |
51 | int buck_num[LP8755_BUCK_MAX]; | 42 | int buck_num[LP8755_BUCK_MAX]; |
@@ -262,33 +253,26 @@ static struct regulator_ops lp8755_buck_ops = { | |||
262 | } | 253 | } |
263 | 254 | ||
264 | static struct regulator_init_data lp8755_reg_default[LP8755_BUCK_MAX] = { | 255 | static struct regulator_init_data lp8755_reg_default[LP8755_BUCK_MAX] = { |
265 | [BUCK0] = lp8755_buck_init(0), | 256 | [LP8755_BUCK0] = lp8755_buck_init(0), |
266 | [BUCK1] = lp8755_buck_init(1), | 257 | [LP8755_BUCK1] = lp8755_buck_init(1), |
267 | [BUCK2] = lp8755_buck_init(2), | 258 | [LP8755_BUCK2] = lp8755_buck_init(2), |
268 | [BUCK3] = lp8755_buck_init(3), | 259 | [LP8755_BUCK3] = lp8755_buck_init(3), |
269 | [BUCK4] = lp8755_buck_init(4), | 260 | [LP8755_BUCK4] = lp8755_buck_init(4), |
270 | [BUCK5] = lp8755_buck_init(5), | 261 | [LP8755_BUCK5] = lp8755_buck_init(5), |
271 | }; | 262 | }; |
272 | 263 | ||
273 | static const struct lp8755_mphase mphase_buck[MPHASE_CONF_MAX] = { | 264 | static const struct lp8755_mphase mphase_buck[MPHASE_CONF_MAX] = { |
274 | {3, {BUCK0, BUCK3, BUCK5} | 265 | { 3, { LP8755_BUCK0, LP8755_BUCK3, LP8755_BUCK5 } }, |
275 | }, | 266 | { 6, { LP8755_BUCK0, LP8755_BUCK1, LP8755_BUCK2, LP8755_BUCK3, |
276 | {6, {BUCK0, BUCK1, BUCK2, BUCK3, BUCK4, BUCK5} | 267 | LP8755_BUCK4, LP8755_BUCK5 } }, |
277 | }, | 268 | { 5, { LP8755_BUCK0, LP8755_BUCK2, LP8755_BUCK3, LP8755_BUCK4, |
278 | {5, {BUCK0, BUCK2, BUCK3, BUCK4, BUCK5} | 269 | LP8755_BUCK5} }, |
279 | }, | 270 | { 4, { LP8755_BUCK0, LP8755_BUCK3, LP8755_BUCK4, LP8755_BUCK5} }, |
280 | {4, {BUCK0, BUCK3, BUCK4, BUCK5} | 271 | { 3, { LP8755_BUCK0, LP8755_BUCK4, LP8755_BUCK5} }, |
281 | }, | 272 | { 2, { LP8755_BUCK0, LP8755_BUCK5} }, |
282 | {3, {BUCK0, BUCK4, BUCK5} | 273 | { 1, { LP8755_BUCK0} }, |
283 | }, | 274 | { 2, { LP8755_BUCK0, LP8755_BUCK3} }, |
284 | {2, {BUCK0, BUCK5} | 275 | { 4, { LP8755_BUCK0, LP8755_BUCK2, LP8755_BUCK3, LP8755_BUCK5} }, |
285 | }, | ||
286 | {1, {BUCK0} | ||
287 | }, | ||
288 | {2, {BUCK0, BUCK3} | ||
289 | }, | ||
290 | {4, {BUCK0, BUCK2, BUCK3, BUCK5} | ||
291 | }, | ||
292 | }; | 276 | }; |
293 | 277 | ||
294 | static int lp8755_init_data(struct lp8755_chip *pchip) | 278 | static int lp8755_init_data(struct lp8755_chip *pchip) |