From 3f3a331b56278a75ae55d541c84ae8a671fb4d80 Mon Sep 17 00:00:00 2001 From: Niranjan Dighe Date: Fri, 2 Aug 2019 11:34:39 +0530 Subject: [PATCH] Revert "ASoC: tegra-alt: add dma_set_mask parse" This reverts commit 4ccb56ad195d811303051c067fd1c8915588767c. Jira EMA-1251 Change-Id: I6997bb04ab801bf2c1de3bfe90bcdfc70c4c8c4a Signed-off-by: Niranjan Dighe Reviewed-on: https://git-master.nvidia.com/r/2166540 Reviewed-by: Mohan Kumar D GVS: Gerrit_Virtual_Submit Reviewed-by: Uday Gupta Reviewed-by: Nitin Pai Reviewed-by: mobile promotions Tested-by: mobile promotions --- .../tegra-alt/include/tegra_asoc_machine_alt.h | 2 -- .../tegra_machine_driver_mobile.c | 2 -- .../tegra-alt/utils/tegra_asoc_machine_alt.c | 17 ----------------- 3 files changed, 21 deletions(-) diff --git a/sound/soc/tegra-alt/include/tegra_asoc_machine_alt.h b/sound/soc/tegra-alt/include/tegra_asoc_machine_alt.h index 8fd4a681..f32384d2 100644 --- a/sound/soc/tegra-alt/include/tegra_asoc_machine_alt.h +++ b/sound/soc/tegra-alt/include/tegra_asoc_machine_alt.h @@ -493,8 +493,6 @@ int tegra_machine_add_codec_jack_control(struct snd_soc_card *card, struct snd_soc_pcm_runtime *rtd, struct snd_soc_jack *jack); -void tegra_machine_dma_set_mask(struct platform_device *pdev); - /* new helper functions for populating sound card DAI links and codec confs */ int tegra_asoc_populate_dai_links(struct platform_device *pdev); int tegra_asoc_populate_codec_confs(struct platform_device *pdev); diff --git a/sound/soc/tegra-alt/machine_drivers/tegra_machine_driver_mobile.c b/sound/soc/tegra-alt/machine_drivers/tegra_machine_driver_mobile.c index efe40550..5ad2797d 100644 --- a/sound/soc/tegra-alt/machine_drivers/tegra_machine_driver_mobile.c +++ b/sound/soc/tegra-alt/machine_drivers/tegra_machine_driver_mobile.c @@ -854,8 +854,6 @@ static int tegra_machine_driver_probe(struct platform_device *pdev) dev_dbg(&pdev->dev, "Missing property mclk-fs\n"); } - tegra_machine_dma_set_mask(pdev); - ret = add_dai_links(pdev); if (ret < 0) goto cleanup_asoc; diff --git a/sound/soc/tegra-alt/utils/tegra_asoc_machine_alt.c b/sound/soc/tegra-alt/utils/tegra_asoc_machine_alt.c index feb75221..89777baa 100644 --- a/sound/soc/tegra-alt/utils/tegra_asoc_machine_alt.c +++ b/sound/soc/tegra-alt/utils/tegra_asoc_machine_alt.c @@ -17,7 +17,6 @@ */ #include -#include #include #include #include @@ -3879,22 +3878,6 @@ int tegra_machine_add_codec_jack_control(struct snd_soc_card *card, } EXPORT_SYMBOL_GPL(tegra_machine_add_codec_jack_control); -void tegra_machine_dma_set_mask(struct platform_device *pdev) -{ -#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0) - struct device_node *np = pdev->dev.of_node; - uint64_t dma_mask; - int ret; - - ret = of_property_read_u64(np, "dma-mask", &dma_mask); - if (ret) - dev_err(&pdev->dev, "Missing property dma-mask\n"); - else - dma_set_mask_and_coherent(&pdev->dev, dma_mask); -#endif -} -EXPORT_SYMBOL_GPL(tegra_machine_dma_set_mask); - void release_asoc_phandles(struct tegra_machine *machine) { unsigned int i;