Commit 98cf9965 authored by Richard Fitzgerald's avatar Richard Fitzgerald Committed by Mark Brown

regulator: arizona-micsupp: Use SoC component pin control functions

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: default avatarRichard Fitzgerald <rf@opensource.wolfsonmicro.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent d00b7461
...@@ -45,6 +45,7 @@ static void arizona_micsupp_check_cp(struct work_struct *work) ...@@ -45,6 +45,7 @@ static void arizona_micsupp_check_cp(struct work_struct *work)
struct arizona_micsupp *micsupp = struct arizona_micsupp *micsupp =
container_of(work, struct arizona_micsupp, check_cp_work); container_of(work, struct arizona_micsupp, check_cp_work);
struct snd_soc_dapm_context *dapm = micsupp->arizona->dapm; 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 arizona *arizona = micsupp->arizona;
struct regmap *regmap = arizona->regmap; struct regmap *regmap = arizona->regmap;
unsigned int reg; unsigned int reg;
...@@ -59,9 +60,10 @@ static void arizona_micsupp_check_cp(struct work_struct *work) ...@@ -59,9 +60,10 @@ static void arizona_micsupp_check_cp(struct work_struct *work)
if (dapm) { if (dapm) {
if ((reg & (ARIZONA_CPMIC_ENA | ARIZONA_CPMIC_BYPASS)) == if ((reg & (ARIZONA_CPMIC_ENA | ARIZONA_CPMIC_BYPASS)) ==
ARIZONA_CPMIC_ENA) ARIZONA_CPMIC_ENA)
snd_soc_dapm_force_enable_pin(dapm, "MICSUPP"); snd_soc_component_force_enable_pin(component,
"MICSUPP");
else else
snd_soc_dapm_disable_pin(dapm, "MICSUPP"); snd_soc_component_disable_pin(component, "MICSUPP");
snd_soc_dapm_sync(dapm); snd_soc_dapm_sync(dapm);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment