lkml.org 
[lkml]   [2020]   [Nov]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.9 076/255] ASoC: mediatek: mt8183-da7219: fix DAPM paths for rt1015
    Date
    From: Tzung-Bi Shih <tzungbi@google.com>

    [ Upstream commit eb5a558705c7f63d06b4ddd072898b1ca894e053 ]

    RT1015's output widget name is "SPO" instead of "Speaker". Fixes it to
    use the correct names.

    Signed-off-by: Tzung-Bi Shih <tzungbi@google.com>
    Link: https://lore.kernel.org/r/20201019044724.1601476-1-tzungbi@google.com
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    .../mediatek/mt8183/mt8183-da7219-max98357.c | 31 +++++++++++++++----
    1 file changed, 25 insertions(+), 6 deletions(-)

    diff --git a/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c b/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c
    index a6c690c5308d3..58b76e985f7f3 100644
    --- a/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c
    +++ b/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c
    @@ -624,15 +624,34 @@ static struct snd_soc_codec_conf mt8183_da7219_rt1015_codec_conf[] = {
    },
    };

    +static const struct snd_kcontrol_new mt8183_da7219_rt1015_snd_controls[] = {
    + SOC_DAPM_PIN_SWITCH("Left Spk"),
    + SOC_DAPM_PIN_SWITCH("Right Spk"),
    +};
    +
    +static const
    +struct snd_soc_dapm_widget mt8183_da7219_rt1015_dapm_widgets[] = {
    + SND_SOC_DAPM_SPK("Left Spk", NULL),
    + SND_SOC_DAPM_SPK("Right Spk", NULL),
    + SND_SOC_DAPM_PINCTRL("TDM_OUT_PINCTRL",
    + "aud_tdm_out_on", "aud_tdm_out_off"),
    +};
    +
    +static const struct snd_soc_dapm_route mt8183_da7219_rt1015_dapm_routes[] = {
    + {"Left Spk", NULL, "Left SPO"},
    + {"Right Spk", NULL, "Right SPO"},
    + {"I2S Playback", NULL, "TDM_OUT_PINCTRL"},
    +};
    +
    static struct snd_soc_card mt8183_da7219_rt1015_card = {
    .name = "mt8183_da7219_rt1015",
    .owner = THIS_MODULE,
    - .controls = mt8183_da7219_max98357_snd_controls,
    - .num_controls = ARRAY_SIZE(mt8183_da7219_max98357_snd_controls),
    - .dapm_widgets = mt8183_da7219_max98357_dapm_widgets,
    - .num_dapm_widgets = ARRAY_SIZE(mt8183_da7219_max98357_dapm_widgets),
    - .dapm_routes = mt8183_da7219_max98357_dapm_routes,
    - .num_dapm_routes = ARRAY_SIZE(mt8183_da7219_max98357_dapm_routes),
    + .controls = mt8183_da7219_rt1015_snd_controls,
    + .num_controls = ARRAY_SIZE(mt8183_da7219_rt1015_snd_controls),
    + .dapm_widgets = mt8183_da7219_rt1015_dapm_widgets,
    + .num_dapm_widgets = ARRAY_SIZE(mt8183_da7219_rt1015_dapm_widgets),
    + .dapm_routes = mt8183_da7219_rt1015_dapm_routes,
    + .num_dapm_routes = ARRAY_SIZE(mt8183_da7219_rt1015_dapm_routes),
    .dai_link = mt8183_da7219_dai_links,
    .num_links = ARRAY_SIZE(mt8183_da7219_dai_links),
    .aux_dev = &mt8183_da7219_max98357_headset_dev,
    --
    2.27.0


    \
     
     \ /
      Last update: 2020-11-17 14:35    [W:3.317 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site