From: Richard Fitzgerald <rf@opensource.wolfsonmicro.com>
To: <broonie@kernel.org>, <cw00.choi@samsung.com>,
<dmitry.torokhov@gmail.com>
Cc: <linux-kernel@vger.kernel.org>, <alsa-devel@alsa-project.org>,
<patches@opensource.wolfsonmicro.com>, <myungjoo.ham@samsung.com>,
<linux-input@vger.kernel.org>
Subject: [PATCH V2 3/5] regulator: arizona-micsupp: Use SoC component pin control functions
Date: Tue, 29 Nov 2016 15:44:40 +0000 [thread overview]
Message-ID: <1480434282-26389-4-git-send-email-rf@opensource.wolfsonmicro.com> (raw)
In-Reply-To: <1480434282-26389-1-git-send-email-rf@opensource.wolfsonmicro.com>
The name of a codec pin can have an optional prefix string, which is
defined by the SoC machine driver. The snd_soc_dapm_x_pin functions
take the fully-specified name including the prefix and so the existing
code would fail to find the pin if the audio machine driver had added
a prefix.
Switch to using the snd_soc_component_x_pin equivalent functions that
take a specified SoC component and automatically add the name prefix to
the provided pin name.
Signed-off-by: Richard Fitzgerald <rf@opensource.wolfsonmicro.com>
---
drivers/regulator/arizona-micsupp.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/regulator/arizona-micsupp.c b/drivers/regulator/arizona-micsupp.c
index fcb98db..1439462 100644
--- a/drivers/regulator/arizona-micsupp.c
+++ b/drivers/regulator/arizona-micsupp.c
@@ -45,6 +45,7 @@ static void arizona_micsupp_check_cp(struct work_struct *work)
struct arizona_micsupp *micsupp =
container_of(work, struct arizona_micsupp, check_cp_work);
struct snd_soc_dapm_context *dapm = micsupp->arizona->dapm;
+ struct snd_soc_component *component = snd_soc_dapm_to_component(dapm);
struct arizona *arizona = micsupp->arizona;
struct regmap *regmap = arizona->regmap;
unsigned int reg;
@@ -59,9 +60,10 @@ static void arizona_micsupp_check_cp(struct work_struct *work)
if (dapm) {
if ((reg & (ARIZONA_CPMIC_ENA | ARIZONA_CPMIC_BYPASS)) ==
ARIZONA_CPMIC_ENA)
- snd_soc_dapm_force_enable_pin(dapm, "MICSUPP");
+ snd_soc_component_force_enable_pin(component,
+ "MICSUPP");
else
- snd_soc_dapm_disable_pin(dapm, "MICSUPP");
+ snd_soc_component_disable_pin(component, "MICSUPP");
snd_soc_dapm_sync(dapm);
}
--
1.9.1
next prev parent reply other threads:[~2016-11-29 15:45 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-29 15:44 [PATCH V2 0/5] ASoC/arizona: Ensure pin searches use widget name prefix Richard Fitzgerald
2016-11-29 15:44 ` [PATCH V2 1/5] ASoC: core: Add component pin control functions Richard Fitzgerald
2016-11-30 17:16 ` Applied "ASoC: core: Add component pin control functions" to the asoc tree Mark Brown
2016-11-29 15:44 ` [PATCH V2 2/5] ASoC: arizona: Use component pin control functions Richard Fitzgerald
2016-11-30 18:07 ` Applied "ASoC: arizona: Use component pin control functions" to the asoc tree Mark Brown
2016-11-29 15:44 ` Richard Fitzgerald [this message]
2016-11-29 15:44 ` [PATCH V2 4/5] extcon: arizona: Use SoC component pin control functions Richard Fitzgerald
2016-11-30 0:19 ` Chanwoo Choi
2016-11-30 17:27 ` Mark Brown
2016-12-01 1:56 ` Chanwoo Choi
2016-11-29 15:44 ` [PATCH V2 5/5] Input: arizona-haptics - " Richard Fitzgerald
2016-11-30 1:41 ` Dmitry Torokhov
2016-11-30 17:28 ` Mark Brown
2016-11-30 18:30 ` Dmitry Torokhov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1480434282-26389-4-git-send-email-rf@opensource.wolfsonmicro.com \
--to=rf@opensource.wolfsonmicro.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=cw00.choi@samsung.com \
--cc=dmitry.torokhov@gmail.com \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=myungjoo.ham@samsung.com \
--cc=patches@opensource.wolfsonmicro.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).