ASoC: tegra-alt: Add config for card registration

Registration of audio card was causing L4T sanity test
failures when audio codec was absent. Added a new kernel
config to selectively enable this feature.

Bug 200130213

Change-Id: I0998c122742e4012eda02a3d389fae96ee85202b
Signed-off-by: Sharad Gupta <sharadg@nvidia.com>
Reviewed-on: http://git-master/r/783159
Reviewed-by: Mohan Kumar D <mkumard@nvidia.com>
Tested-by: Shaunak Gupte <shaunakg@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Pierre Gervais <pgervais@nvidia.com>

diff --git a/sound/soc/tegra-alt/Kconfig b/sound/soc/tegra-alt/Kconfig
index 11e6d9ba0a8046542ca13594a6197c4f129deb70..0c857b8ca7dfc9cfedfbe692afd401404594d9b7 100644 (file)
--- a/sound/soc/tegra-alt/Kconfig
+++ b/sound/soc/tegra-alt/Kconfig
@@ -28,6 +28,13 @@ config SND_SOC_TEGRA_ALT_210
        depends on SND_SOC_TEGRA_ALT
        depends on ARCH_TEGRA_APE
 
+config SND_SOC_TEGRA_ALT_FORCE_CARD_REG
+       tristate "Enable sound card even if audio codec is missing on board"
+       depends on SND_SOC_TEGRA_ALT
+       help
+         Say Y or M if you want to register the sound card even if audio codec
+         is not connected/present on board.
+
 config SND_SOC_TEGRA30_XBAR_ALT
        tristate "Tegra30 XBAR driver"
        depends on SND_SOC_TEGRA_ALT && SND_SOC_TEGRA_ALT_30_OR_LATER

diff --git a/sound/soc/tegra-alt/tegra_t210ref_mobile_rt565x_alt.c b/sound/soc/tegra-alt/tegra_t210ref_mobile_rt565x_alt.c
index 73dbbc07291a6730c7d4bb83299ac6903a3cb9a1..0fd3ad95269ffa729454d11e6c23bc353f23d903 100644 (file)
--- a/sound/soc/tegra-alt/tegra_t210ref_mobile_rt565x_alt.c
+++ b/sound/soc/tegra-alt/tegra_t210ref_mobile_rt565x_alt.c
@@ -739,8 +739,10 @@ static int tegra_t210ref_driver_probe(struct platform_device *pdev)
 
        ret = snd_soc_register_card(card);
        if (ret) {
+#ifdef CONFIG_SND_SOC_TEGRA_ALT_FORCE_CARD_REG
                dai_link_setup(pdev, 1);
                ret = snd_soc_register_card(card);
+#endif
 
                if (ret) {
                        dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n",