github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-09-23 22:14:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ASoC: mediatek: preparation for Card capsuling

Browse Source 
Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> says:

I will post Card capsuling patch.
To makes its review easy, tidyup mediatek drivers to reduce
un-related diff as preparation.
No functional change, but is preparation for cleanup driver.

Link: https://patch.msgid.link/8733xdjfdq.wl-kuninori.morimoto.gx@renesas.com
This commit is contained in:
Mark Brown 2026-07-21 20:16:08 +01:00
commit beb41b8b14
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
4 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sound/soc/mediatek/common/mtk-dsp-sof-common.c
View File

@ -232,6 +232,7 @@ int mtk_sof_dailink_parse_of(struct device *dev, struct snd_soc_card *card,
const char *propname)
{
struct device_node *np = dev->of_node;
struct snd_soc_dai_link *dai_link;
struct snd_soc_dai_link *parsed_dai_link;
const char *dai_name = NULL;
int i, j, ret, num_links, parsed_num_links = 0;
@ -254,9 +255,9 @@ int mtk_sof_dailink_parse_of(struct device *dev, struct snd_soc_card *card,
return ret;
}
dev_dbg(dev, "ASoC: Property get dai_name:%s\n", dai_name);
for (j = 0; j < card->num_links; j++) {
if (!strcmp(dai_name, card->dai_link[j].name)) {
memcpy(&parsed_dai_link[parsed_num_links++], &card->dai_link[j],
for_each_card_prelinks(card, j, dai_link) {
if (!strcmp(dai_name, dai_link->name)) {
memcpy(&parsed_dai_link[parsed_num_links++], dai_link,
sizeof(struct snd_soc_dai_link));
break;
}

12
sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c
View File

@ -1019,7 +1019,7 @@ static struct snd_soc_card mt8192_mt6359_rt1015p_rt5682x_card = {
.num_dapm_routes = ARRAY_SIZE(mt8192_mt6359_rt1015p_rt5682x_routes),
};
static int mt8192_mt6359_card_set_be_link(struct snd_soc_card *card,
static int mt8192_mt6359_card_set_be_link(struct device *dev,
struct snd_soc_dai_link *link,
struct device_node *node,
char *link_name)
@ -1027,9 +1027,9 @@ static int mt8192_mt6359_card_set_be_link(struct snd_soc_card *card,
int ret;
if (node && strcmp(link->name, link_name) == 0) {
ret = snd_soc_of_get_dai_link_codecs(card->dev, node, link);
ret = snd_soc_of_get_dai_link_codecs(dev, node, link);
if (ret < 0) {
dev_err_probe(card->dev, ret, "get dai link codecs fail\n");
dev_err_probe(dev, ret, "get dai link codecs fail\n");
return ret;
}
}
@ -1065,21 +1065,21 @@ static int mt8192_mt6359_legacy_probe(struct mtk_soc_card_data *soc_card_data)
}
for_each_card_prelinks(card, i, dai_link) {
ret = mt8192_mt6359_card_set_be_link(card, dai_link, speaker_codec, "I2S3");
ret = mt8192_mt6359_card_set_be_link(dev, dai_link, speaker_codec, "I2S3");
if (ret) {
dev_err_probe(dev, ret, "%s set speaker_codec fail\n",
dai_link->name);
break;
}
ret = mt8192_mt6359_card_set_be_link(card, dai_link, headset_codec, "I2S8");
ret = mt8192_mt6359_card_set_be_link(dev, dai_link, headset_codec, "I2S8");
if (ret) {
dev_err_probe(dev, ret, "%s set headset_codec fail\n",
dai_link->name);
break;
}
ret = mt8192_mt6359_card_set_be_link(card, dai_link, headset_codec, "I2S9");
ret = mt8192_mt6359_card_set_be_link(dev, dai_link, headset_codec, "I2S9");
if (ret) {
dev_err_probe(dev, ret, "%s set headset_codec fail\n",
dai_link->name);

2
sound/soc/mediatek/mt8196/mt8196-nau8825.c
View File

@ -104,8 +104,6 @@ static const struct snd_kcontrol_new mt8196_nau8825_controls[] = {
#define EXT_SPK_AMP_W_NAME "Ext_Speaker_Amp"
static struct snd_soc_card mt8196_nau8825_soc_card;
static const struct snd_soc_dapm_widget mt8196_nau8825_card_widgets[] = {
/* SOF Uplink */
SND_SOC_DAPM_MIXER("SOF_DMA_UL0", SND_SOC_NOPM, 0, 0, NULL, 0),

1
sound/soc/mediatek/mt8365/mt8365-mt6357.c
View File

@ -297,7 +297,6 @@ static int mt8365_mt6357_dev_probe(struct mtk_soc_card_data *soc_card_data, bool
struct mt8365_mt6357_priv *mach_priv;
int ret;
card->dev = dev;
ret = parse_dai_link_info(card);
if (ret)
goto err;