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

tegra-virt-alt: correct build dependency

Browse Source 
Change adds correct build dependency
for virt-alt drivers.
Bug 1828453

Change-Id: Ifa47a3eae0335bcaf6a3473b0e13e1902c31faaf
Signed-off-by: Dipesh Gandhi <dipeshg@nvidia.com>
Reviewed-on: http://git-master/r/1298609
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Mohan Kumar D <mkumard@nvidia.com>
Reviewed-by: Uday Gupta <udayg@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Nitin Pai <npai@nvidia.com>
This commit is contained in:
Dipesh Gandhi
2017-03-02 15:35:27 +05:30
committed by Sameer Pujar
parent 9786e0098e
commit 5ec5417e3c
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sound/soc/tegra-alt/Kconfig
View File

@@ -165,6 +165,7 @@ config SND_SOC_TEGRA210_OPE_ALT
config SND_SOC_TEGRA210_ADSP_ALT config SND_SOC_TEGRA210_ADSP_ALT
tristate "Tegra210 ADSP driver" tristate "Tegra210 ADSP driver"
depends on SND_SOC_TEGRA_ALT && SND_SOC_TEGRA_ALT_210 && TEGRA_NVADSP depends on SND_SOC_TEGRA_ALT && SND_SOC_TEGRA_ALT_210 && TEGRA_NVADSP
select SND_SOC_COMPRESS
help help
Say Y or M if you want to add support for Tegra210 ADSP module. Say Y or M if you want to add support for Tegra210 ADSP module.

20
sound/soc/tegra-alt/tegra210_adsp_alt.c
View File

