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

ASoC: tegra: Fix build for Linux v6.5

Browse Source 
In Linux v6.5, the arguments to the function snd_soc_of_get_dai_name()
were updated and this is causing the Tegra ASoC machine driver build to
fail. Add a new test to the conftest script to check the arguments for
snd_soc_of_get_dai_name() and use the definition generated by the
conftest script accordingly.

Bug 4221847

Change-Id: I32772da12ab59eb09e2f9d8bc66471d859201f8e
Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/2990531
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Jon Hunter
2023-10-02 16:35:36 +01:00
committed by mobile promotions
parent 2fab40f274
commit f926a58dd1
3 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
scripts/conftest/Makefile
View File

@@ -111,6 +111,7 @@ NV_CONFTEST_FUNCTION_COMPILE_TESTS += netif_napi_add_weight
NV_CONFTEST_FUNCTION_COMPILE_TESTS += pde_data NV_CONFTEST_FUNCTION_COMPILE_TESTS += pde_data
NV_CONFTEST_FUNCTION_COMPILE_TESTS += register_shrinker_has_fmt_arg NV_CONFTEST_FUNCTION_COMPILE_TESTS += register_shrinker_has_fmt_arg
NV_CONFTEST_FUNCTION_COMPILE_TESTS += snd_soc_dai_link_struct_has_c2c_params_arg NV_CONFTEST_FUNCTION_COMPILE_TESTS += snd_soc_dai_link_struct_has_c2c_params_arg
NV_CONFTEST_FUNCTION_COMPILE_TESTS += snd_soc_of_get_dai_name_has_index_arg
NV_CONFTEST_FUNCTION_COMPILE_TESTS += tc_taprio_qopt_offload_struct_has_cmd NV_CONFTEST_FUNCTION_COMPILE_TESTS += tc_taprio_qopt_offload_struct_has_cmd
NV_CONFTEST_FUNCTION_COMPILE_TESTS += tegra_dev_iommu_get_stream_id NV_CONFTEST_FUNCTION_COMPILE_TESTS += tegra_dev_iommu_get_stream_id
NV_CONFTEST_FUNCTION_COMPILE_TESTS += tegra_ivc_struct_has_iosys_map NV_CONFTEST_FUNCTION_COMPILE_TESTS += tegra_ivc_struct_has_iosys_map

18
scripts/conftest/conftest.sh
View File

@@ -6738,6 +6738,24 @@ compile_test() {
"NV_SND_SOC_DAI_LINK_STRUCT_HAS_C2C_PARAMS_ARG" "" "types" "NV_SND_SOC_DAI_LINK_STRUCT_HAS_C2C_PARAMS_ARG" "" "types"
;; ;;
snd_soc_of_get_dai_name_has_index_arg)
#
# Determine if the function 'snd_soc_of_get_dai_name()' has an index argument.
#
# In Linux v6.5, commit 3c8b5861850c ("ASoC: soc-core.c: add index on
# snd_soc_of_get_dai_name()") updated the arguments to the function
# snd_soc_of_get_dai_name().
#
CODE="
#include <sound/soc.h>
int conftest_snd_soc_of_get_dai_name_has_index_args(struct device_node *np,
const char **name) {
return snd_soc_of_get_dai_name(np, name, 0);
}"
compile_check_conftest "$CODE" "NV_SND_SOC_OF_GET_DAI_NAME_HAS_INDEX_ARG" "" "types"
;;
tc_taprio_qopt_offload_struct_has_cmd) tc_taprio_qopt_offload_struct_has_cmd)
# #
# Determine if struct tc_taprio_qopt_offload has a member named cmd # Determine if struct tc_taprio_qopt_offload has a member named cmd

4
sound/soc/tegra/tegra_asoc_machine.c
View File

@@ -245,7 +245,11 @@ static int parse_dai(struct device_node *node,
if (ret) if (ret)
return ret; return ret;
#if defined(NV_SND_SOC_OF_GET_DAI_NAME_HAS_INDEX_ARG)
ret = snd_soc_of_get_dai_name(node, &dlc->dai_name, 0);
#else
ret = snd_soc_of_get_dai_name(node, &dlc->dai_name); ret = snd_soc_of_get_dai_name(node, &dlc->dai_name);
#endif
if (ret < 0) if (ret < 0)
return ret; return ret;