diff options
| author | ericz <ericz@nvidia.com> | 2014-03-11 15:39:37 +0800 |
|---|---|---|
| committer | Harry Hong <hhong@nvidia.com> | 2014-03-11 21:46:48 -0700 |
| commit | 00b8a878b59ab1b06a8269bc721d0d6c0e79a9a0 (patch) | |
| tree | 5c531850301c081cf28d0f55a714979e05e8800a /sound | |
| parent | 1ebb2000ac785d00258e60fcbb861224c6b48e11 (diff) | |
tegra:fairfax Avoid EDP effect for Headset
For Fairfax, when EDP disable, headset interface
still need exported.
Change-Id: Ib614c2940f67e18e95dcb2db4479ca841e6deb5d
Signed-off-by: ericz <ericz@nvidia.com>
Reviewed-on: http://git-master/r/379869
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Harry Hong <hhong@nvidia.com>
Tested-by: Harry Hong <hhong@nvidia.com>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/tegra/tegra_rt5640.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sound/soc/tegra/tegra_rt5640.c b/sound/soc/tegra/tegra_rt5640.c index 18cb6535cf9f..9780b91e81f0 100644 --- a/sound/soc/tegra/tegra_rt5640.c +++ b/sound/soc/tegra/tegra_rt5640.c @@ -1928,6 +1928,10 @@ static __devinit int tegra_rt5640_driver_probe(struct platform_device *pdev) } #endif +#ifdef CONFIG_SND_SOC_TI_TPA6130A2 + tpa6130a2_add_controls(card->rtd[DAI_LINK_HIFI].codec); +#endif + if (!pdata->edp_support) return 0; @@ -1975,9 +1979,6 @@ static __devinit int tegra_rt5640_driver_probe(struct platform_device *pdev) machine->spk_edp_client = NULL; } } -#ifdef CONFIG_SND_SOC_TI_TPA6130A2 - tpa6130a2_add_controls(card->rtd[DAI_LINK_HIFI].codec); -#endif return 0; err_unregister_card: |