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 09:11:26 +03:00
Code Issues Packages Projects Releases Wiki Activity

ASoC: tegra: Fix build for Linux v6.11

Browse Source 
For Linux v6.11, the 'tx_slot' and 'rx_slot' arguments for the ASoC
set_channel_map() function were made constant. Add a test to conftest to
check for this and update the Tegra210 ADX and AMX driver accordingly.

Bug 4749580

Change-Id: I584d721ee46ae0af6312df4641fc4bbdbc1714f0
Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3184824
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Jon Hunter
2024-06-13 14:45:15 +01:00
committed by mobile promotions
parent 55b09a913f
commit 8fbb56adb6
4 changed files with 31 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sound/soc/tegra/tegra210_adx.c
View File

@@ -325,8 +325,13 @@ static int tegra210_adx_in_hw_params(struct snd_pcm_substream *substream,
}
static int tegra210_adx_set_channel_map(struct snd_soc_dai *dai,
#if defined (NV_SND_SOC_DAI_OPS_STRUCT_SET_CHANNEL_MAP_HAS_CONST_SLOT_ARGS)
unsigned int tx_num, const unsigned int *tx_slot,
unsigned int rx_num, const unsigned int *rx_slot)
#else
unsigned int tx_num, unsigned int *tx_slot,
unsigned int rx_num, unsigned int *rx_slot)
#endif
{
struct device *dev = dai->dev;
struct tegra210_adx *adx = snd_soc_dai_get_drvdata(dai);

5
sound/soc/tegra/tegra210_amx.c
View File

@@ -369,8 +369,13 @@ static int tegra210_amx_out_hw_params(struct snd_pcm_substream *substream,
}
static int tegra210_amx_set_channel_map(struct snd_soc_dai *dai,
#if defined (NV_SND_SOC_DAI_OPS_STRUCT_SET_CHANNEL_MAP_HAS_CONST_SLOT_ARGS)
unsigned int tx_num, const unsigned int *tx_slot,
unsigned int rx_num, const unsigned int *rx_slot)
#else
unsigned int tx_num, unsigned int *tx_slot,
unsigned int rx_num, unsigned int *rx_slot)
#endif
{
struct device *dev = dai->dev;
struct tegra210_amx *amx = snd_soc_dai_get_drvdata(dai);