Received-SPF: pass (google.com: domain of linux-kernel+bounces-209254-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Message-ID: <33772eab-74c6-c5c3-fa25-3a643a2f9c57@quicinc.com>
Date: Tue, 11 Jun 2024 10:09:52 +0530
Precedence: bulk
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101
 Thunderbird/91.9.1
Subject: Re: [RESEND v5 6/7] ASoC: codecs: wcd937x: add capture dapm widgets
Content-Language: en-US
To: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>,
        Banajit Goswami
	<bgoswami@quicinc.com>,
        Liam Girdwood <lgirdwood@gmail.com>, Mark Brown
	<broonie@kernel.org>,
        Rob Herring <robh@kernel.org>,
        Krzysztof Kozlowski
	<krzk+dt@kernel.org>,
        Conor Dooley <conor+dt@kernel.org>, Jaroslav Kysela
	<perex@perex.cz>,
        Takashi Iwai <tiwai@suse.com>
CC: <alsa-devel@alsa-project.org>, <linux-arm-msm@vger.kernel.org>,
        <linux-sound@vger.kernel.org>, <devicetree@vger.kernel.org>,
        <linux-kernel@vger.kernel.org>, <quic_rohkumar@quicinc.com>,
        <quic_pkumpatl@quicinc.com>, Konrad Dybcio <konrad.dybcio@linaro.org>
References: <20240527111956.444425-1-quic_mohs@quicinc.com>
 <20240527111956.444425-7-quic_mohs@quicinc.com>
 <ba911ebd-aef5-46af-ace1-84d13bee6876@linaro.org>
From: Mohammad Rafi Shaik <quic_mohs@quicinc.com>
In-Reply-To: <ba911ebd-aef5-46af-ace1-84d13bee6876@linaro.org>
Content-Type: text/plain; charset="UTF-8"; format=flowed
Content-Transfer-Encoding: 8bit

On 6/10/2024 12:35 PM, Srinivas Kandagatla wrote:
> 
> 
> On 27/05/2024 12:19, Mohammad Rafi Shaik wrote:
>> +static int __wcd937x_codec_enable_micbias(struct snd_soc_dapm_widget *w,
>> +                      int event)
>> +{
>> +    struct snd_soc_component *component = 
>> snd_soc_dapm_to_component(w->dapm);
>> +    int micb_num;
>> +
>> +    if (strnstr(w->name, "MIC BIAS1", sizeof("MIC BIAS1")))
>> +        micb_num = MIC_BIAS_1;
>> +    else if (strnstr(w->name, "MIC BIAS2", sizeof("MIC BIAS2")))
>> +        micb_num = MIC_BIAS_2;
>> +    else if (strnstr(w->name, "MIC BIAS3", sizeof("MIC BIAS3")))
>> +        micb_num = MIC_BIAS_3;
>> +    else
>> +        return -EINVAL;
>> +
> See last comment..
> 
>> +    switch (event) {
>> +    case SND_SOC_DAPM_PRE_PMU:
>> +        wcd937x_micbias_control(component, micb_num,
>> +                    MICB_ENABLE, true);
>> +        break;
>> +    case SND_SOC_DAPM_POST_PMU:
>> +        usleep_range(1000, 1100);
>> +        break;
>> +    case SND_SOC_DAPM_POST_PMD:
>> +        wcd937x_micbias_control(component, micb_num,
>> +                    MICB_DISABLE, true);
>> +        break;
>> +    }
>> +
>> +    return 0;
>> +}
>> +
>> +static int wcd937x_codec_enable_micbias(struct snd_soc_dapm_widget *w,
>> +                    struct snd_kcontrol *kcontrol,
>> +                    int event)
>> +{
>> +    return __wcd937x_codec_enable_micbias(w, event);
>> +}
>> +
>> +static int __wcd937x_codec_enable_micbias_pullup(struct 
>> snd_soc_dapm_widget *w,
>> +                         int event)
>> +{
>> +    struct snd_soc_component *component = 
>> snd_soc_dapm_to_component(w->dapm);
>> +    int micb_num;
>> +
>> +    if (strnstr(w->name, "VA MIC BIAS1", sizeof("VA MIC BIAS1")))
>> +        micb_num = MIC_BIAS_1;
>> +    else if (strnstr(w->name, "VA MIC BIAS2", sizeof("VA MIC BIAS2")))
>> +        micb_num = MIC_BIAS_2;
>> +    else if (strnstr(w->name, "VA MIC BIAS3", sizeof("VA MIC BIAS3")))
>> +        micb_num = MIC_BIAS_3;
>> +    else
>> +        return -EINVAL;
>> +
> same..
>> +    switch (event) {
>> +    case SND_SOC_DAPM_PRE_PMU:
>> +        wcd937x_micbias_control(component, micb_num, 
>> MICB_PULLUP_ENABLE, true);
>> +        break;
>> +    case SND_SOC_DAPM_POST_PMU:
>> +        usleep_range(1000, 1100);
>> +        break;
>> +    case SND_SOC_DAPM_POST_PMD:
>> +        wcd937x_micbias_control(component, micb_num, 
>> MICB_PULLUP_DISABLE, true);
>> +        break;
>> +    }
>> +
>> +    return 0;
>> +}
>> +
> 
> ...
> 
>>   static const struct snd_soc_dapm_widget wcd937x_dapm_widgets[] = {
> ...> +    /* MIC_BIAS widgets */
>> +    SND_SOC_DAPM_SUPPLY("MIC BIAS1", SND_SOC_NOPM, 0, 0,
> Please use shift here like
>          SND_SOC_DAPM_SUPPLY("MIC BIAS1", SND_SOC_NOPM, MIC_BIAS_1, 0,
>          SND_SOC_DAPM_SUPPLY("MIC BIAS2", SND_SOC_NOPM, MIC_BIAS_2, 0,
> 
> to avoid doing a string compares on wideget name.
> 
> --srini
> 

ACK

Will remove the string compares on widget name and will use the shift here.

Thanks & Regards,
Rafi.

>> +                wcd937x_codec_enable_micbias,
>> +                SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU |
>> +                SND_SOC_DAPM_POST_PMD),
>> +    SND_SOC_DAPM_SUPPLY("MIC BIAS2", SND_SOC_NOPM, 0, 0,
>> +                wcd937x_codec_enable_micbias,
>> +                SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU |
>> +                SND_SOC_DAPM_POST_PMD),
>> +    SND_SOC_DAPM_SUPPLY("MIC BIAS3", SND_SOC_NOPM, 0, 0,
>> +                wcd937x_codec_enable_micbias,
>> +                SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU |
>> +                SND_SOC_DAPM_POST_PMD),
>> +
>>       SND_SOC_DAPM_SUPPLY("VDD_BUCK", SND_SOC_NOPM, 0, 0,
>>                   wcd937x_codec_enable_vdd_buck,
>>                   SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),
>> @@ -2007,11 +2312,101 @@ static const struct snd_soc_dapm_widget 
>> wcd937x_dapm_widgets[] = {
>>       SND_SOC_DAPM_MIXER("HPHR_RDAC", SND_SOC_NOPM, 0, 0,
>>                  hphr_rdac_switch, ARRAY_SIZE(hphr_rdac_switch)),
>> +    /* TX output widgets */
>> +    SND_SOC_DAPM_OUTPUT("ADC1_OUTPUT"),
>> +    SND_SOC_DAPM_OUTPUT("ADC2_OUTPUT"),
>> +    SND_SOC_DAPM_OUTPUT("ADC3_OUTPUT"),
>> +    SND_SOC_DAPM_OUTPUT("WCD_TX_OUTPUT"),
>> +
>>       /* RX output widgets */
>>       SND_SOC_DAPM_OUTPUT("EAR"),
>>       SND_SOC_DAPM_OUTPUT("AUX"),
>>       SND_SOC_DAPM_OUTPUT("HPHL"),
>>       SND_SOC_DAPM_OUTPUT("HPHR"),
>> +
>> +    /* MIC_BIAS pull up widgets */
>> +    SND_SOC_DAPM_SUPPLY("VA MIC BIAS1", SND_SOC_NOPM, 0, 0,
>> +                wcd937x_codec_enable_micbias_pullup,
>> +                SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU |
>> +                SND_SOC_DAPM_POST_PMD),
>> +    SND_SOC_DAPM_SUPPLY("VA MIC BIAS2", SND_SOC_NOPM, 0, 0,
>> +                wcd937x_codec_enable_micbias_pullup,
>> +                SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU |
>> +                SND_SOC_DAPM_POST_PMD),
>> +    SND_SOC_DAPM_SUPPLY("VA MIC BIAS3", SND_SOC_NOPM, 0, 0,
>> +                wcd937x_codec_enable_micbias_pullup,
>> +                SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU |
>> +                SND_SOC_DAPM_POST_PMD),