Commit e7a73b05 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown

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: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87jzytc2kp.wl-kuninori.morimoto.gx@renesas.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 433f4a16
...@@ -483,14 +483,16 @@ static struct snd_soc_dai_link aries_dai[] = { ...@@ -483,14 +483,16 @@ static struct snd_soc_dai_link aries_dai[] = {
.name = "WM8994 AIF2", .name = "WM8994 AIF2",
.stream_name = "Baseband", .stream_name = "Baseband",
.init = &aries_baseband_init, .init = &aries_baseband_init,
.params = &baseband_params, .c2c_params = &baseband_params,
.num_c2c_params = 1,
.ignore_suspend = 1, .ignore_suspend = 1,
SND_SOC_DAILINK_REG(baseband), SND_SOC_DAILINK_REG(baseband),
}, },
{ {
.name = "WM8994 AIF3", .name = "WM8994 AIF3",
.stream_name = "Bluetooth", .stream_name = "Bluetooth",
.params = &bluetooth_params, .c2c_params = &bluetooth_params,
.num_c2c_params = 1,
.ignore_suspend = 1, .ignore_suspend = 1,
SND_SOC_DAILINK_REG(bluetooth), SND_SOC_DAILINK_REG(bluetooth),
}, },
......
...@@ -264,7 +264,8 @@ static struct snd_soc_dai_link bells_dai_wm2200[] = { ...@@ -264,7 +264,8 @@ static struct snd_soc_dai_link bells_dai_wm2200[] = {
.stream_name = "DSP-CODEC", .stream_name = "DSP-CODEC",
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
| SND_SOC_DAIFMT_CBM_CFM, | SND_SOC_DAIFMT_CBM_CFM,
.params = &sub_params, .c2c_params = &sub_params,
.num_c2c_params = 1,
.ignore_suspend = 1, .ignore_suspend = 1,
SND_SOC_DAILINK_REG(wm2200_dsp_codec), SND_SOC_DAILINK_REG(wm2200_dsp_codec),
}, },
...@@ -300,7 +301,8 @@ static struct snd_soc_dai_link bells_dai_wm5102[] = { ...@@ -300,7 +301,8 @@ static struct snd_soc_dai_link bells_dai_wm5102[] = {
.stream_name = "DSP-CODEC", .stream_name = "DSP-CODEC",
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
| SND_SOC_DAIFMT_CBM_CFM, | SND_SOC_DAIFMT_CBM_CFM,
.params = &sub_params, .c2c_params = &sub_params,
.num_c2c_params = 1,
.ignore_suspend = 1, .ignore_suspend = 1,
SND_SOC_DAILINK_REG(wm5102_dsp_codec), SND_SOC_DAILINK_REG(wm5102_dsp_codec),
}, },
...@@ -310,7 +312,8 @@ static struct snd_soc_dai_link bells_dai_wm5102[] = { ...@@ -310,7 +312,8 @@ static struct snd_soc_dai_link bells_dai_wm5102[] = {
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
| SND_SOC_DAIFMT_CBM_CFM, | SND_SOC_DAIFMT_CBM_CFM,
.ignore_suspend = 1, .ignore_suspend = 1,
.params = &baseband_params, .c2c_params = &baseband_params,
.num_c2c_params = 1,
SND_SOC_DAILINK_REG(wm5102_baseband), SND_SOC_DAILINK_REG(wm5102_baseband),
}, },
{ {
...@@ -319,7 +322,8 @@ static struct snd_soc_dai_link bells_dai_wm5102[] = { ...@@ -319,7 +322,8 @@ static struct snd_soc_dai_link bells_dai_wm5102[] = {
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
| SND_SOC_DAIFMT_CBS_CFS, | SND_SOC_DAIFMT_CBS_CFS,
.ignore_suspend = 1, .ignore_suspend = 1,
.params = &sub_params, .c2c_params = &sub_params,
.num_c2c_params = 1,
SND_SOC_DAILINK_REG(wm5102_sub), SND_SOC_DAILINK_REG(wm5102_sub),
}, },
}; };
...@@ -355,7 +359,8 @@ static struct snd_soc_dai_link bells_dai_wm5110[] = { ...@@ -355,7 +359,8 @@ static struct snd_soc_dai_link bells_dai_wm5110[] = {
.stream_name = "DSP-CODEC", .stream_name = "DSP-CODEC",
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
| SND_SOC_DAIFMT_CBM_CFM, | SND_SOC_DAIFMT_CBM_CFM,
.params = &sub_params, .c2c_params = &sub_params,
.num_c2c_params = 1,
.ignore_suspend = 1, .ignore_suspend = 1,
SND_SOC_DAILINK_REG(wm5110_dsp_codec), SND_SOC_DAILINK_REG(wm5110_dsp_codec),
}, },
...@@ -365,7 +370,8 @@ static struct snd_soc_dai_link bells_dai_wm5110[] = { ...@@ -365,7 +370,8 @@ static struct snd_soc_dai_link bells_dai_wm5110[] = {
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
| SND_SOC_DAIFMT_CBM_CFM, | SND_SOC_DAIFMT_CBM_CFM,
.ignore_suspend = 1, .ignore_suspend = 1,
.params = &baseband_params, .c2c_params = &baseband_params,
.num_c2c_params = 1,
SND_SOC_DAILINK_REG(wm5110_baseband), SND_SOC_DAILINK_REG(wm5110_baseband),
}, },
{ {
...@@ -374,7 +380,8 @@ static struct snd_soc_dai_link bells_dai_wm5110[] = { ...@@ -374,7 +380,8 @@ static struct snd_soc_dai_link bells_dai_wm5110[] = {
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
| SND_SOC_DAIFMT_CBS_CFS, | SND_SOC_DAIFMT_CBS_CFS,
.ignore_suspend = 1, .ignore_suspend = 1,
.params = &sub_params, .c2c_params = &sub_params,
.num_c2c_params = 1,
SND_SOC_DAILINK_REG(wm5110_sub), SND_SOC_DAILINK_REG(wm5110_sub),
}, },
}; };
......
...@@ -167,7 +167,8 @@ static struct snd_soc_dai_link littlemill_dai[] = { ...@@ -167,7 +167,8 @@ static struct snd_soc_dai_link littlemill_dai[] = {
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
| SND_SOC_DAIFMT_CBM_CFM, | SND_SOC_DAIFMT_CBM_CFM,
.ignore_suspend = 1, .ignore_suspend = 1,
.params = &baseband_params, .c2c_params = &baseband_params,
.num_c2c_params = 1,
SND_SOC_DAILINK_REG(baseband), SND_SOC_DAILINK_REG(baseband),
}, },
}; };
......
...@@ -119,7 +119,8 @@ static struct snd_soc_dai_link lowland_dai[] = { ...@@ -119,7 +119,8 @@ static struct snd_soc_dai_link lowland_dai[] = {
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
SND_SOC_DAIFMT_CBM_CFM, SND_SOC_DAIFMT_CBM_CFM,
.ignore_suspend = 1, .ignore_suspend = 1,
.params = &sub_params, .c2c_params = &sub_params,
.num_c2c_params = 1,
.init = lowland_wm9081_init, .init = lowland_wm9081_init,
SND_SOC_DAILINK_REG(speaker), SND_SOC_DAILINK_REG(speaker),
}, },
......
...@@ -219,7 +219,8 @@ static struct snd_soc_dai_link speyside_dai[] = { ...@@ -219,7 +219,8 @@ static struct snd_soc_dai_link speyside_dai[] = {
.init = speyside_wm8996_init, .init = speyside_wm8996_init,
.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
| SND_SOC_DAIFMT_CBM_CFM, | SND_SOC_DAIFMT_CBM_CFM,
.params = &dsp_codec_params, .c2c_params = &dsp_codec_params,
.num_c2c_params = 1,
.ignore_suspend = 1, .ignore_suspend = 1,
SND_SOC_DAILINK_REG(dsp_codec), SND_SOC_DAILINK_REG(dsp_codec),
}, },
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment