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.1

Browse Source 
Upstream Linux kernel commit 3989ade2d1e7 ("ASoC: soc.h: remove
num_cpus/codecs") removes the 'num_cpus' member from the
'snd_soc_pcm_runtime' structure because this is also available under the
dai_link structure. This breaks building the Tegra ASoC drivers for
Linux v6.1 and so update the Tegra ASoC drivers to align the latest
mainline.

Bug 3772918
Bug 3890034

Change-Id: If436222ec9e9a97acf82d50c5f9ce80e08ca1f1c
Signed-off-by: Mohan Kumar <mkumard@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/2819691
Reviewed-by: Sameer Pujar <spujar@nvidia.com>
Reviewed-by: Sharad Gupta <sharadg@nvidia.com>
GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
This commit is contained in:
Mohan Kumar
2022-12-01 12:25:41 +05:30
committed by mobile promotions
parent c40a2c13e2
commit c9217a1b82
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sound/soc/tegra/tegra_codecs.c
View File

@@ -233,17 +233,17 @@ int tegra_codecs_runtime_setup(struct snd_soc_card *card,
rtd = get_pcm_runtime(card, "dspk-playback-dual-tas2552"); rtd = get_pcm_runtime(card, "dspk-playback-dual-tas2552");
if (rtd) { if (rtd) {
for (i = 0; i < rtd->num_codecs; i++) { for (i = 0; i < rtd->dai_link->num_codecs; i++) {
if (!strcmp(rtd->dais[rtd->num_cpus + i]->name, if (!strcmp(rtd->dais[rtd->dai_link->num_cpus + i]->name,
"tas2552-amplifier")) { "tas2552-amplifier")) {
err = snd_soc_dai_set_sysclk( err = snd_soc_dai_set_sysclk(
rtd->dais[rtd->num_cpus + i], rtd->dais[rtd->dai_link->num_cpus + i],
TAS2552_PDM_CLK_IVCLKIN, aud_mclk, TAS2552_PDM_CLK_IVCLKIN, aud_mclk,
SND_SOC_CLOCK_IN); SND_SOC_CLOCK_IN);
if (err < 0) { if (err < 0) {
dev_err(card->dev, dev_err(card->dev,
"dais[%d] clock not set\n", "dais[%d] clock not set\n",
rtd->num_cpus + i); rtd->dai_link->num_cpus + i);
return err; return err;
} }
} }