nv-tegra-mirror/linux-nv-oot
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nv-oot.git synced 2025-12-23 01:31:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

ASoC: tegra-alt: Remove jack-detection WAR for RT565x

Browse Source 
Now that jack-detection across suspend for the RT565x has been fixed in
the RT565x codec driver, we no longer need to call the
'trigger_jack_status_check' function from the Tegra machine driver.

Bug 2208756

Change-Id: I79961f9eb99c629eaace9ca35f8bb8a984c4dd38
Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1758197
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Jon Hunter
2018-06-22 15:48:59 +01:00
committed by Sameer Pujar
parent edd7311299
commit c01285e57a
1 changed files with 0 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
sound/soc/tegra-alt/machine_drivers/tegra_machine_driver_mobile.c
View File

@@ -116,7 +116,6 @@ static void tegra_machine_pcm_shutdown(struct snd_pcm_substream *);
static int tegra_machine_pcm_startup(struct snd_pcm_substream *); static int tegra_machine_pcm_startup(struct snd_pcm_substream *);
static void tegra_machine_pcm_shutdown(struct snd_pcm_substream *); static void tegra_machine_pcm_shutdown(struct snd_pcm_substream *);
static int tegra_machine_suspend_pre(struct snd_soc_card *); static int tegra_machine_suspend_pre(struct snd_soc_card *);
static int tegra_machine_resume_post(struct snd_soc_card *);
static int tegra_machine_pcm_hw_params(struct snd_pcm_substream *, static int tegra_machine_pcm_hw_params(struct snd_pcm_substream *,
struct snd_pcm_hw_params *); struct snd_pcm_hw_params *);
static int tegra_machine_dai_init(struct snd_soc_pcm_runtime *, static int tegra_machine_dai_init(struct snd_soc_pcm_runtime *,
@@ -349,7 +348,6 @@ static const struct snd_kcontrol_new tegra_mystique_controls[] = {
static struct snd_soc_card snd_soc_tegra_card = { static struct snd_soc_card snd_soc_tegra_card = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.suspend_pre = tegra_machine_suspend_pre, .suspend_pre = tegra_machine_suspend_pre,
.resume_post = tegra_machine_resume_post,
.fully_routed = true, .fully_routed = true,
}; };
@@ -848,24 +846,6 @@ static int tegra_machine_suspend_pre(struct snd_soc_card *card)
return 0; return 0;
} }
static int tegra_machine_resume_post(struct snd_soc_card *card)
{
struct tegra_machine *machine = snd_soc_card_get_drvdata(card);
struct snd_soc_pcm_runtime *rtd;
if (machine->is_hs_supported) {
rtd = snd_soc_get_pcm_runtime(card, "rt565x-playback");
if (rtd)
return trigger_jack_status_check(rtd->codec);
}
rtd = snd_soc_get_pcm_runtime(card, "rt565x-codec-sysclk-bclk1");
if (rtd)
return trigger_jack_status_check(rtd->codec);
return 0;
}
static int tegra_machine_dspk_init(struct snd_soc_pcm_runtime *rtd) static int tegra_machine_dspk_init(struct snd_soc_pcm_runtime *rtd)
{ {
struct snd_soc_card *card = rtd->card; struct snd_soc_card *card = rtd->card;