From: Chen-Yu Tsai <wens@csie.org>
To: Icenowy Zheng <icenowy@aosc.xyz>
Cc: Vinod Koul <vinod.koul@intel.com>,
Rob Herring <robh+dt@kernel.org>,
Maxime Ripard <maxime.ripard@free-electrons.com>,
Chen-Yu Tsai <wens@csie.org>, Mark Brown <broonie@kernel.org>,
"dmaengine@vger.kernel.org" <dmaengine@vger.kernel.org>,
"devicetree@vger.kernel.org" <devicetree@vger.kernel.org>,
"linux-arm-kernel@lists.infradead.org"
<linux-arm-kernel@lists.infradead.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"alsa-devel@alsa-project.org" <alsa-devel@alsa-project.org>,
"linux-sunxi@googlegroups.com" <linux-sunxi@googlegroups.com>
Subject: Re: [linux-sunxi] Re: [PATCH v2 03/12] ASoC: sun8i-codec-analog: split out mbias
Date: Mon, 6 Mar 2017 11:46:22 +0800 [thread overview]
Message-ID: <CAGb2v65zaUEDc4BtEKA=zN17hGeQZaCmX3xROM8KGSxtDPZ2mg@mail.gmail.com> (raw)
In-Reply-To: <6803451488721799@web16g.yandex.ru>
On Sun, Mar 5, 2017 at 9:49 PM, Icenowy Zheng <icenowy@aosc.xyz> wrote:
>
>
> 05.03.2017, 21:38, "Icenowy Zheng" <icenowy@aosc.xyz>:
>> Allwinner V3s features an analog codec without MBIAS pin.
>>
>> Split out this part, in order to prepare for the V3s analog codec.
>>
>> Signed-off-by: Icenowy Zheng <icenowy@aosc.xyz>
>> ---
>> sound/soc/sunxi/sun8i-codec-analog.c | 34 +++++++++++++++++++++++++++++-----
>> 1 file changed, 29 insertions(+), 5 deletions(-)
>>
>
> Sorry a definiation of has_mbias is mising in the patch...
>
> It's
>
> diff --git a/sound/soc/sunxi/sun8i-codec-analog.c b/sound/soc/sunxi/sun8i-codec-analog.c
> index af56afe5c403..edcc3eb7cd9a 100644
> --- a/sound/soc/sunxi/sun8i-codec-analog.c
> +++ b/sound/soc/sunxi/sun8i-codec-analog.c
> @@ -695,6 +695,7 @@ struct sun8i_codec_analog_quirks {
> bool has_hmic;
> bool has_linein;
> bool has_lineout;
> + bool has_mbias;
> bool has_mic2;
> };
Please incorporate this into the patch in the next version, with
Acked-by: Chen-Yu Tsai <wens@csie.org>
>
>
>> diff --git a/sound/soc/sunxi/sun8i-codec-analog.c b/sound/soc/sunxi/sun8i-codec-analog.c
>> index 6c17c99c2c8d..af56afe5c403 100644
>> --- a/sound/soc/sunxi/sun8i-codec-analog.c
>> +++ b/sound/soc/sunxi/sun8i-codec-analog.c
>> @@ -289,11 +289,6 @@ static const struct snd_soc_dapm_widget sun8i_codec_common_widgets[] = {
>> /* Microphone input */
>> SND_SOC_DAPM_INPUT("MIC1"),
>>
>> - /* Microphone Bias */
>> - SND_SOC_DAPM_SUPPLY("MBIAS", SUN8I_ADDA_MIC1G_MICBIAS_CTRL,
>> - SUN8I_ADDA_MIC1G_MICBIAS_CTRL_MMICBIASEN,
>> - 0, NULL, 0),
>> -
>> /* Mic input path */
>> SND_SOC_DAPM_PGA("Mic1 Amplifier", SUN8I_ADDA_MIC1G_MICBIAS_CTRL,
>> SUN8I_ADDA_MIC1G_MICBIAS_CTRL_MIC1AMPEN, 0, NULL, 0),
>> @@ -453,6 +448,27 @@ static int sun8i_codec_add_headphone(struct snd_soc_component *cmpnt)
>> return 0;
>> }
>>
>> +/* mbias specific widget */
>> +static const struct snd_soc_dapm_widget sun8i_codec_mbias_widgets[] = {
>> + SND_SOC_DAPM_SUPPLY("MBIAS", SUN8I_ADDA_MIC1G_MICBIAS_CTRL,
>> + SUN8I_ADDA_MIC1G_MICBIAS_CTRL_MMICBIASEN,
>> + 0, NULL, 0),
>> +};
>> +
>> +static int sun8i_codec_add_mbias(struct snd_soc_component *cmpnt)
>> +{
>> + struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(cmpnt);
>> + struct device *dev = cmpnt->dev;
>> + int ret;
>> +
>> + ret = snd_soc_dapm_new_controls(dapm, sun8i_codec_mbias_widgets,
>> + ARRAY_SIZE(sun8i_codec_mbias_widgets));
>> + if (ret)
>> + dev_err(dev, "Failed to add MBIAS DAPM widgets: %d\n", ret);
>> +
>> + return ret;
>> +}
>> +
>> /* hmic specific widget */
>> static const struct snd_soc_dapm_widget sun8i_codec_hmic_widgets[] = {
>> SND_SOC_DAPM_SUPPLY("HBIAS", SUN8I_ADDA_MIC1G_MICBIAS_CTRL,
>> @@ -686,12 +702,14 @@ static const struct sun8i_codec_analog_quirks sun8i_a23_quirks = {
>> .has_headphone = true,
>> .has_hmic = true,
>> .has_linein = true,
>> + .has_mbias = true,
>> .has_mic2 = true,
>> };
>>
>> static const struct sun8i_codec_analog_quirks sun8i_h3_quirks = {
>> .has_linein = true,
>> .has_lineout = true,
>> + .has_mbias = true,
>> .has_mic2 = true,
>> };
>>
>> @@ -734,6 +752,12 @@ static int sun8i_codec_analog_cmpnt_probe(struct snd_soc_component *cmpnt)
>> return ret;
>> }
>>
>> + if (quirks->has_mbias) {
>> + ret = sun8i_codec_add_mbias(cmpnt);
>> + if (ret)
>> + return ret;
>> + }
>> +
>> if (quirks->has_mic2) {
>> ret = sun8i_codec_add_mic2(cmpnt);
>> if (ret)
>> --
>> 2.11.1
>
> --
> You received this message because you are subscribed to the Google Groups "linux-sunxi" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to linux-sunxi+unsubscribe@googlegroups.com.
> For more options, visit https://groups.google.com/d/optout.
next prev parent reply other threads:[~2017-03-06 3:58 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20170305133709.6288-1-icenowy@aosc.xyz>
[not found] ` <20170305133709.6288-2-icenowy@aosc.xyz>
2017-03-06 3:43 ` [linux-sunxi] [PATCH v2 01/12] ASoC: sun8i-codec-analog: split out mic2 Chen-Yu Tsai
2017-03-15 18:13 ` Applied "ASoC: sun8i-codec-analog: split out mic2" to the asoc tree Mark Brown
[not found] ` <20170305133709.6288-7-icenowy@aosc.xyz>
2017-03-06 3:50 ` [PATCH v2 06/12] dmaengine: sun6i: make gate bit in sun8i's DMA engines a common quirk Chen-Yu Tsai
2017-03-14 4:10 ` Vinod Koul
[not found] ` <20170305133709.6288-5-icenowy@aosc.xyz>
2017-03-06 3:53 ` [linux-sunxi] [PATCH v2 04/12] ASoC: sun8i-codec-analog: add support for V3s SoC Chen-Yu Tsai
[not found] ` <20170305133709.6288-8-icenowy@aosc.xyz>
2017-03-06 3:58 ` [linux-sunxi] [PATCH v2 07/12] dmaengine: sun6i: support V3s SoC variant Chen-Yu Tsai
[not found] ` <20170305133709.6288-6-icenowy@aosc.xyz>
2017-03-06 4:05 ` [linux-sunxi] [PATCH v2 05/12] ASoC: sun4i-codec: Add support for V3s codec Chen-Yu Tsai
2017-03-06 4:15 ` Chen-Yu Tsai
[not found] ` <20170305133709.6288-9-icenowy@aosc.xyz>
2017-03-06 4:12 ` [linux-sunxi] [PATCH v2 08/12] ARM: dts: sun8i: restore the inclusion of ccu headers in V3s DTSI Chen-Yu Tsai
[not found] ` <20170305133709.6288-10-icenowy@aosc.xyz>
2017-03-06 4:13 ` [linux-sunxi] [PATCH v2 09/12] ARM: dts: sun8i: add DMA engine " Chen-Yu Tsai
[not found] ` <20170305133709.6288-11-icenowy@aosc.xyz>
2017-03-06 4:17 ` [PATCH v2 10/12] ARM: dts: sun8i: add audio codec support into " Chen-Yu Tsai
[not found] ` <20170305133709.6288-12-icenowy@aosc.xyz>
2017-03-06 4:22 ` [linux-sunxi] [PATCH v2 11/12] ARM: dts: sun8i: add pinmux for V3s mmc1 Chen-Yu Tsai
[not found] ` <20170305133709.6288-13-icenowy@aosc.xyz>
2017-03-06 4:28 ` [linux-sunxi] [PATCH v2 12/12] ARM: dts: sun8i: add device tree for Lichee Pi Zero with Dock Chen-Yu Tsai
[not found] ` <20170305133709.6288-4-icenowy@aosc.xyz>
[not found] ` <6803451488721799@web16g.yandex.ru>
2017-03-06 3:46 ` Chen-Yu Tsai [this message]
2017-03-07 0:15 ` [alsa-devel] [PATCH v2 03/12] ASoC: sun8i-codec-analog: split out mbias kbuild test robot
2017-03-07 8:57 ` [PATCH v2 00/12] Add support for the audio codec on Allwinner V3s Vinod Koul
[not found] ` <20170305133709.6288-3-icenowy@aosc.xyz>
2017-03-06 3:45 ` [linux-sunxi] [PATCH v2 02/12] ASoC: sun8i-codec-analog: split out line in Chen-Yu Tsai
2017-03-15 18:13 ` Applied "ASoC: sun8i-codec-analog: split out line in" to the asoc tree Mark Brown
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='CAGb2v65zaUEDc4BtEKA=zN17hGeQZaCmX3xROM8KGSxtDPZ2mg@mail.gmail.com' \
--to=wens@csie.org \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=dmaengine@vger.kernel.org \
--cc=icenowy@aosc.xyz \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sunxi@googlegroups.com \
--cc=maxime.ripard@free-electrons.com \
--cc=robh+dt@kernel.org \
--cc=vinod.koul@intel.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
all inboxes | Powered by JetHome®