kevin/linux
1
Fork 0
Code

ASoC: samsung: midas_wm1811: Use SND_SOC_DAPM_REGULATOR_SUPPLY for bias regulators

Browse Source 
Instead of using a custom function with the SND_SOC_DAPM_MIC widget,
split out the main mic/sub mic bias regulators into a separate widget
using SND_SOC_DAPM_REGULATOR_SUPPLY, and connect them via a routing.

Signed-off-by: Artur Weber <aweber.kernel@gmail.com>
Link: https://msgid.link/r/20240525-midas-wm1811-gpio-jack-v4-3-f488e03bd8c7@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Artur Weber 2024-05-25 15:28:07 +02:00 committed by Mark Brown
parent 0a590ecc67
commit c6aa3ade49
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 13 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
sound/soc/samsung/midas_wm1811.c
View File

@ -10,7 +10,6 @@
#include <linux/mfd/wm8994/registers.h> #include <linux/mfd/wm8994/registers.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/regulator/consumer.h>
#include <sound/jack.h> #include <sound/jack.h>
#include <sound/soc.h> #include <sound/soc.h>
#include <sound/soc-dapm.h> #include <sound/soc-dapm.h>
@ -27,8 +26,6 @@
#define DEFAULT_FLL1_RATE 11289600U #define DEFAULT_FLL1_RATE 11289600U
struct midas_priv { struct midas_priv {
struct regulator *reg_mic_bias;
struct regulator *reg_submic_bias;
struct gpio_desc *gpio_fm_sel; struct gpio_desc *gpio_fm_sel;
struct gpio_desc *gpio_lineout_sel; struct gpio_desc *gpio_lineout_sel;
unsigned int fll1_rate; unsigned int fll1_rate;
@ -169,38 +166,6 @@ static int midas_ext_spkmode(struct snd_soc_dapm_widget *w,
return ret; return ret;
} }
static int midas_mic_bias(struct snd_soc_dapm_widget *w,
struct snd_kcontrol *kcontrol, int event)
{
struct snd_soc_card *card = w->dapm->card;
struct midas_priv *priv = snd_soc_card_get_drvdata(card);
switch (event) {
case SND_SOC_DAPM_PRE_PMU:
return regulator_enable(priv->reg_mic_bias);
case SND_SOC_DAPM_POST_PMD:
return regulator_disable(priv->reg_mic_bias);
}
return 0;
}
static int midas_submic_bias(struct snd_soc_dapm_widget *w,
struct snd_kcontrol *kcontrol, int event)
{
struct snd_soc_card *card = w->dapm->card;
struct midas_priv *priv = snd_soc_card_get_drvdata(card);
switch (event) {
case SND_SOC_DAPM_PRE_PMU:
return regulator_enable(priv->reg_submic_bias);
case SND_SOC_DAPM_POST_PMD:
return regulator_disable(priv->reg_submic_bias);
}
return 0;
}
static int midas_fm_set(struct snd_soc_dapm_widget *w, static int midas_fm_set(struct snd_soc_dapm_widget *w,
struct snd_kcontrol *kcontrol, int event) struct snd_kcontrol *kcontrol, int event)
{ {
@ -272,8 +237,17 @@ static const struct snd_soc_dapm_widget midas_dapm_widgets[] = {
SND_SOC_DAPM_HP("Headphone", NULL), SND_SOC_DAPM_HP("Headphone", NULL),
SND_SOC_DAPM_MIC("Headset Mic", NULL), SND_SOC_DAPM_MIC("Headset Mic", NULL),
SND_SOC_DAPM_MIC("Main Mic", midas_mic_bias), SND_SOC_DAPM_MIC("Main Mic", NULL),
SND_SOC_DAPM_MIC("Sub Mic", midas_submic_bias), SND_SOC_DAPM_REGULATOR_SUPPLY("mic-bias", 0, 0),
SND_SOC_DAPM_MIC("Sub Mic", NULL),
SND_SOC_DAPM_REGULATOR_SUPPLY("submic-bias", 0, 0),
};
/* Default routing; supplemented by audio-routing DT property */
static const struct snd_soc_dapm_route midas_dapm_routes[] = {
/* Bind microphones with their respective regulator supplies */
{"Main Mic", NULL, "mic-bias"},
{"Sub Mic", NULL, "submic-bias"},
}; };
static int midas_set_bias_level(struct snd_soc_card *card, static int midas_set_bias_level(struct snd_soc_card *card,
@ -421,6 +395,8 @@ static struct snd_soc_card midas_card = {
.num_controls = ARRAY_SIZE(midas_controls), .num_controls = ARRAY_SIZE(midas_controls),
.dapm_widgets = midas_dapm_widgets, .dapm_widgets = midas_dapm_widgets,
.num_dapm_widgets = ARRAY_SIZE(midas_dapm_widgets), .num_dapm_widgets = ARRAY_SIZE(midas_dapm_widgets),
.dapm_routes = midas_dapm_routes,
.num_dapm_routes = ARRAY_SIZE(midas_dapm_routes),
.set_bias_level = midas_set_bias_level, .set_bias_level = midas_set_bias_level,
.late_probe = midas_late_probe, .late_probe = midas_late_probe,
@ -443,18 +419,6 @@ static int midas_probe(struct platform_device *pdev)
snd_soc_card_set_drvdata(card, priv); snd_soc_card_set_drvdata(card, priv);
card->dev = dev; card->dev = dev;
priv->reg_mic_bias = devm_regulator_get(dev, "mic-bias");
if (IS_ERR(priv->reg_mic_bias)) {
dev_err(dev, "Failed to get mic bias regulator\n");
return PTR_ERR(priv->reg_mic_bias);
}
priv->reg_submic_bias = devm_regulator_get(dev, "submic-bias");
if (IS_ERR(priv->reg_submic_bias)) {
dev_err(dev, "Failed to get submic bias regulator\n");
return PTR_ERR(priv->reg_submic_bias);
}
priv->gpio_fm_sel = devm_gpiod_get_optional(dev, "fm-sel", GPIOD_OUT_HIGH); priv->gpio_fm_sel = devm_gpiod_get_optional(dev, "fm-sel", GPIOD_OUT_HIGH);
if (IS_ERR(priv->gpio_fm_sel)) { if (IS_ERR(priv->gpio_fm_sel)) {
dev_err(dev, "Failed to get FM selection GPIO\n"); dev_err(dev, "Failed to get FM selection GPIO\n");