From patchwork Wed Feb 6 10:53:48 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 14604 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 7BC3E2423C for ; Wed, 6 Feb 2013 10:55:27 +0000 (UTC) Received: from mail-vb0-f50.google.com (mail-vb0-f50.google.com [209.85.212.50]) by fiordland.canonical.com (Postfix) with ESMTP id 3277DA187D8 for ; Wed, 6 Feb 2013 10:55:27 +0000 (UTC) Received: by mail-vb0-f50.google.com with SMTP id ft2so731925vbb.37 for ; Wed, 06 Feb 2013 02:55:26 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:x-received:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state; bh=MP1aQh4eX+6tJyVWAL00uLqfShf7YtS3kR5hxxF0bUE=; b=HkvEqHzGcD/qxQ5pRzxSVAqluV2x+BErgubHA5KqYraSv7eLAF9WU7mU30clWPXLnQ 38RLcGnA9ZlZfMgTkH2BxdoILyXgOtHAgEFsajO4OtCyHxe+x88WRGJrwLpkMVVkjBAF zeTNvHXWssmYbWevnZHLLwiH5ITGEEtPmGxIxa00i/G9TMKVQyitpL9KwP+jmRNNYaut duAgOmGzqRB++gyxcyLqx2sDPBSpS4bRA+8he/9I51KyM6yz3NtghSfvU7gg5cXrq3nt 02lR6rJc6RSn/lSEMBf5k7X4EG3QYqCGEP4nOidihXfOwFR8HV6w2nTHVaybYjBC4ji2 NoIw== X-Received: by 10.220.151.141 with SMTP id c13mr32109100vcw.64.1360148126611; Wed, 06 Feb 2013 02:55:26 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.58.252.8 with SMTP id zo8csp12971vec; Wed, 6 Feb 2013 02:55:24 -0800 (PST) X-Received: by 10.180.85.226 with SMTP id k2mr4028766wiz.34.1360148104007; Wed, 06 Feb 2013 02:55:04 -0800 (PST) Received: from mail-wg0-x229.google.com ([2a00:1450:400c:c00::229]) by mx.google.com with ESMTPS id hs3si511014wib.46.2013.02.06.02.55.03 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 06 Feb 2013 02:55:03 -0800 (PST) Received-SPF: neutral (google.com: 2a00:1450:400c:c00::229 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=2a00:1450:400c:c00::229; Authentication-Results: mx.google.com; spf=neutral (google.com: 2a00:1450:400c:c00::229 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) smtp.mail=lee.jones@linaro.org Received: by mail-wg0-f41.google.com with SMTP id ds1so4913795wgb.0 for ; Wed, 06 Feb 2013 02:55:03 -0800 (PST) X-Received: by 10.194.235.225 with SMTP id up1mr12387596wjc.11.1360148103500; Wed, 06 Feb 2013 02:55:03 -0800 (PST) Received: from localhost.localdomain (cpc34-aztw25-2-0-cust250.18-1.cable.virginmedia.com. [86.16.136.251]) by mx.google.com with ESMTPS id be1sm2406649wib.10.2013.02.06.02.55.02 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 06 Feb 2013 02:55:03 -0800 (PST) From: Lee Jones To: linux-kernel@vger.kernel.org Cc: broonie@opensource.wolfsonmicro.com, linus.walleij@linaro.org, Philippe Langlais , Lee Jones Subject: [PATCH 26/49] ARM: ux500: Partially revert changes surrounding audio regulators Date: Wed, 6 Feb 2013 10:53:48 +0000 Message-Id: <1360148051-7560-27-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1360148051-7560-1-git-send-email-lee.jones@linaro.org> References: <1360148051-7560-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQmmb8kf/Ne15dnNboAp1B6pWCT+/x/entd5r5JyEBs1z2WSAeRKo4AdmF9wC8QweOvm8DbU From: Philippe Langlais Signed-off-by: Philippe Langlais Signed-off-by: Lee Jones --- arch/arm/mach-ux500/board-mop500-regulators.c | 8 ++++---- 1 file 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 4bd982f..16745e2 100644 --- a/arch/arm/mach-ux500/board-mop500-regulators.c +++ b/arch/arm/mach-ux500/board-mop500-regulators.c @@ -108,22 +108,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[] = {