diff options
author | Mark Brown <broonie@linaro.org> | 2013-10-24 06:11:32 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-10-24 06:11:32 -0400 |
commit | 420118d48311e0c4ef4aace5aede35079ecc2412 (patch) | |
tree | a4affbc11b9271d786b9c9e5711b1e7dc873d3e8 /arch/arm | |
parent | 2a2bec6554e9e9d0ae351575ca1f72df1fa0f15f (diff) | |
parent | 32dadef2190efd2e06331825b11881daf100d6d9 (diff) |
Merge remote-tracking branch 'regulator/topic/alias' into regulator-next
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-s3c64xx/mach-crag6410.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/arch/arm/mach-s3c64xx/mach-crag6410.c b/arch/arm/mach-s3c64xx/mach-crag6410.c index eb8e5a1aca42..f27ca3b89f4c 100644 --- a/arch/arm/mach-s3c64xx/mach-crag6410.c +++ b/arch/arm/mach-s3c64xx/mach-crag6410.c | |||
@@ -310,10 +310,6 @@ static struct regulator_consumer_supply wallvdd_consumers[] = { | |||
310 | 310 | ||
311 | REGULATOR_SUPPLY("SPKVDDL", "spi0.1"), | 311 | REGULATOR_SUPPLY("SPKVDDL", "spi0.1"), |
312 | REGULATOR_SUPPLY("SPKVDDR", "spi0.1"), | 312 | REGULATOR_SUPPLY("SPKVDDR", "spi0.1"), |
313 | REGULATOR_SUPPLY("SPKVDDL", "wm5102-codec"), | ||
314 | REGULATOR_SUPPLY("SPKVDDR", "wm5102-codec"), | ||
315 | REGULATOR_SUPPLY("SPKVDDL", "wm5110-codec"), | ||
316 | REGULATOR_SUPPLY("SPKVDDR", "wm5110-codec"), | ||
317 | 313 | ||
318 | REGULATOR_SUPPLY("DC1VDD", "0-0034"), | 314 | REGULATOR_SUPPLY("DC1VDD", "0-0034"), |
319 | REGULATOR_SUPPLY("DC2VDD", "0-0034"), | 315 | REGULATOR_SUPPLY("DC2VDD", "0-0034"), |
@@ -653,14 +649,6 @@ static struct regulator_consumer_supply pvdd_1v8_consumers[] = { | |||
653 | REGULATOR_SUPPLY("DBVDD3", "spi0.1"), | 649 | REGULATOR_SUPPLY("DBVDD3", "spi0.1"), |
654 | REGULATOR_SUPPLY("LDOVDD", "spi0.1"), | 650 | REGULATOR_SUPPLY("LDOVDD", "spi0.1"), |
655 | REGULATOR_SUPPLY("CPVDD", "spi0.1"), | 651 | REGULATOR_SUPPLY("CPVDD", "spi0.1"), |
656 | |||
657 | REGULATOR_SUPPLY("DBVDD2", "wm5102-codec"), | ||
658 | REGULATOR_SUPPLY("DBVDD3", "wm5102-codec"), | ||
659 | REGULATOR_SUPPLY("CPVDD", "wm5102-codec"), | ||
660 | |||
661 | REGULATOR_SUPPLY("DBVDD2", "wm5110-codec"), | ||
662 | REGULATOR_SUPPLY("DBVDD3", "wm5110-codec"), | ||
663 | REGULATOR_SUPPLY("CPVDD", "wm5110-codec"), | ||
664 | }; | 652 | }; |
665 | 653 | ||
666 | static struct regulator_init_data pvdd_1v8 = { | 654 | static struct regulator_init_data pvdd_1v8 = { |