nv-tegra-mirror/linux-nv-oot
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nv-oot.git synced 2025-12-22 17:25:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

Revert "ASoC: tegra-alt: add dma_set_mask parse"

Browse Source 
This reverts commit 4ccb56ad195d811303051c067fd1c8915588767c.

Jira EMA-1251

Change-Id: I6997bb04ab801bf2c1de3bfe90bcdfc70c4c8c4a
Signed-off-by: Niranjan Dighe <ndighe@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/2166540
Reviewed-by: Mohan Kumar D <mkumard@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Uday Gupta <udayg@nvidia.com>
Reviewed-by: Nitin Pai <npai@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Niranjan Dighe
2019-08-02 11:34:39 +05:30
committed by Sameer Pujar
parent 18c581a03e
commit 3f3a331b56
3 changed files with 0 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sound/soc/tegra-alt/include/tegra_asoc_machine_alt.h
View File

@@ -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_pcm_runtime *rtd,
struct snd_soc_jack *jack); 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 */ /* 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_dai_links(struct platform_device *pdev);
int tegra_asoc_populate_codec_confs(struct platform_device *pdev); int tegra_asoc_populate_codec_confs(struct platform_device *pdev);

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

@@ -854,8 +854,6 @@ static int tegra_machine_driver_probe(struct platform_device *pdev)
dev_dbg(&pdev->dev, "Missing property mclk-fs\n"); dev_dbg(&pdev->dev, "Missing property mclk-fs\n");
} }
tegra_machine_dma_set_mask(pdev);
ret = add_dai_links(pdev); ret = add_dai_links(pdev);
if (ret < 0) if (ret < 0)
goto cleanup_asoc; goto cleanup_asoc;

17
sound/soc/tegra-alt/utils/tegra_asoc_machine_alt.c
View File

@@ -17,7 +17,6 @@
*/ */
#include <linux/module.h> #include <linux/module.h>
#include <linux/dma-mapping.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/version.h> #include <linux/version.h>
#include <sound/jack.h> #include <sound/jack.h>
@@ -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); 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) void release_asoc_phandles(struct tegra_machine *machine)
{ {
unsigned int i; unsigned int i;