From 196ee992c4acc5146886fc680a7b9aa98b2cd68f Mon Sep 17 00:00:00 2001 From: Sameer Pujar Date: Fri, 3 Jul 2020 14:27:37 +0530 Subject: [PATCH] Revert "ASoC: tegra: disable jack detect (WAR)" This reverts commit 45e13cf2a7c4e3f0b6e4e88050b93a4481b08bfa. The original commit was earlier done to unblock kernel 5.9 bringup. Revert the same to enable jack functionality now. Bug 200610798 Change-Id: I7838e92f64140b5e563188d6f52455443685b116 Signed-off-by: Sameer Pujar Reviewed-on: https://git-master.nvidia.com/r/c/linux-5.9/+/2370730 Reviewed-by: automaticguardword Reviewed-by: Mohan Kumar D Reviewed-by: Sharad Gupta Reviewed-by: mobile promotions GVS: Gerrit_Virtual_Submit Tested-by: mobile promotions --- sound/soc/tegra/tegra_machine_driver.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sound/soc/tegra/tegra_machine_driver.c b/sound/soc/tegra/tegra_machine_driver.c index b12c9438..2ece7611 100644 --- a/sound/soc/tegra/tegra_machine_driver.c +++ b/sound/soc/tegra/tegra_machine_driver.c @@ -415,15 +415,11 @@ static int tegra_machine_rt565x_init(struct snd_soc_pcm_runtime *rtd) return err; } - -/* FIXME */ -#if 0 err = rt5659_set_jack_detect(rtd->dais[rtd->num_cpus]->component, jack); if (err) { dev_err(card->dev, "Failed to set jack for RT565x: %d\n", err); return err; } -#endif /* single button supporting play/pause */ snd_jack_set_key(jack->jack, SND_JACK_BTN_0, KEY_MEDIA);