diff options
author | Aaro Koskinen <aaro.koskinen@iki.fi> | 2015-03-28 16:45:36 -0400 |
---|---|---|
committer | Lee Jones <lee.jones@linaro.org> | 2015-03-30 05:06:50 -0400 |
commit | 1ea8684e1e0d7453f65a1ed69c2d0b890bfb9e33 (patch) | |
tree | 077bff757b04ebbbd24a0148c23d1740034fa2c5 | |
parent | 5cdc7f02162aa8b980bd5d89e86fd94de0285ca3 (diff) |
mfd: menelaus: Drop support for SW controller VCORE
Drop support for SW controlled VCORE, nobody uses it.
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
-rw-r--r-- | drivers/mfd/menelaus.c | 23 | ||||
-rw-r--r-- | include/linux/mfd/menelaus.h | 1 |
2 files changed, 0 insertions, 24 deletions
diff --git a/drivers/mfd/menelaus.c b/drivers/mfd/menelaus.c index 5269ff2f29bc..2b2dc1f6d2ca 100644 --- a/drivers/mfd/menelaus.c +++ b/drivers/mfd/menelaus.c | |||
@@ -532,29 +532,6 @@ static const struct menelaus_vtg_value vcore_values[] = { | |||
532 | { 1450, 18 }, | 532 | { 1450, 18 }, |
533 | }; | 533 | }; |
534 | 534 | ||
535 | int menelaus_set_vcore_sw(unsigned int mV) | ||
536 | { | ||
537 | int val, ret; | ||
538 | struct i2c_client *c = the_menelaus->client; | ||
539 | |||
540 | val = menelaus_get_vtg_value(mV, vcore_values, | ||
541 | ARRAY_SIZE(vcore_values)); | ||
542 | if (val < 0) | ||
543 | return -EINVAL; | ||
544 | |||
545 | dev_dbg(&c->dev, "Setting VCORE to %d mV (val 0x%02x)\n", mV, val); | ||
546 | |||
547 | /* Set SW mode and the voltage in one go. */ | ||
548 | mutex_lock(&the_menelaus->lock); | ||
549 | ret = menelaus_write_reg(MENELAUS_VCORE_CTRL1, val); | ||
550 | if (ret == 0) | ||
551 | the_menelaus->vcore_hw_mode = 0; | ||
552 | mutex_unlock(&the_menelaus->lock); | ||
553 | msleep(1); | ||
554 | |||
555 | return ret; | ||
556 | } | ||
557 | |||
558 | int menelaus_set_vcore_hw(unsigned int roof_mV, unsigned int floor_mV) | 535 | int menelaus_set_vcore_hw(unsigned int roof_mV, unsigned int floor_mV) |
559 | { | 536 | { |
560 | int fval, rval, val, ret; | 537 | int fval, rval, val, ret; |
diff --git a/include/linux/mfd/menelaus.h b/include/linux/mfd/menelaus.h index a1e12bf393db..9e85ac06da89 100644 --- a/include/linux/mfd/menelaus.h +++ b/include/linux/mfd/menelaus.h | |||
@@ -24,7 +24,6 @@ extern int menelaus_set_vaux(unsigned int mV); | |||
24 | extern int menelaus_set_vdcdc(int dcdc, unsigned int mV); | 24 | extern int menelaus_set_vdcdc(int dcdc, unsigned int mV); |
25 | extern int menelaus_set_slot_sel(int enable); | 25 | extern int menelaus_set_slot_sel(int enable); |
26 | extern int menelaus_get_slot_pin_states(void); | 26 | extern int menelaus_get_slot_pin_states(void); |
27 | extern int menelaus_set_vcore_sw(unsigned int mV); | ||
28 | extern int menelaus_set_vcore_hw(unsigned int roof_mV, unsigned int floor_mV); | 27 | extern int menelaus_set_vcore_hw(unsigned int roof_mV, unsigned int floor_mV); |
29 | 28 | ||
30 | #define EN_VPLL_SLEEP (1 << 7) | 29 | #define EN_VPLL_SLEEP (1 << 7) |