microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

ASoC: samsung: switch to use c2c_params instead of params 

ASoC is now using c2c_params instead of params. This patch replace it.
num_c2c_params (was num_params) was not mandatory before,
but let's set it by this patch.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87jzytc2kp.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Kuninori Morimoto 2023-04-02 23:00:07 +00:00 коммит произвёл Mark Brown
Родитель 433f4a1697
Коммит e7a73b0554
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 24D68B725D5487D0
5 изменённых файлов: 24 добавлений и 12 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

6
sound/soc/samsung/aries_wm8994.c
Просмотреть файл

@ -483,14 +483,16 @@ static struct snd_soc_dai_link aries_dai[] = {
.name = "WM8994 AIF2",
.stream_name = "Baseband",
.init = &aries_baseband_init,
.params = &baseband_params,
.c2c_params = &baseband_params,
.num_c2c_params = 1,
.ignore_suspend = 1,
SND_SOC_DAILINK_REG(baseband),
},
{
.name = "WM8994 AIF3",
.stream_name = "Bluetooth",
.params = &bluetooth_params,
.c2c_params = &bluetooth_params,
.num_c2c_params = 1,
.ignore_suspend = 1,
SND_SOC_DAILINK_REG(bluetooth),
},

21
sound/soc/samsung/bells.c
Просмотреть файл

@ -264,7 +264,8 @@ static struct snd_soc_dai_link bells_dai_wm2200[] = {
.stream_name = "DSP-CODEC",
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
| SND_SOC_DAIFMT_CBM_CFM,
.params = &sub_params,
.c2c_params = &sub_params,
.num_c2c_params = 1,
.ignore_suspend = 1,
SND_SOC_DAILINK_REG(wm2200_dsp_codec),
},
@ -300,7 +301,8 @@ static struct snd_soc_dai_link bells_dai_wm5102[] = {
.stream_name = "DSP-CODEC",
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
| SND_SOC_DAIFMT_CBM_CFM,
.params = &sub_params,
.c2c_params = &sub_params,
.num_c2c_params = 1,
.ignore_suspend = 1,
SND_SOC_DAILINK_REG(wm5102_dsp_codec),
},
@ -310,7 +312,8 @@ static struct snd_soc_dai_link bells_dai_wm5102[] = {
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
| SND_SOC_DAIFMT_CBM_CFM,
.ignore_suspend = 1,
.params = &baseband_params,
.c2c_params = &baseband_params,
.num_c2c_params = 1,
SND_SOC_DAILINK_REG(wm5102_baseband),
},
{
@ -319,7 +322,8 @@ static struct snd_soc_dai_link bells_dai_wm5102[] = {
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
| SND_SOC_DAIFMT_CBS_CFS,
.ignore_suspend = 1,
.params = &sub_params,
.c2c_params = &sub_params,
.num_c2c_params = 1,
SND_SOC_DAILINK_REG(wm5102_sub),
},
};
@ -355,7 +359,8 @@ static struct snd_soc_dai_link bells_dai_wm5110[] = {
.stream_name = "DSP-CODEC",
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
| SND_SOC_DAIFMT_CBM_CFM,
.params = &sub_params,
.c2c_params = &sub_params,
.num_c2c_params = 1,
.ignore_suspend = 1,
SND_SOC_DAILINK_REG(wm5110_dsp_codec),
},
@ -365,7 +370,8 @@ static struct snd_soc_dai_link bells_dai_wm5110[] = {
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
| SND_SOC_DAIFMT_CBM_CFM,
.ignore_suspend = 1,
.params = &baseband_params,
.c2c_params = &baseband_params,
.num_c2c_params = 1,
SND_SOC_DAILINK_REG(wm5110_baseband),
},
{
@ -374,7 +380,8 @@ static struct snd_soc_dai_link bells_dai_wm5110[] = {
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
| SND_SOC_DAIFMT_CBS_CFS,
.ignore_suspend = 1,
.params = &sub_params,
.c2c_params = &sub_params,
.num_c2c_params = 1,
SND_SOC_DAILINK_REG(wm5110_sub),
},
};

3
sound/soc/samsung/littlemill.c
Просмотреть файл

@ -167,7 +167,8 @@ static struct snd_soc_dai_link littlemill_dai[] = {
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
| SND_SOC_DAIFMT_CBM_CFM,
.ignore_suspend = 1,
.params = &baseband_params,
.c2c_params = &baseband_params,
.num_c2c_params = 1,
SND_SOC_DAILINK_REG(baseband),
},
};

3
sound/soc/samsung/lowland.c
Просмотреть файл

@ -119,7 +119,8 @@ static struct snd_soc_dai_link lowland_dai[] = {
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
SND_SOC_DAIFMT_CBM_CFM,
.ignore_suspend = 1,
.params = &sub_params,
.c2c_params = &sub_params,
.num_c2c_params = 1,
.init = lowland_wm9081_init,
SND_SOC_DAILINK_REG(speaker),
},

3
sound/soc/samsung/speyside.c
Просмотреть файл

@ -219,7 +219,8 @@ static struct snd_soc_dai_link speyside_dai[] = {
.init = speyside_wm8996_init,
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
| SND_SOC_DAIFMT_CBM_CFM,
.params = &dsp_codec_params,
.c2c_params = &dsp_codec_params,
.num_c2c_params = 1,
.ignore_suspend = 1,
SND_SOC_DAILINK_REG(dsp_codec),
},