summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilippe Langlais <philippe.langlais@linaro.org>2012-04-24 13:48:52 +0200
committerPhilippe Langlais <philippe.langlais@stericsson.com>2012-05-22 10:59:36 +0200
commit0c3131bdacce0f1e6dd1672d7128bcd4c09c4be6 (patch)
treef4f1294fb4e7d911dbcd3ba6d0b4a98d815b4fff
parent2ac6bfcf2afaae7e7033711b5264423a82f55994 (diff)
ux500: regulators: Revert partially mainline changes around audio regulators
Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org>
-rw-r--r--arch/arm/mach-ux500/board-mop500-regulators.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-ux500/board-mop500-regulators.c b/arch/arm/mach-ux500/board-mop500-regulators.c
index 972b6431db0..ffa0d4f9cdc 100644
--- a/arch/arm/mach-ux500/board-mop500-regulators.c
+++ b/arch/arm/mach-ux500/board-mop500-regulators.c
@@ -146,22 +146,22 @@ static struct regulator_consumer_supply ab8500_vtvout_consumers[] = {
static struct regulator_consumer_supply ab8500_vaud_consumers[] = {
/* AB8500 audio-codec main supply */
- REGULATOR_SUPPLY("vaud", "ab8500-codec.0"),
+ REGULATOR_SUPPLY("v-audio", NULL),
};
static struct regulator_consumer_supply ab8500_vamic1_consumers[] = {
/* AB8500 audio-codec Mic1 supply */
- REGULATOR_SUPPLY("vamic1", "ab8500-codec.0"),
+ REGULATOR_SUPPLY("v-amic1", NULL),
};
static struct regulator_consumer_supply ab8500_vamic2_consumers[] = {
/* AB8500 audio-codec Mic2 supply */
- REGULATOR_SUPPLY("vamic2", "ab8500-codec.0"),
+ REGULATOR_SUPPLY("v-amic2", NULL),
};
static struct regulator_consumer_supply ab8500_vdmic_consumers[] = {
/* AB8500 audio-codec DMic supply */
- REGULATOR_SUPPLY("vdmic", "ab8500-codec.0"),
+ REGULATOR_SUPPLY("v-dmic", NULL),
};
static struct regulator_consumer_supply ab8500_vintcore_consumers[] = {