Revert "ASoC: tegra-alt: Add config for card registration"

This reverts commit 06c530498bd0c973cbd97faa973b11026ac3f8be
since this causes L4T sanity test failure.

Bug 1683727 : regression bug
Bug 200130213 : original bug

Change-Id: I943fe2a3879a800c023dc052d60f5a951dae5979
Signed-off-by: Shridhar Rasal <srasal@nvidia.com>
Reviewed-on: http://git-master/r/795634
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
Tested-by: Bharat Nihalani <bnihalani@nvidia.com>

diff --git a/sound/soc/tegra-alt/Kconfig b/sound/soc/tegra-alt/Kconfig
index 0c857b8ca7dfc9cfedfbe692afd401404594d9b7..11e6d9ba0a8046542ca13594a6197c4f129deb70 100644 (file)
--- a/sound/soc/tegra-alt/Kconfig
+++ b/sound/soc/tegra-alt/Kconfig
@@ -28,13 +28,6 @@ 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 f8adf21f3d01badf518021efaa2d3a053d873652..b2a94fe40e1fda017cedfb5ad66fb05f2c58acb9 100644 (file)
--- a/sound/soc/tegra-alt/tegra_t210ref_mobile_rt565x_alt.c
+++ b/sound/soc/tegra-alt/tegra_t210ref_mobile_rt565x_alt.c
@@ -875,10 +875,8 @@ 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",