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 <spujar@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-5.9/+/2370730
Reviewed-by: automaticguardword <automaticguardword@nvidia.com>
Reviewed-by: Mohan Kumar D <mkumard@nvidia.com>
Reviewed-by: Sharad Gupta <sharadg@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
GVS: Gerrit_Virtual_Submit
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Sameer Pujar
2020-07-03 14:27:37 +05:30
parent d2d05a7f3c
commit 196ee992c4

View File

@@ -415,15 +415,11 @@ static int tegra_machine_rt565x_init(struct snd_soc_pcm_runtime *rtd)
return err; return err;
} }
/* FIXME */
#if 0
err = rt5659_set_jack_detect(rtd->dais[rtd->num_cpus]->component, jack); err = rt5659_set_jack_detect(rtd->dais[rtd->num_cpus]->component, jack);
if (err) { if (err) {
dev_err(card->dev, "Failed to set jack for RT565x: %d\n", err); dev_err(card->dev, "Failed to set jack for RT565x: %d\n", err);
return err; return err;
} }
#endif
/* single button supporting play/pause */ /* single button supporting play/pause */
snd_jack_set_key(jack->jack, SND_JACK_BTN_0, KEY_MEDIA); snd_jack_set_key(jack->jack, SND_JACK_BTN_0, KEY_MEDIA);