summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBengt Jonsson <bengt.g.jonsson@stericsson.com>2011-11-15 09:54:05 +0100
committerPhilippe Langlais <philippe.langlais@stericsson.com>2012-05-22 10:59:19 +0200
commit8721ec948f65fde2f1d089ddc2b1926a32435f04 (patch)
treed274d4218020e6d690150a3f322a5dd4b57363d7
parent14d1ef2a5ffbb348729ddf139a93092dfef1604e (diff)
regulators: Remove USB regulator
The USB regulator is controlled by hardware. The software support was only needed for early hardware (ED) which is no longer supported. ST-Ericsson Linux next: - ST-Ericsson ID: 374369 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I34bdb53c11cfeaf4d434c4dd2044ac3e6140672d Signed-off-by: Bengt Jonsson <bengt.g.jonsson@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/37777 Reviewed-by: QABUILD
-rw-r--r--drivers/regulator/ab8500.c17
-rw-r--r--include/linux/regulator/ab8500.h1
2 files changed, 0 insertions, 18 deletions
diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c
index ecf7817007c..9d7547cd7f1 100644
--- a/drivers/regulator/ab8500.c
+++ b/drivers/regulator/ab8500.c
@@ -682,23 +682,6 @@ static struct ab8500_regulator_info
.update_val_idle = 0x82,
.update_val_normal = 0x02,
},
- [AB8500_LDO_USB] = {
- .desc = {
- .name = "LDO-USB",
- .ops = &ab8500_regulator_ops,
- .type = REGULATOR_VOLTAGE,
- .id = AB8500_LDO_USB,
- .owner = THIS_MODULE,
- .n_voltages = 1,
- },
- .fixed_uV = 3300000,
- .update_bank = 0x03,
- .update_reg = 0x82,
- .update_mask = 0x03,
- .update_val = 0x01,
- .update_val_idle = 0x03,
- .update_val_normal = 0x01,
- },
[AB8500_LDO_AUDIO] = {
.desc = {
.name = "LDO-AUDIO",
diff --git a/include/linux/regulator/ab8500.h b/include/linux/regulator/ab8500.h
index 112677fdb0a..79f03f3897a 100644
--- a/include/linux/regulator/ab8500.h
+++ b/include/linux/regulator/ab8500.h
@@ -19,7 +19,6 @@ enum ab8500_regulator_id {
AB8500_LDO_AUX3,
AB8500_LDO_INTCORE,
AB8500_LDO_TVOUT,
- AB8500_LDO_USB,
AB8500_LDO_AUDIO,
AB8500_LDO_ANAMIC1,
AB8500_LDO_ANAMIC2,