| Message ID | 20201102062408.331572-3-ajye_huang@compal.corp-partner.google.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v3,1/2] ASoC: google: dt-bindings: modify machine bindings for two MICs case | expand |
On Mon, Nov 2, 2020 at 2:24 PM Ajye Huang <ajye.huang@gmail.com> wrote: > > In addition, having mixer control to switch between DMICs by > using "dmic-gpios" property. > > Refer to this one as an example, > commit b7a742cff3f6 ("ASoC: AMD: Use mixer control to switch between DMICs") > > Signed-off-by: Ajye Huang <ajye_huang@compal.corp-partner.google.com> I am not sure if it would be better if you use another email (e.g. @gmail) for signoff. > +static int dmic_get(struct snd_kcontrol *kcontrol, > + struct snd_ctl_elem_value *ucontrol) > +{ > + struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_dapm(kcontrol); > + struct sc7180_snd_data *data = snd_soc_card_get_drvdata(dapm->card); > + > + if (data) You don't need to check for NULL. If snd_soc_card_get_drvdata() returns NULL, it shouldn't run into here. See other snd_soc_card_get_drvdata() calls in the file. > +static int dmic_set(struct snd_kcontrol *kcontrol, > + struct snd_ctl_elem_value *ucontrol) > +{ > + struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_dapm(kcontrol); > + struct sc7180_snd_data *data = snd_soc_card_get_drvdata(dapm->card); > + > + if (data) { Ditto. > + if (IS_ERR(data->dmic_sel)) { > + dev_err(&pdev->dev, "DMIC gpio failed err=%d\n", > + PTR_ERR(data->dmic_sel)); > + return PTR_ERR(data->dmic_sel); Remove 1 level indent.
On Mon, Nov 2, 2020 at 6:46 PM Tzung-Bi Shih <tzungbi@google.com> wrote: > > On Mon, Nov 2, 2020 at 2:24 PM Ajye Huang <ajye.huang@gmail.com> wrote: > > > > In addition, having mixer control to switch between DMICs by > > using "dmic-gpios" property. > > > > Refer to this one as an example, > > commit b7a742cff3f6 ("ASoC: AMD: Use mixer control to switch between DMICs") > > > > Signed-off-by: Ajye Huang <ajye_huang@compal.corp-partner.google.com> > > I am not sure if it would be better if you use another email (e.g. > @gmail) for signoff. > hi, Tzung-Bi Thank you for your review, it's our company's rule to use this PD account > > +static int dmic_get(struct snd_kcontrol *kcontrol, > > + struct snd_ctl_elem_value *ucontrol) > > +{ > > + struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_dapm(kcontrol); > > + struct sc7180_snd_data *data = snd_soc_card_get_drvdata(dapm->card); > > + > > + if (data) > > You don't need to check for NULL. If snd_soc_card_get_drvdata() > returns NULL, it shouldn't run into here. See other > snd_soc_card_get_drvdata() calls in the file. > your are right, I will remove on v4 > > +static int dmic_set(struct snd_kcontrol *kcontrol, > > + struct snd_ctl_elem_value *ucontrol) > > +{ > > + struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_dapm(kcontrol); > > + struct sc7180_snd_data *data = snd_soc_card_get_drvdata(dapm->card); > > + > > + if (data) { > > Ditto. > I will remove it on v4 > > + if (IS_ERR(data->dmic_sel)) { > > + dev_err(&pdev->dev, "DMIC gpio failed err=%d\n", > > + PTR_ERR(data->dmic_sel)); > > + return PTR_ERR(data->dmic_sel); > > Remove 1 level indent. Your are really attentive, I will remove the indent on v4, thank you so much.
diff --git a/sound/soc/qcom/sc7180.c b/sound/soc/qcom/sc7180.c index b391f64c3a80..f86db7871999 100644 --- a/sound/soc/qcom/sc7180.c +++ b/sound/soc/qcom/sc7180.c @@ -5,6 +5,8 @@ // sc7180.c -- ALSA SoC Machine driver for SC7180 #include <dt-bindings/sound/sc7180-lpass.h> +#include <linux/gpio.h> +#include <linux/gpio/consumer.h> #include <linux/module.h> #include <linux/of_device.h> #include <linux/platform_device.h> @@ -28,6 +30,8 @@ struct sc7180_snd_data { u32 pri_mi2s_clk_count; struct snd_soc_jack hs_jack; struct snd_soc_jack hdmi_jack; + struct gpio_desc *dmic_sel; + int dmic_switch; }; static void sc7180_jack_free(struct snd_jack *jack) @@ -169,6 +173,30 @@ static int sc7180_snd_startup(struct snd_pcm_substream *substream) return 0; } +static int dmic_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_dapm(kcontrol); + struct sc7180_snd_data *data = snd_soc_card_get_drvdata(dapm->card); + + if (data) + ucontrol->value.integer.value[0] = data->dmic_switch; + return 0; +} + +static int dmic_set(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_dapm(kcontrol); + struct sc7180_snd_data *data = snd_soc_card_get_drvdata(dapm->card); + + if (data) { + data->dmic_switch = ucontrol->value.integer.value[0]; + gpiod_set_value(data->dmic_sel, data->dmic_switch); + } + return 0; +} + static void sc7180_snd_shutdown(struct snd_pcm_substream *substream) { struct snd_soc_pcm_runtime *rtd = substream->private_data; @@ -206,6 +234,30 @@ static const struct snd_soc_dapm_widget sc7180_snd_widgets[] = { SND_SOC_DAPM_MIC("Headset Mic", NULL), }; +static const char * const dmic_mux_text[] = { + "Front Mic", + "Rear Mic", +}; + +static SOC_ENUM_SINGLE_DECL(sc7180_dmic_enum, + SND_SOC_NOPM, 0, dmic_mux_text); + +static const struct snd_kcontrol_new sc7180_dmic_mux_control = + SOC_DAPM_ENUM_EXT("DMIC Select Mux", sc7180_dmic_enum, + dmic_get, dmic_set); + +static const struct snd_soc_dapm_widget sc7180_snd_dual_mic_widgets[] = { + SND_SOC_DAPM_HP("Headphone Jack", NULL), + SND_SOC_DAPM_MIC("Headset Mic", NULL), + SND_SOC_DAPM_MIC("DMIC", NULL), + SND_SOC_DAPM_MUX("Dmic Mux", SND_SOC_NOPM, 0, 0, &sc7180_dmic_mux_control), +}; + +static const struct snd_soc_dapm_route sc7180_snd_dual_mic_audio_route[] = { + {"Dmic Mux", "Front Mic", "DMIC"}, + {"Dmic Mux", "Rear Mic", "DMIC"}, +}; + static void sc7180_add_ops(struct snd_soc_card *card) { struct snd_soc_dai_link *link; @@ -238,6 +290,19 @@ static int sc7180_snd_platform_probe(struct platform_device *pdev) card->dapm_widgets = sc7180_snd_widgets; card->num_dapm_widgets = ARRAY_SIZE(sc7180_snd_widgets); + if (of_property_read_bool(dev->of_node, "dmic-gpios")) { + card->dapm_widgets = sc7180_snd_dual_mic_widgets, + card->num_dapm_widgets = ARRAY_SIZE(sc7180_snd_dual_mic_widgets), + card->dapm_routes = sc7180_snd_dual_mic_audio_route, + card->num_dapm_routes = ARRAY_SIZE(sc7180_snd_dual_mic_audio_route), + data->dmic_sel = devm_gpiod_get(&pdev->dev, "dmic", GPIOD_OUT_LOW); + if (IS_ERR(data->dmic_sel)) { + dev_err(&pdev->dev, "DMIC gpio failed err=%d\n", + PTR_ERR(data->dmic_sel)); + return PTR_ERR(data->dmic_sel); + } + } + ret = qcom_snd_parse_of(card); if (ret) return ret;
In addition, having mixer control to switch between DMICs by using "dmic-gpios" property. Refer to this one as an example, commit b7a742cff3f6 ("ASoC: AMD: Use mixer control to switch between DMICs") Signed-off-by: Ajye Huang <ajye_huang@compal.corp-partner.google.com> --- sound/soc/qcom/sc7180.c | 65 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+)