lkml.org 
[lkml]   [2021]   [Sep]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.14 100/252] ASoC: Intel: bytcr_rt5640: Move "Platform Clock" routes to the maps for the matching in-/output
    Date
    From: Hans de Goede <hdegoede@redhat.com>

    [ Upstream commit dccd1dfd0770bfd494b68d1135b4547b2c602c42 ]

    Move the "Platform Clock" routes for the "Internal Mic" and "Speaker"
    routes to the intmic_*_map[] / *_spk_map[] arrays.

    This ensures that these "Platform Clock" routes do not get added when the
    BYT_RT5640_NO_INTERNAL_MIC_MAP / BYT_RT5640_NO_SPEAKERS quirks are used.

    Signed-off-by: Hans de Goede <hdegoede@redhat.com>
    Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
    Link: https://lore.kernel.org/r/20210802142501.991985-2-hdegoede@redhat.com
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/soc/intel/boards/bytcr_rt5640.c | 9 ++++++---
    1 file changed, 6 insertions(+), 3 deletions(-)

    diff --git a/sound/soc/intel/boards/bytcr_rt5640.c b/sound/soc/intel/boards/bytcr_rt5640.c
    index 91a6d712eb58..c403fb672594 100644
    --- a/sound/soc/intel/boards/bytcr_rt5640.c
    +++ b/sound/soc/intel/boards/bytcr_rt5640.c
    @@ -290,9 +290,6 @@ static const struct snd_soc_dapm_widget byt_rt5640_widgets[] = {
    static const struct snd_soc_dapm_route byt_rt5640_audio_map[] = {
    {"Headphone", NULL, "Platform Clock"},
    {"Headset Mic", NULL, "Platform Clock"},
    - {"Internal Mic", NULL, "Platform Clock"},
    - {"Speaker", NULL, "Platform Clock"},
    -
    {"Headset Mic", NULL, "MICBIAS1"},
    {"IN2P", NULL, "Headset Mic"},
    {"Headphone", NULL, "HPOL"},
    @@ -300,19 +297,23 @@ static const struct snd_soc_dapm_route byt_rt5640_audio_map[] = {
    };

    static const struct snd_soc_dapm_route byt_rt5640_intmic_dmic1_map[] = {
    + {"Internal Mic", NULL, "Platform Clock"},
    {"DMIC1", NULL, "Internal Mic"},
    };

    static const struct snd_soc_dapm_route byt_rt5640_intmic_dmic2_map[] = {
    + {"Internal Mic", NULL, "Platform Clock"},
    {"DMIC2", NULL, "Internal Mic"},
    };

    static const struct snd_soc_dapm_route byt_rt5640_intmic_in1_map[] = {
    + {"Internal Mic", NULL, "Platform Clock"},
    {"Internal Mic", NULL, "MICBIAS1"},
    {"IN1P", NULL, "Internal Mic"},
    };

    static const struct snd_soc_dapm_route byt_rt5640_intmic_in3_map[] = {
    + {"Internal Mic", NULL, "Platform Clock"},
    {"Internal Mic", NULL, "MICBIAS1"},
    {"IN3P", NULL, "Internal Mic"},
    };
    @@ -354,6 +355,7 @@ static const struct snd_soc_dapm_route byt_rt5640_ssp0_aif2_map[] = {
    };

    static const struct snd_soc_dapm_route byt_rt5640_stereo_spk_map[] = {
    + {"Speaker", NULL, "Platform Clock"},
    {"Speaker", NULL, "SPOLP"},
    {"Speaker", NULL, "SPOLN"},
    {"Speaker", NULL, "SPORP"},
    @@ -361,6 +363,7 @@ static const struct snd_soc_dapm_route byt_rt5640_stereo_spk_map[] = {
    };

    static const struct snd_soc_dapm_route byt_rt5640_mono_spk_map[] = {
    + {"Speaker", NULL, "Platform Clock"},
    {"Speaker", NULL, "SPOLP"},
    {"Speaker", NULL, "SPOLN"},
    };
    --
    2.30.2
    \
     
     \ /
      Last update: 2021-09-09 13:51    [W:4.027 / U:0.184 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site