[alsa-devel] [PATCH 4/6] ASoC: Intel: bytcr_rt5651: Add IN2 input mapping

[Pierre-Louis Bossart]

On 7/19/18 6:37 AM, Hans de Goede wrote:
> Hi,
> 
> On 18-07-18 23:20, Pierre-Louis Bossart wrote:
>>
>>
>> On 07/18/2018 03:55 PM, Hans de Goede wrote:
>>> During the recent cleanup series 3 of the 6 input mappings where removed
>>> from the bytcr_rt5651 machine driver because testing showed that none of
>>> them were used.
>>>
>>> However some devices do actually have their internal mic on IN2 (and
>>> only IN2, not IN1 and IN2), this did not show during previous tests
>>> due to a bug in the userspace UCM input device switching code.
>>>
>>> This commit re-adds the IN2 mapping for devices with the internal mic.
>>> on IN2 and the headser mic on IN3 and enables this mapping on devices
>>> with their internal mic on IN2.
>> I am getting dizzy :-)
>> is the conclusion that hs==IN3 (no change) and int-mic==(DMIC, IN1, 
>> IN2, IN12)
> 
> Yes that is the conclusion. Sorry about this, as said my previous
> testing was wrong because of an userspace bug (which I still need to
> track down).
> 
>  > and the UCM names only use the latter for differentiation of profiles?
> 
> Correct. This pretty much fully aligns the rt5651 code with the rt5640 code
> wrt long-names.

Sounds good, the patches look ok to me. Thanks for all the work you've 
been doing on this platform.
All the bytcr_rt5651 changes

Acked-by: Pierre-Louis Bossart <pierre-louis.bossart at linux.intel.com>



