From patchwork Mon Feb 4 11:54:06 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 14500 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 EB1EF23F96 for ; Mon, 4 Feb 2013 11:57:28 +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 9119CA19236 for ; Mon, 4 Feb 2013 11:57:28 +0000 (UTC) Received: by mail-ve0-f175.google.com with SMTP id cy12so2031098veb.6 for ; Mon, 04 Feb 2013 03:57:28 -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=Y3E+HQbgbeNwaVaOmoJ4JvBu1yG6iPtu7uPui1xeygo=; b=fCGihlBi3z/qSDRnThY9xvehAFq2dE6MLvqaspS8g7mND3BaJleet8GUVe9BydEF1o gBAfO41eozMGPU5a/GDGp553JgNO7ZJviWqYeOSkZSxk+AUdvJpgcFKo7O3RQkU2+9tl RkEHAHFz+9WO6UDCY0+EJrH9ivZN5JoLqvPlAg3rV9rsTyvQQMYVVTz4gdVNO/b341Uj zd3dQmUl7/ukDPROv4+0Gus5/oMVabTVVqgSG+CkoyKJSaBLymWwQVqi2L0JJqBZWeGa Jge0+jfj8l6/bzlRjjSCa76cSH5FvU2Fg/nDZLduogvCA7yzJpSXxLaMMOgVzDwplpW3 yjaw== X-Received: by 10.220.219.204 with SMTP id hv12mr21314641vcb.71.1359979048118; Mon, 04 Feb 2013 03:57:28 -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 zo8csp83109vec; Mon, 4 Feb 2013 03:57:27 -0800 (PST) X-Received: by 10.194.48.74 with SMTP id j10mr34518037wjn.36.1359979047159; Mon, 04 Feb 2013 03:57:27 -0800 (PST) Received: from mail-we0-x235.google.com ([2a00:1450:400c:c03::235]) by mx.google.com with ESMTPS id ew3si3468689wib.75.2013.02.04.03.57.26 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 04 Feb 2013 03:57:27 -0800 (PST) Received-SPF: neutral (google.com: 2a00:1450:400c:c03::235 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=2a00:1450:400c:c03::235; Authentication-Results: mx.google.com; spf=neutral (google.com: 2a00:1450:400c:c03::235 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-we0-f181.google.com with SMTP id t44so4749366wey.40 for ; Mon, 04 Feb 2013 03:57:26 -0800 (PST) X-Received: by 10.194.178.33 with SMTP id cv1mr34503732wjc.46.1359979046434; Mon, 04 Feb 2013 03:57:26 -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.57.23 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 04 Feb 2013 03:57:25 -0800 (PST) From: Lee Jones To: linux-kernel@vger.kernel.org, broonie@opensource.wolfsonmicro.com Cc: Marcus Cooper , Lee Jones Subject: [PATCH 51/73] regulator: ab8500: Regulator vaux8 not declared using correct name Date: Mon, 4 Feb 2013 11:54:06 +0000 Message-Id: <1359978868-28736-52-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: ALoCoQnrCmPKfwU4WnAxUCaJEukAgx4DAyooY/JtGP2N+PLrr0urd+gbaaDCvDbcfUuJnSFnJbl4 From: Marcus Cooper vaux8 regulator isn't declared correctly for the AB8505. Signed-off-by: Marcus Cooper Signed-off-by: Lee Jones Reviewed-by: Jonas ABERG Reviewed-by: Mattias WALLIN --- arch/arm/mach-ux500/board-mop500-regulators.c | 21 +++++++++++++-------- drivers/regulator/ab8500.c | 6 +++--- include/linux/regulator/ab8500.h | 2 +- 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/arch/arm/mach-ux500/board-mop500-regulators.c b/arch/arm/mach-ux500/board-mop500-regulators.c index 1b51f6d..b0f5e8f 100644 --- a/arch/arm/mach-ux500/board-mop500-regulators.c +++ b/arch/arm/mach-ux500/board-mop500-regulators.c @@ -109,6 +109,11 @@ static struct regulator_consumer_supply ab8505_vaux5_consumers[] = { static struct regulator_consumer_supply ab8505_vaux6_consumers[] = { }; +static struct regulator_consumer_supply ab8505_vaux8_consumers[] = { + /* AB8500 audio codec device */ + REGULATOR_SUPPLY("v-aux8", NULL), +}; + static struct regulator_consumer_supply ab8505_vadc_consumers[] = { /* Internal general-purpose ADC */ REGULATOR_SUPPLY("vddadc", "ab8500-gpadc.0"), @@ -609,7 +614,7 @@ static struct ab8500_regulator_reg_init ab8505_reg_init[] = { INIT_REGULATOR_REGISTER(AB8505_REGUMISC1, 0xfe, 0x10), /* * VaudioEna = disabled - * VdmicEna = disabled + * Vaux8Ena = disabled * Vamic1Ena = disabled * Vamic2Ena = disabled */ @@ -725,8 +730,8 @@ static struct ab8500_regulator_reg_init ab8505_reg_init[] = { INIT_REGULATOR_REGISTER(AB8505_REGUCTRLDISCH, 0xfc, 0x00), /* * VanaDisch = short discharge time - * VdmicPullDownEna = pulldown disabled when Vdmic is disabled - * VdmicDisch = short discharge time + * Vaux8PullDownEna = pulldown disabled when Vaux8 is disabled + * Vaux8Disch = short discharge time */ INIT_REGULATOR_REGISTER(AB8505_REGUCTRLDISCH2, 0x16, 0x00), /* @@ -879,14 +884,14 @@ struct regulator_init_data ab8505_regulators[AB8505_NUM_REGULATORS] = { .num_consumer_supplies = ARRAY_SIZE(ab8500_vamic2_consumers), .consumer_supplies = ab8500_vamic2_consumers, }, - /* supply for v-dmic, VDMIC LDO */ - [AB8505_LDO_DMIC] = { + /* supply for v-aux8, VAUX8 LDO */ + [AB8505_LDO_AUX8] = { .constraints = { - .name = "V-DMIC", + .name = "V-AUX8", .valid_ops_mask = REGULATOR_CHANGE_STATUS, }, - .num_consumer_supplies = ARRAY_SIZE(ab8500_vdmic_consumers), - .consumer_supplies = ab8500_vdmic_consumers, + .num_consumer_supplies = ARRAY_SIZE(ab8505_vaux8_consumers), + .consumer_supplies = ab8505_vaux8_consumers, }, /* supply for v-intcore12, VINTCORE12 LDO */ [AB8505_LDO_INTCORE] = { diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c index 7089a38..12ec061 100644 --- a/drivers/regulator/ab8500.c +++ b/drivers/regulator/ab8500.c @@ -883,12 +883,12 @@ static struct ab8500_regulator_info .update_mask = 0x10, .update_val = 0x10, }, - [AB8505_LDO_DMIC] = { + [AB8505_LDO_AUX8] = { .desc = { - .name = "LDO-DMIC", + .name = "LDO-AUX8", .ops = &ab8500_regulator_ops, .type = REGULATOR_VOLTAGE, - .id = AB8505_LDO_DMIC, + .id = AB8505_LDO_AUX8, .owner = THIS_MODULE, .n_voltages = 1, .volt_table = fixed_1800000_voltage, diff --git a/include/linux/regulator/ab8500.h b/include/linux/regulator/ab8500.h index caa9f6a..1d33586 100644 --- a/include/linux/regulator/ab8500.h +++ b/include/linux/regulator/ab8500.h @@ -42,7 +42,7 @@ enum ab8505_regulator_id { AB8505_LDO_AUDIO, AB8505_LDO_ANAMIC1, AB8505_LDO_ANAMIC2, - AB8505_LDO_DMIC, + AB8505_LDO_AUX8, AB8505_LDO_ANA, AB8505_SYSCLKREQ_2, AB8505_SYSCLKREQ_4,