@@ -54,7 +54,7 @@
#include "tegra_asoc_utils_alt.h" #include "tegra_asoc_utils_alt.h"
#include "tegra210_adsp_alt.h" #include "tegra210_adsp_alt.h"
#ifdef CONFIG_TEGRA_HV_MANAGER #ifdef CONFIG_SND_SOC_TEGRA_VIRT_IVC_COMM
#include "tegra210_virt_alt_admaif.h" #include "tegra210_virt_alt_admaif.h"
#include "tegra_virt_alt_ivc.h" #include "tegra_virt_alt_ivc.h"
#endif #endif
@@ -149,7 +149,7 @@ struct tegra210_adsp {
uint32_t fe_reg; uint32_t fe_reg;
uint32_t be_reg; uint32_t be_reg;
} pcm_path[ADSP_FE_COUNT+1][2]; } pcm_path[ADSP_FE_COUNT+1][2];
#ifdef CONFIG_TEGRA_HV_MANAGER #ifdef CONFIG_SND_SOC_TEGRA_VIRT_IVC_COMM
struct nvaudio_ivc_ctxt *hivc_client; struct nvaudio_ivc_ctxt *hivc_client;
uint32_t fe_to_admaif_map[ADSP_FE_END - ADSP_FE_START + 1][2]; uint32_t fe_to_admaif_map[ADSP_FE_END - ADSP_FE_START + 1][2];
#endif #endif
@@ -730,7 +730,7 @@ static int tegra210_adsp_send_data_request_msg(struct tegra210_adsp_app *app,
static int tegra210_adsp_app_init(struct tegra210_adsp *adsp, static int tegra210_adsp_app_init(struct tegra210_adsp *adsp,
struct tegra210_adsp_app *app) struct tegra210_adsp_app *app)
{ {
#ifdef CONFIG_TEGRA_HV_MANAGER #ifdef CONFIG_SND_SOC_TEGRA_VIRT_IVC_COMM
struct device *dev = adsp->dev; struct device *dev = adsp->dev;
struct device_node *node = dev->of_node; struct device_node *node = dev->of_node;
#endif #endif
@@ -803,7 +803,7 @@ static int tegra210_adsp_app_init(struct tegra210_adsp *adsp,
} }
__set_bit(app->adma_chan, adsp->adma_usage); __set_bit(app->adma_chan, adsp->adma_usage);
#ifdef CONFIG_TEGRA_HV_MANAGER #ifdef CONFIG_SND_SOC_TEGRA_VIRT_IVC_COMM
if (of_device_is_compatible(node, if (of_device_is_compatible(node,
"nvidia,tegra210-adsp-audio-hv")) "nvidia,tegra210-adsp-audio-hv"))
app->adma_chan += TEGRA210_ADSP_ADMA_CHANNEL_START_HV; app->adma_chan += TEGRA210_ADSP_ADMA_CHANNEL_START_HV;
@@ -1634,7 +1634,7 @@ static int tegra210_adsp_pcm_hw_free(struct snd_pcm_substream *substream)
return 0; return 0;
} }
#ifdef CONFIG_TEGRA_HV_MANAGER #ifdef CONFIG_SND_SOC_TEGRA_VIRT_IVC_COMM
static uint32_t tegra_adsp_get_admaif_id( static uint32_t tegra_adsp_get_admaif_id(
struct tegra210_adsp *adsp, struct tegra210_adsp *adsp,
uint32_t apm_out_in, uint32_t apm_out_in,
@@ -1797,7 +1797,7 @@ static int tegra210_adsp_pcm_trigger(struct snd_pcm_substream *substream,
int cmd) int cmd)
{ {
struct tegra210_adsp_pcm_rtd *prtd = substream->runtime->private_data; struct tegra210_adsp_pcm_rtd *prtd = substream->runtime->private_data;
#ifdef CONFIG_TEGRA_HV_MANAGER #ifdef CONFIG_SND_SOC_TEGRA_VIRT_IVC_COMM
struct tegra210_adsp *adsp = prtd->fe_apm->adsp; struct tegra210_adsp *adsp = prtd->fe_apm->adsp;
struct device *dev = adsp->dev; struct device *dev = adsp->dev;
struct device_node *node = dev->of_node; struct device_node *node = dev->of_node;
@@ -1806,7 +1806,7 @@ static int tegra210_adsp_pcm_trigger(struct snd_pcm_substream *substream,
dev_vdbg(prtd->dev, "%s : state %d", __func__, cmd); dev_vdbg(prtd->dev, "%s : state %d", __func__, cmd);
#ifdef CONFIG_TEGRA_HV_MANAGER #ifdef CONFIG_SND_SOC_TEGRA_VIRT_IVC_COMM
if (of_device_is_compatible(node, "nvidia,tegra210-adsp-audio-hv")) { if (of_device_is_compatible(node, "nvidia,tegra210-adsp-audio-hv")) {
ret = tegra210_adsp_hv_pcm_trigger(adsp, ret = tegra210_adsp_hv_pcm_trigger(adsp,
prtd->fe_apm->reg, prtd->fe_apm->reg,
@@ -1968,7 +1968,7 @@ static void tegra210_adsp_pcm_free(struct snd_pcm *pcm)
} }
} }
#ifdef CONFIG_TEGRA_HV_MANAGER #ifdef CONFIG_SND_SOC_TEGRA_VIRT_IVC_COMM
static void tegra_adsp_set_admaif_id( static void tegra_adsp_set_admaif_id(
struct tegra210_adsp *adsp, struct tegra210_adsp *adsp,
uint32_t admaif_id, uint32_t admaif_id,
@@ -2128,7 +2128,7 @@ static int tegra210_adsp_admaif_hw_params(struct snd_pcm_substream *substream,
struct snd_soc_dai *dai) struct snd_soc_dai *dai)
{ {
struct tegra210_adsp *adsp = snd_soc_dai_get_drvdata(dai); struct tegra210_adsp *adsp = snd_soc_dai_get_drvdata(dai);
#ifdef CONFIG_TEGRA_HV_MANAGER #ifdef CONFIG_SND_SOC_TEGRA_VIRT_IVC_COMM
struct device *dev = adsp->dev; struct device *dev = adsp->dev;
struct device_node *node = dev->of_node; struct device_node *node = dev->of_node;
#endif #endif
@@ -2144,7 +2144,7 @@ static int tegra210_adsp_admaif_hw_params(struct snd_pcm_substream *substream,
if (!adsp->adsp_started) if (!adsp->adsp_started)
return -EINVAL; return -EINVAL;
#ifdef CONFIG_TEGRA_HV_MANAGER #ifdef CONFIG_SND_SOC_TEGRA_VIRT_IVC_COMM
if (of_device_is_compatible(node, "nvidia,tegra210-adsp-audio-hv")) { if (of_device_is_compatible(node, "nvidia,tegra210-adsp-audio-hv")) {
/*Start of sending IVC command for admaif cif settings*/ /*Start of sending IVC command for admaif cif settings*/