diff options
Diffstat (limited to 'drivers/regulator/lp8788-ldo.c')
-rw-r--r-- | drivers/regulator/lp8788-ldo.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/drivers/regulator/lp8788-ldo.c b/drivers/regulator/lp8788-ldo.c index 26753a013789..3792741708ce 100644 --- a/drivers/regulator/lp8788-ldo.c +++ b/drivers/regulator/lp8788-ldo.c | |||
@@ -126,7 +126,7 @@ struct lp8788_ldo { | |||
126 | }; | 126 | }; |
127 | 127 | ||
128 | /* DLDO 1, 2, 3, 9 voltage table */ | 128 | /* DLDO 1, 2, 3, 9 voltage table */ |
129 | const int lp8788_dldo1239_vtbl[] = { | 129 | static const int lp8788_dldo1239_vtbl[] = { |
130 | 1800000, 1900000, 2000000, 2100000, 2200000, 2300000, 2400000, 2500000, | 130 | 1800000, 1900000, 2000000, 2100000, 2200000, 2300000, 2400000, 2500000, |
131 | 2600000, 2700000, 2800000, 2900000, 3000000, 2850000, 2850000, 2850000, | 131 | 2600000, 2700000, 2800000, 2900000, 3000000, 2850000, 2850000, 2850000, |
132 | 2850000, 2850000, 2850000, 2850000, 2850000, 2850000, 2850000, 2850000, | 132 | 2850000, 2850000, 2850000, 2850000, 2850000, 2850000, 2850000, 2850000, |
@@ -662,14 +662,6 @@ static int lp8788_config_ldo_enable_mode(struct lp8788_ldo *ldo, | |||
662 | [EN_DLDO7] = LP8788_EN_SEL_DLDO7_M, | 662 | [EN_DLDO7] = LP8788_EN_SEL_DLDO7_M, |
663 | [EN_DLDO911] = LP8788_EN_SEL_DLDO911_M, | 663 | [EN_DLDO911] = LP8788_EN_SEL_DLDO911_M, |
664 | }; | 664 | }; |
665 | u8 val[] = { | ||
666 | [EN_ALDO1] = 0 << 5, | ||
667 | [EN_ALDO234] = 0 << 4, | ||
668 | [EN_ALDO5] = 0 << 3, | ||
669 | [EN_ALDO7] = 0 << 2, | ||
670 | [EN_DLDO7] = 0 << 1, | ||
671 | [EN_DLDO911] = 0 << 0, | ||
672 | }; | ||
673 | 665 | ||
674 | switch (id) { | 666 | switch (id) { |
675 | case DLDO7: | 667 | case DLDO7: |
@@ -708,8 +700,7 @@ static int lp8788_config_ldo_enable_mode(struct lp8788_ldo *ldo, | |||
708 | return ret; | 700 | return ret; |
709 | 701 | ||
710 | set_default_ldo_enable_mode: | 702 | set_default_ldo_enable_mode: |
711 | return lp8788_update_bits(lp, LP8788_EN_SEL, en_mask[enable_id], | 703 | return lp8788_update_bits(lp, LP8788_EN_SEL, en_mask[enable_id], 0); |
712 | val[enable_id]); | ||
713 | } | 704 | } |
714 | 705 | ||
715 | static int lp8788_dldo_probe(struct platform_device *pdev) | 706 | static int lp8788_dldo_probe(struct platform_device *pdev) |