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

drivers: fix k5.9 build errors

Browse Source 
Fix linux-5.7-rc5 build in below source files:
	- mmc.c __mmc_switch 7th argument removed for downstream patches.
	- pwm-fan.c - remove unmatched #if PM_SLEEP
	- i2c-tegra.c , arm-smmu-nvidia.c and tegra_machine_driver.c

Bug 200617764

Change-Id: I5a98693219e431f25a101a13f9fc2f6d29829e73
Signed-off-by: Bitan Biswas <bbiswas@nvidia.com>
This commit is contained in:
Bitan Biswas
2020-05-18 22:56:06 -07:00
committed by Sameer Pujar
parent 5cbf657e1a
commit 539a7841f3
3 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -704,22 +704,14 @@ static struct snd_kcontrol_new tegra186_admaif_controls[] = {
TEGRA_ADMAIF_CIF_CTRL(20),
};
extern const struct snd_pcm_ops tegra_pcm_ops;
static const struct snd_soc_component_driver tegra210_admaif_cmpnt = {
.controls = tegra210_admaif_controls,
.num_controls = ARRAY_SIZE(tegra210_admaif_controls),
.pcm_new = tegra_pcm_new,
.pcm_free = tegra_pcm_free,
.ops = &tegra_pcm_ops,
};
static const struct snd_soc_component_driver tegra186_admaif_cmpnt = {
.controls = tegra186_admaif_controls,
.num_controls = ARRAY_SIZE(tegra186_admaif_controls),
.pcm_new = tegra_pcm_new,
.pcm_free = tegra_pcm_free,
.ops = &tegra_pcm_ops,
};
static const struct tegra_admaif_soc_data soc_data_tegra210 = {

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

@@ -281,8 +281,6 @@ static int parse_dt_codec_confs(struct snd_soc_card *card)
return err;
}
codec_confs[i].of_node = args.np;
codec_confs[i].dev_name = NULL;
of_property_read_string(codec, "prefix",
&codec_confs[i].name_prefix);
@@ -787,11 +785,6 @@ void release_asoc_phandles(struct tegra_machine *machine)
of_node_put(machine->asoc->dai_links[i].codecs->of_node);
}
}
if (machine->asoc->codec_confs) {
for (i = 0; i < machine->asoc->num_confs; i++)
of_node_put(machine->asoc->codec_confs[i].of_node);
}
}
EXPORT_SYMBOL_GPL(release_asoc_phandles);
MODULE_LICENSE("GPL");

19
sound/soc/tegra/tegra_machine_driver.c
View File

@@ -35,6 +35,9 @@
#define DRV_NAME "tegra-asoc:"
#define MAX_DAI_LINKS 10
static unsigned int dai_links_idx[MAX_DAI_LINKS];
static const char * const tegra_machine_srate_text[] = {
"None",
"8kHz",
@@ -181,7 +184,7 @@ static int tegra_machine_dai_init(struct snd_soc_pcm_runtime *runtime,
}
}
rtd = snd_soc_get_pcm_runtime(card, "rt565x-playback");
rtd = snd_soc_get_pcm_runtime(card, &machine->asoc->dai_links[dai_links_idx[0]]);
if (rtd) {
err = snd_soc_dai_set_sysclk(rtd->codec_dai, RT5659_SCLK_S_MCLK,
aud_mclk, SND_SOC_CLOCK_IN);
@@ -191,7 +194,7 @@ static int tegra_machine_dai_init(struct snd_soc_pcm_runtime *runtime,
}
}
rtd = snd_soc_get_pcm_runtime(card, "rt565x-codec-sysclk-bclk1");
rtd = snd_soc_get_pcm_runtime(card, &machine->asoc->dai_links[dai_links_idx[1]]);
if (rtd) {
unsigned int bclk_rate;
dai_params = (struct snd_soc_pcm_stream *)rtd->dai_link->params;
@@ -231,7 +234,7 @@ static int tegra_machine_dai_init(struct snd_soc_pcm_runtime *runtime,
}
}
rtd = snd_soc_get_pcm_runtime(card, "dspk-playback-r");
rtd = snd_soc_get_pcm_runtime(card, &machine->asoc->dai_links[dai_links_idx[2]]);
if (rtd) {
if (!strcmp(rtd->codec_dai->name, "tas2552-amplifier")) {
err = snd_soc_dai_set_sysclk(rtd->codec_dai,
@@ -244,7 +247,7 @@ static int tegra_machine_dai_init(struct snd_soc_pcm_runtime *runtime,
}
}
rtd = snd_soc_get_pcm_runtime(card, "dspk-playback-l");
rtd = snd_soc_get_pcm_runtime(card, &machine->asoc->dai_links[dai_links_idx[3]]);
if (rtd) {
if (!strcmp(rtd->codec_dai->name, "tas2552-amplifier")) {
err = snd_soc_dai_set_sysclk(rtd->codec_dai,
@@ -431,6 +434,14 @@ static int codec_init(struct tegra_machine *machine)
if (!dai_links[i].name)
continue;
if (strstr(dai_links[i].name, "rt565x-playback"))
dai_links_idx[0] = i;
else if (strstr(dai_links[i].name, "rt565x-codec-sysclk-bclk1"))
dai_links_idx[1] = i;
else if (strstr(dai_links[i].name, "dspk-playback-r"))
dai_links_idx[2] = i;
else if (strstr(dai_links[i].name, "dspk-playback-l"))
dai_links_idx[3] = i;
if (strstr(dai_links[i].name, "rt565x-playback") ||
strstr(dai_links[i].name, "rt565x-codec-sysclk-bclk1"))
dai_links[i].init = tegra_machine_rt565x_init;