> 
> Regards,
> 
> Hans
> 
> 
>>
>>>
>>> This commit also changes the default internal mic input to IN2, because
>>> all my 7 test devices have their mic there.
>>>
>>> Signed-off-by: Hans de Goede <hdegoede at redhat.com>
>>> ---
>>> Note I have put getting to the bottom of the UCM input device switching
>>> code and fixing it on my TODO list
>>> ---
>>>   sound/soc/intel/boards/bytcr_rt5651.c | 23 ++++++++++++++++++-----
>>>   1 file changed, 18 insertions(+), 5 deletions(-)
>>>
>>> diff --git a/sound/soc/intel/boards/bytcr_rt5651.c 
>>> b/sound/soc/intel/boards/bytcr_rt5651.c
>>> index 53ac97c15fc6..d85530b1cc8e 100644
>>> --- a/sound/soc/intel/boards/bytcr_rt5651.c
>>> +++ b/sound/soc/intel/boards/bytcr_rt5651.c
>>> @@ -44,6 +44,7 @@
>>>   enum {
>>>       BYT_RT5651_DMIC_MAP,
>>>       BYT_RT5651_IN1_MAP,
>>> +    BYT_RT5651_IN2_MAP,
>>>       BYT_RT5651_IN1_IN2_MAP,
>>>   };
>>> @@ -93,9 +94,9 @@ struct byt_rt5651_private {
>>>       struct snd_soc_jack jack;
>>>   };
>>> -/* Default: jack-detect on JD1_1, internal mic on in1, headsetmic on 
>>> in3 */
>>> +/* Default: jack-detect on JD1_1, internal mic on in2, headsetmic on 
>>> in3 */
>>>   static unsigned long byt_rt5651_quirk = BYT_RT5651_DEFAULT_QUIRKS |
>>> -                    BYT_RT5651_IN1_MAP;
>>> +                    BYT_RT5651_IN2_MAP;
>>>   static void log_quirks(struct device *dev)
>>>   {
>>> @@ -103,6 +104,8 @@ static void log_quirks(struct device *dev)
>>>           dev_info(dev, "quirk DMIC_MAP enabled");
>>>       if (BYT_RT5651_MAP(byt_rt5651_quirk) == BYT_RT5651_IN1_MAP)
>>>           dev_info(dev, "quirk IN1_MAP enabled");
>>> +    if (BYT_RT5651_MAP(byt_rt5651_quirk) == BYT_RT5651_IN2_MAP)
>>> +        dev_info(dev, "quirk IN2_MAP enabled");
>>>       if (BYT_RT5651_MAP(byt_rt5651_quirk) == BYT_RT5651_IN1_IN2_MAP)
>>>           dev_info(dev, "quirk IN1_IN2_MAP enabled");
>>>       if (BYT_RT5651_JDSRC(byt_rt5651_quirk)) {
>>> @@ -270,6 +273,12 @@ static const struct snd_soc_dapm_route 
>>> byt_rt5651_intmic_in1_map[] = {
>>>       {"IN3P", NULL, "Headset Mic"},
>>>   };
>>> +static const struct snd_soc_dapm_route byt_rt5651_intmic_in2_map[] = {
>>> +    {"Internal Mic", NULL, "micbias1"},
>>> +    {"IN2P", NULL, "Internal Mic"},
>>> +    {"IN3P", NULL, "Headset Mic"},
>>> +};
>>> +
>>>   static const struct snd_soc_dapm_route 
>>> byt_rt5651_intmic_in1_in2_map[] = {
>>>       {"Internal Mic", NULL, "micbias1"},
>>>       {"IN1P", NULL, "Internal Mic"},
>>> @@ -364,7 +373,7 @@ static const struct dmi_system_id 
>>> byt_rt5651_quirk_table[] = {
>>>               DMI_MATCH(DMI_PRODUCT_NAME, "X1D3_C806N"),
>>>           },
>>>           .driver_data = (void *)(BYT_RT5651_DEFAULT_QUIRKS |
>>> -                    BYT_RT5651_IN1_MAP |
>>> +                    BYT_RT5651_IN2_MAP |
>>>                       BYT_RT5651_HP_LR_SWAPPED),
>>>       },
>>>       {
>>> @@ -375,7 +384,7 @@ static const struct dmi_system_id 
>>> byt_rt5651_quirk_table[] = {
>>>               DMI_MATCH(DMI_PRODUCT_NAME, "D2D3_Vi8A1"),
>>>           },
>>>           .driver_data = (void *)(BYT_RT5651_DEFAULT_QUIRKS |
>>> -                    BYT_RT5651_IN1_MAP |
>>> +                    BYT_RT5651_IN2_MAP |
>>>                       BYT_RT5651_HP_LR_SWAPPED),
>>>       },
>>>       {
>>> @@ -468,6 +477,10 @@ static int byt_rt5651_init(struct 
>>> snd_soc_pcm_runtime *runtime)
>>>           custom_map = byt_rt5651_intmic_in1_map;
>>>           num_routes = ARRAY_SIZE(byt_rt5651_intmic_in1_map);
>>>           break;
>>> +    case BYT_RT5651_IN2_MAP:
>>> +        custom_map = byt_rt5651_intmic_in2_map;
>>> +        num_routes = ARRAY_SIZE(byt_rt5651_intmic_in2_map);
>>> +        break;
>>>       case BYT_RT5651_IN1_IN2_MAP:
>>>           custom_map = byt_rt5651_intmic_in1_in2_map;
>>>           num_routes = ARRAY_SIZE(byt_rt5651_intmic_in1_in2_map);
>>> @@ -825,7 +838,7 @@ struct acpi_chan_package {   /* ACPICA seems to 
>>> require 64 bit integers */
>>>   static int snd_byt_rt5651_mc_probe(struct platform_device *pdev)
>>>   {
>>> -    const char * const mic_name[] = { "dmic", "in1", "in12" };
>>> +    const char * const mic_name[] = { "dmic", "in1", "in2", "in12" };
>>>       struct byt_rt5651_private *priv;
>>>       struct snd_soc_acpi_mach *mach;
>>>       struct device *codec_dev;
>>
> _______________________________________________
> Alsa-devel mailing list
> Alsa-devel at alsa-project.org
> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel