lkml.org 
[lkml]   [2020]   [Jun]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.7 004/477] ASoC: tegra: tegra_wm8903: Support nvidia, headset property
    Date
    From: Dmitry Osipenko <digetx@gmail.com>

    [ Upstream commit 3ef9d5073b552d56bd6daf2af1e89b7e8d4df183 ]

    The microphone-jack state needs to be masked in a case of a 4-pin jack
    when microphone and ground pins are shorted. Presence of nvidia,headset
    tells that WM8903 CODEC driver should mask microphone's status if short
    circuit is detected, i.e headphones are inserted.

    Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
    Link: https://lore.kernel.org/r/20200330204011.18465-3-digetx@gmail.com
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/soc/tegra/tegra_wm8903.c | 6 +++++-
    1 file changed, 5 insertions(+), 1 deletion(-)

    diff --git a/sound/soc/tegra/tegra_wm8903.c b/sound/soc/tegra/tegra_wm8903.c
    index 9b5651502f127..3aca354f9e08b 100644
    --- a/sound/soc/tegra/tegra_wm8903.c
    +++ b/sound/soc/tegra/tegra_wm8903.c
    @@ -177,6 +177,7 @@ static int tegra_wm8903_init(struct snd_soc_pcm_runtime *rtd)
    struct snd_soc_component *component = codec_dai->component;
    struct snd_soc_card *card = rtd->card;
    struct tegra_wm8903 *machine = snd_soc_card_get_drvdata(card);
    + int shrt = 0;

    if (gpio_is_valid(machine->gpio_hp_det)) {
    tegra_wm8903_hp_jack_gpio.gpio = machine->gpio_hp_det;
    @@ -189,12 +190,15 @@ static int tegra_wm8903_init(struct snd_soc_pcm_runtime *rtd)
    &tegra_wm8903_hp_jack_gpio);
    }

    + if (of_property_read_bool(card->dev->of_node, "nvidia,headset"))
    + shrt = SND_JACK_MICROPHONE;
    +
    snd_soc_card_jack_new(rtd->card, "Mic Jack", SND_JACK_MICROPHONE,
    &tegra_wm8903_mic_jack,
    tegra_wm8903_mic_jack_pins,
    ARRAY_SIZE(tegra_wm8903_mic_jack_pins));
    wm8903_mic_detect(component, &tegra_wm8903_mic_jack, SND_JACK_MICROPHONE,
    - 0);
    + shrt);

    snd_soc_dapm_force_enable_pin(&card->dapm, "MICBIAS");

    --
    2.25.1


    \
     
     \ /
      Last update: 2020-06-23 23:45    [W:4.135 / U:0.656 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site