From patchwork Mon Feb 4 11:53:51 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 14485 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 DD0CE23F96 for ; Mon, 4 Feb 2013 11:56:57 +0000 (UTC) Received: from mail-ve0-f175.google.com (mail-ve0-f175.google.com [209.85.128.175]) by fiordland.canonical.com (Postfix) with ESMTP id 94155A18477 for ; Mon, 4 Feb 2013 11:56:57 +0000 (UTC) Received: by mail-ve0-f175.google.com with SMTP id cy12so2034395veb.20 for ; Mon, 04 Feb 2013 03:56:57 -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=UGmmevzWU6lRS2wqoIEEivufIkWNlu3aDu+98BjdCH/VC5FZtUWoMJfLKxlWD5J9Et g9Y2XrT6IwIU+OUaixTBzSov7+UYDaLcvK1js0IA8Vi78yTdJ+Mf68evZyzSNkb83jgY JbVR0aBEf+G4zH1ea6kpDEwHI3wmQaBGgRJ1SNib49FEGGZiO5KfdrCFCi+nKle5paHE z+8AwvO9rLu5unonAIFpwgzMftwazeVHrVQIuYaVrEno1gZugCH3/FZOrdshOcO+gSrd ElbX3FFfZ6YtNM8kM0WimfucjlR+rPT4tG2OELtjFSaqHEBCGvi/snlZiyb5xl6LlZ3+ G84w== X-Received: by 10.52.21.146 with SMTP id v18mr18931000vde.79.1359979017130; Mon, 04 Feb 2013 03:56:57 -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 zo8csp83078vec; Mon, 4 Feb 2013 03:56:56 -0800 (PST) X-Received: by 10.180.97.102 with SMTP id dz6mr10035990wib.3.1359979016095; Mon, 04 Feb 2013 03:56:56 -0800 (PST) Received: from mail-wi0-f176.google.com (mail-wi0-f176.google.com [209.85.212.176]) by mx.google.com with ESMTPS id eg6si3462303wib.111.2013.02.04.03.56.55 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 04 Feb 2013 03:56:56 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.176 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=209.85.212.176; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.176 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-wi0-f176.google.com with SMTP id hm14so2764994wib.9 for ; Mon, 04 Feb 2013 03:56:55 -0800 (PST) X-Received: by 10.194.23.37 with SMTP id j5mr34538103wjf.28.1359979015617; Mon, 04 Feb 2013 03:56:55 -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 j9sm12937128wia.5.2013.02.04.03.56.52 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 04 Feb 2013 03:56:54 -0800 (PST) From: Lee Jones To: linux-kernel@vger.kernel.org, broonie@opensource.wolfsonmicro.com Cc: Philippe Langlais , Lee Jones Subject: [PATCH 36/73] ARM: ux500: Partially revert changes surrounding audio regulators Date: Mon, 4 Feb 2013 11:53:51 +0000 Message-Id: <1359978868-28736-37-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1359978868-28736-1-git-send-email-lee.jones@linaro.org> References: <1359978868-28736-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQmrg0cJAH88QAuxQZWgm+NaJpLppe60CyWY03zbHxL2Fx8xr1GCr9f2CtPbVtpPxOEnACNG 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[] = {