diff --git a/sound/soc/tegra/tegra_asoc_utils.c b/sound/soc/tegra/tegra_asoc_utils.c index fc53e996..a1353859 100644 --- a/sound/soc/tegra/tegra_asoc_utils.c +++ b/sound/soc/tegra/tegra_asoc_utils.c @@ -3,7 +3,7 @@ * tegra_asoc_utils.c - Harmony machine ASoC driver * * Author: Stephen Warren - * Copyright (c) 2010-2022 NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2010-2023 NVIDIA CORPORATION. All rights reserved. */ #include @@ -364,9 +364,9 @@ int tegra_asoc_utils_init(struct tegra_asoc_utils_data *data, return PTR_ERR(data->clk_pll_a); } - data->clk_pll_a_out0 = devm_clk_get(dev, "pll_a_out0"); + data->clk_pll_a_out0 = devm_clk_get(dev, "plla_out0"); if (IS_ERR(data->clk_pll_a_out0)) { - dev_err(data->dev, "Can't retrieve clk pll_a_out0\n"); + dev_err(data->dev, "Can't retrieve clk plla_out0\n"); return PTR_ERR(data->clk_pll_a_out0); } diff --git a/sound/soc/tegra/tegra_codecs.c b/sound/soc/tegra/tegra_codecs.c index 26cf7bbe..98d6ec68 100644 --- a/sound/soc/tegra/tegra_codecs.c +++ b/sound/soc/tegra/tegra_codecs.c @@ -2,7 +2,7 @@ // // tegra_codecs.c - External audio codec setup // -// Copyright (c) 2021-2022, NVIDIA CORPORATION. All rights reserved. +// Copyright (c) 2021-2023, NVIDIA CORPORATION. All rights reserved. #include #include @@ -20,11 +20,8 @@ static int tegra_audio_dai_init(struct snd_soc_pcm_runtime *rtd) { - struct device_node *node = rtd->card->dev->of_node; - /* Used for audio graph based sound cards only */ - if (of_device_is_compatible(node, "nvidia,tegra186-audio-graph-card") || - of_device_is_compatible(node, "nvidia,tegra210-audio-graph-card")) + if (rtd->card->component_chaining) return asoc_simple_dai_init(rtd); return 0;