Skip to content

Commit

Permalink
regulator: ab8500: Remove USB regulator
Browse files Browse the repository at this point in the history
The USB regulator is controlled by hardware. The software support
was only needed for early hardware (ED) which is no longer supported.

Signed-off-by: Bengt Jonsson <bengt.g.jonsson@stericsson.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
  • Loading branch information
Lee Jones authored and Mark Brown committed Mar 29, 2013
1 parent 18bc2b3 commit 41a06aa
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 21 deletions.
20 changes: 0 additions & 20 deletions drivers/regulator/ab8500.c
Original file line number Diff line number Diff line change
Expand Up @@ -488,25 +488,6 @@ static struct ab8500_regulator_info
.update_val_idle = 0x82,
.update_val_normal = 0x02,
},

/*
* Regulators with fixed voltage and normal mode
*/
[AB8500_LDO_USB] = {
.desc = {
.name = "LDO-USB",
.ops = &ab8500_regulator_ops,
.type = REGULATOR_VOLTAGE,
.id = AB8500_LDO_USB,
.owner = THIS_MODULE,
.n_voltages = 1,
.min_uV = 3300000,
.enable_time = 150,
},
.update_bank = 0x03,
.update_reg = 0x82,
.update_mask = 0x03,
},
[AB8500_LDO_AUDIO] = {
.desc = {
.name = "LDO-AUDIO",
Expand Down Expand Up @@ -862,7 +843,6 @@ static struct of_regulator_match ab8500_regulator_matches[] = {
{ .name = "ab8500_ldo_aux3", .driver_data = (void *) AB8500_LDO_AUX3, },
{ .name = "ab8500_ldo_intcore", .driver_data = (void *) AB8500_LDO_INTCORE, },
{ .name = "ab8500_ldo_tvout", .driver_data = (void *) AB8500_LDO_TVOUT, },
{ .name = "ab8500_ldo_usb", .driver_data = (void *) AB8500_LDO_USB, },
{ .name = "ab8500_ldo_audio", .driver_data = (void *) AB8500_LDO_AUDIO, },
{ .name = "ab8500_ldo_anamic1", .driver_data = (void *) AB8500_LDO_ANAMIC1, },
{ .name = "ab8500_ldo_amamic2", .driver_data = (void *) AB8500_LDO_ANAMIC2, },
Expand Down
1 change: 0 additions & 1 deletion include/linux/regulator/ab8500.h
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 41a06aa

Please sign in to comment.