Skip to content

L
linux
Commit 5374b921 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown
Browse files
Options

ASoC: Intel: boards: Update to modern clocking terminology 

As part of the effort to remove our old APIs based on outdated terminology
update the Intel board drivers to use modern terminology.
Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com
Link: https://lore.kernel.org/r/20210920065508.7854-1-peter.ujfalusi@linux.intel.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent a7a18abb
Show whitespace changes
Inline Side-by-side
Showing with 46 additions and 46 deletions
sound/soc/intel/boards/bdw-rt5650.c
View file @ 5374b921
...@@ -251,7 +251,7 @@ static struct snd_soc_dai_link bdw_rt5650_dais[] = { ...@@ -251,7 +251,7 @@ static struct snd_soc_dai_link bdw_rt5650_dais[] = {
.id = 0, .id = 0,
.no_pcm = 1, .no_pcm = 1,
.dai_fmt = SND_SOC_DAIFMT_DSP_B | SND_SOC_DAIFMT_NB_NF | .dai_fmt = SND_SOC_DAIFMT_DSP_B | SND_SOC_DAIFMT_NB_NF |
SND_SOC_DAIFMT_CBS_CFS, SND_SOC_DAIFMT_CBC_CFC,
.ignore_pmdown_time = 1, .ignore_pmdown_time = 1,
.be_hw_params_fixup = broadwell_ssp0_fixup, .be_hw_params_fixup = broadwell_ssp0_fixup,
.ops = &bdw_rt5650_ops, .ops = &bdw_rt5650_ops,
......
sound/soc/intel/boards/bdw-rt5677.c
View file @ 5374b921
...@@ -351,7 +351,7 @@ static struct snd_soc_dai_link bdw_rt5677_dais[] = { ...@@ -351,7 +351,7 @@ static struct snd_soc_dai_link bdw_rt5677_dais[] = {
.id = 0, .id = 0,
.no_pcm = 1, .no_pcm = 1,
.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_CBC_CFC,
.ignore_pmdown_time = 1, .ignore_pmdown_time = 1,
.be_hw_params_fixup = broadwell_ssp0_fixup, .be_hw_params_fixup = broadwell_ssp0_fixup,
.ops = &bdw_rt5677_ops, .ops = &bdw_rt5677_ops,
......
sound/soc/intel/boards/broadwell.c
View file @ 5374b921
...@@ -217,7 +217,7 @@ static struct snd_soc_dai_link broadwell_rt286_dais[] = { ...@@ -217,7 +217,7 @@ static struct snd_soc_dai_link broadwell_rt286_dais[] = {
.no_pcm = 1, .no_pcm = 1,
.init = broadwell_rt286_codec_init, .init = broadwell_rt286_codec_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_CBS_CFS, SND_SOC_DAIFMT_CBC_CFC,
.ignore_pmdown_time = 1, .ignore_pmdown_time = 1,
.be_hw_params_fixup = broadwell_ssp0_fixup, .be_hw_params_fixup = broadwell_ssp0_fixup,
.ops = &broadwell_rt286_ops, .ops = &broadwell_rt286_ops,
......
sound/soc/intel/boards/bxt_da7219_max98357a.c
View file @ 5374b921
...@@ -572,7 +572,7 @@ static struct snd_soc_dai_link broxton_dais[] = { ...@@ -572,7 +572,7 @@ static struct snd_soc_dai_link broxton_dais[] = {
.no_pcm = 1, .no_pcm = 1,
.dai_fmt = SND_SOC_DAIFMT_I2S | .dai_fmt = SND_SOC_DAIFMT_I2S |
SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_NB_NF |
SND_SOC_DAIFMT_CBS_CFS, SND_SOC_DAIFMT_CBC_CFC,
.ignore_pmdown_time = 1, .ignore_pmdown_time = 1,
.be_hw_params_fixup = broxton_ssp_fixup, .be_hw_params_fixup = broxton_ssp_fixup,
.dpcm_playback = 1, .dpcm_playback = 1,
...@@ -585,7 +585,7 @@ static struct snd_soc_dai_link broxton_dais[] = { ...@@ -585,7 +585,7 @@ static struct snd_soc_dai_link broxton_dais[] = {
.no_pcm = 1, .no_pcm = 1,
.init = broxton_da7219_codec_init, .init = broxton_da7219_codec_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_CBS_CFS, SND_SOC_DAIFMT_CBC_CFC,
.ignore_pmdown_time = 1, .ignore_pmdown_time = 1,
.be_hw_params_fixup = broxton_ssp_fixup, .be_hw_params_fixup = broxton_ssp_fixup,
.dpcm_playback = 1, .dpcm_playback = 1,
......
sound/soc/intel/boards/bxt_rt298.c
View file @ 5374b921
...@@ -468,7 +468,7 @@ static struct snd_soc_dai_link broxton_rt298_dais[] = { ...@@ -468,7 +468,7 @@ static struct snd_soc_dai_link broxton_rt298_dais[] = {
.no_pcm = 1, .no_pcm = 1,
.init = broxton_rt298_codec_init, .init = broxton_rt298_codec_init,
.dai_fmt = SND_SOC_DAIFMT_DSP_A | SND_SOC_DAIFMT_NB_NF | .dai_fmt = SND_SOC_DAIFMT_DSP_A | SND_SOC_DAIFMT_NB_NF |
SND_SOC_DAIFMT_CBS_CFS, SND_SOC_DAIFMT_CBC_CFC,
.ignore_pmdown_time = 1, .ignore_pmdown_time = 1,
.be_hw_params_fixup = broxton_ssp5_fixup, .be_hw_params_fixup = broxton_ssp5_fixup,
.ops = &broxton_rt298_ops, .ops = &broxton_rt298_ops,
......
sound/soc/intel/boards/bytcht_cx2072x.c
View file @ 5374b921
...@@ -126,7 +126,7 @@ static int byt_cht_cx2072x_fixup(struct snd_soc_pcm_runtime *rtd, ...@@ -126,7 +126,7 @@ static int byt_cht_cx2072x_fixup(struct snd_soc_pcm_runtime *rtd,
ret = snd_soc_dai_set_fmt(asoc_rtd_to_cpu(rtd, 0), ret = snd_soc_dai_set_fmt(asoc_rtd_to_cpu(rtd, 0),
SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_I2S |
SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_NB_NF |
SND_SOC_DAIFMT_CBS_CFS); SND_SOC_DAIFMT_CBC_CFC);
if (ret < 0) { if (ret < 0) {
dev_err(rtd->dev, "can't set format to I2S, err %d\n", ret); dev_err(rtd->dev, "can't set format to I2S, err %d\n", ret);
return ret; return ret;
...@@ -195,7 +195,7 @@ static struct snd_soc_dai_link byt_cht_cx2072x_dais[] = { ...@@ -195,7 +195,7 @@ static struct snd_soc_dai_link byt_cht_cx2072x_dais[] = {
.id = 0, .id = 0,
.no_pcm = 1, .no_pcm = 1,
.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_CBC_CFC,
.init = byt_cht_cx2072x_init, .init = byt_cht_cx2072x_init,
.be_hw_params_fixup = byt_cht_cx2072x_fixup, .be_hw_params_fixup = byt_cht_cx2072x_fixup,
.dpcm_playback = 1, .dpcm_playback = 1,
......
sound/soc/intel/boards/bytcht_da7213.c
View file @ 5374b921
...@@ -81,7 +81,7 @@ static int codec_fixup(struct snd_soc_pcm_runtime *rtd, ...@@ -81,7 +81,7 @@ static int codec_fixup(struct snd_soc_pcm_runtime *rtd,
ret = snd_soc_dai_set_fmt(asoc_rtd_to_cpu(rtd, 0), ret = snd_soc_dai_set_fmt(asoc_rtd_to_cpu(rtd, 0),
SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_I2S |
SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_NB_NF |
SND_SOC_DAIFMT_CBS_CFS); SND_SOC_DAIFMT_CBC_CFC);
if (ret < 0) { if (ret < 0) {
dev_err(rtd->dev, "can't set format to I2S, err %d\n", ret); dev_err(rtd->dev, "can't set format to I2S, err %d\n", ret);
return ret; return ret;
...@@ -195,7 +195,7 @@ static struct snd_soc_dai_link dailink[] = { ...@@ -195,7 +195,7 @@ static struct snd_soc_dai_link dailink[] = {
.id = 0, .id = 0,
.no_pcm = 1, .no_pcm = 1,
.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_CBC_CFC,
.be_hw_params_fixup = codec_fixup, .be_hw_params_fixup = codec_fixup,
.dpcm_playback = 1, .dpcm_playback = 1,
.dpcm_capture = 1, .dpcm_capture = 1,
......
sound/soc/intel/boards/bytcht_es8316.c
View file @ 5374b921
...@@ -265,7 +265,7 @@ static int byt_cht_es8316_codec_fixup(struct snd_soc_pcm_runtime *rtd, ...@@ -265,7 +265,7 @@ static int byt_cht_es8316_codec_fixup(struct snd_soc_pcm_runtime *rtd,
ret = snd_soc_dai_set_fmt(asoc_rtd_to_cpu(rtd, 0), ret = snd_soc_dai_set_fmt(asoc_rtd_to_cpu(rtd, 0),
SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_I2S |
SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_NB_NF |
SND_SOC_DAIFMT_CBS_CFS SND_SOC_DAIFMT_CBC_CFC
); );
if (ret < 0) { if (ret < 0) {
dev_err(rtd->dev, "can't set format to I2S, err %d\n", ret); dev_err(rtd->dev, "can't set format to I2S, err %d\n", ret);
...@@ -336,7 +336,7 @@ static struct snd_soc_dai_link byt_cht_es8316_dais[] = { ...@@ -336,7 +336,7 @@ static struct snd_soc_dai_link byt_cht_es8316_dais[] = {
.id = 0, .id = 0,
.no_pcm = 1, .no_pcm = 1,
.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_CBC_CFC,
.be_hw_params_fixup = byt_cht_es8316_codec_fixup, .be_hw_params_fixup = byt_cht_es8316_codec_fixup,
.dpcm_playback = 1, .dpcm_playback = 1,
.dpcm_capture = 1, .dpcm_capture = 1,
......
sound/soc/intel/boards/bytcht_nocodec.c
View file @ 5374b921
...@@ -61,7 +61,7 @@ static int codec_fixup(struct snd_soc_pcm_runtime *rtd, ...@@ -61,7 +61,7 @@ static int codec_fixup(struct snd_soc_pcm_runtime *rtd,
ret = snd_soc_dai_set_fmt(asoc_rtd_to_cpu(rtd, 0), ret = snd_soc_dai_set_fmt(asoc_rtd_to_cpu(rtd, 0),
SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_I2S |
SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_NB_NF |
SND_SOC_DAIFMT_CBS_CFS); SND_SOC_DAIFMT_CBC_CFC);
if (ret < 0) { if (ret < 0) {
dev_err(rtd->dev, "can't set format to I2S, err %d\n", ret); dev_err(rtd->dev, "can't set format to I2S, err %d\n", ret);
...@@ -141,7 +141,7 @@ static struct snd_soc_dai_link dais[] = { ...@@ -141,7 +141,7 @@ static struct snd_soc_dai_link dais[] = {
.id = 0, .id = 0,
.no_pcm = 1, .no_pcm = 1,
.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_CBC_CFC,
.be_hw_params_fixup = codec_fixup, .be_hw_params_fixup = codec_fixup,
.ignore_suspend = 1, .ignore_suspend = 1,
.dpcm_playback = 1, .dpcm_playback = 1,
......
sound/soc/intel/boards/bytcr_rt5640.c
View file @ 5374b921
...@@ -1336,7 +1336,7 @@ static int byt_rt5640_codec_fixup(struct snd_soc_pcm_runtime *rtd, ...@@ -1336,7 +1336,7 @@ static int byt_rt5640_codec_fixup(struct snd_soc_pcm_runtime *rtd,
ret = snd_soc_dai_set_fmt(asoc_rtd_to_cpu(rtd, 0), ret = snd_soc_dai_set_fmt(asoc_rtd_to_cpu(rtd, 0),
SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_I2S |
SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_NB_NF |
SND_SOC_DAIFMT_CBS_CFS); SND_SOC_DAIFMT_CBC_CFC);
if (ret < 0) { if (ret < 0) {
dev_err(rtd->dev, "can't set format to I2S, err %d\n", ret); dev_err(rtd->dev, "can't set format to I2S, err %d\n", ret);
return ret; return ret;
...@@ -1411,7 +1411,7 @@ static struct snd_soc_dai_link byt_rt5640_dais[] = { ...@@ -1411,7 +1411,7 @@ static struct snd_soc_dai_link byt_rt5640_dais[] = {
.id = 0, .id = 0,
.no_pcm = 1, .no_pcm = 1,
.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_CBC_CFC,
.be_hw_params_fixup = byt_rt5640_codec_fixup, .be_hw_params_fixup = byt_rt5640_codec_fixup,
.dpcm_playback = 1, .dpcm_playback = 1,
.dpcm_capture = 1, .dpcm_capture = 1,
......
sound/soc/intel/boards/bytcr_rt5651.c
View file @ 5374b921
...@@ -713,7 +713,7 @@ static int byt_rt5651_codec_fixup(struct snd_soc_pcm_runtime *rtd, ...@@ -713,7 +713,7 @@ static int byt_rt5651_codec_fixup(struct snd_soc_pcm_runtime *rtd,
ret = snd_soc_dai_set_fmt(asoc_rtd_to_cpu(rtd, 0), ret = snd_soc_dai_set_fmt(asoc_rtd_to_cpu(rtd, 0),
SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_I2S |
SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_NB_NF |
SND_SOC_DAIFMT_CBS_CFS SND_SOC_DAIFMT_CBC_CFC
); );
if (ret < 0) { if (ret < 0) {
...@@ -798,7 +798,7 @@ static struct snd_soc_dai_link byt_rt5651_dais[] = { ...@@ -798,7 +798,7 @@ static struct snd_soc_dai_link byt_rt5651_dais[] = {
.id = 0, .id = 0,
.no_pcm = 1, .no_pcm = 1,
.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_CBC_CFC,
.be_hw_params_fixup = byt_rt5651_codec_fixup, .be_hw_params_fixup = byt_rt5651_codec_fixup,
.dpcm_playback = 1, .dpcm_playback = 1,
.dpcm_capture = 1, .dpcm_capture = 1,
......
sound/soc/intel/boards/bytcr_wm5102.c
View file @ 5374b921
...@@ -265,7 +265,7 @@ static int byt_wm5102_codec_fixup(struct snd_soc_pcm_runtime *rtd, ...@@ -265,7 +265,7 @@ static int byt_wm5102_codec_fixup(struct snd_soc_pcm_runtime *rtd,
ret = snd_soc_dai_set_fmt(asoc_rtd_to_cpu(rtd, 0), ret = snd_soc_dai_set_fmt(asoc_rtd_to_cpu(rtd, 0),
SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_I2S |
SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_NB_NF |
SND_SOC_DAIFMT_CBS_CFS); SND_SOC_DAIFMT_CBC_CFC);
if (ret) { if (ret) {
dev_err(rtd->dev, "Error setting format to I2S: %d\n", ret); dev_err(rtd->dev, "Error setting format to I2S: %d\n", ret);
return ret; return ret;
...@@ -349,7 +349,7 @@ static struct snd_soc_dai_link byt_wm5102_dais[] = { ...@@ -349,7 +349,7 @@ static struct snd_soc_dai_link byt_wm5102_dais[] = {
.id = 0, .id = 0,
.no_pcm = 1, .no_pcm = 1,
.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_CBC_CFC,
.be_hw_params_fixup = byt_wm5102_codec_fixup, .be_hw_params_fixup = byt_wm5102_codec_fixup,
.dpcm_playback = 1, .dpcm_playback = 1,
.dpcm_capture = 1, .dpcm_capture = 1,
......
sound/soc/intel/boards/cht_bsw_max98090_ti.c
View file @ 5374b921
...@@ -264,7 +264,7 @@ static int cht_codec_fixup(struct snd_soc_pcm_runtime *rtd, ...@@ -264,7 +264,7 @@ static int cht_codec_fixup(struct snd_soc_pcm_runtime *rtd,
} }
fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
| SND_SOC_DAIFMT_CBS_CFS; | SND_SOC_DAIFMT_CBC_CFC;
ret = snd_soc_dai_set_fmt(asoc_rtd_to_cpu(rtd, 0), fmt); ret = snd_soc_dai_set_fmt(asoc_rtd_to_cpu(rtd, 0), fmt);
if (ret < 0) { if (ret < 0) {
...@@ -372,7 +372,7 @@ static struct snd_soc_dai_link cht_dailink[] = { ...@@ -372,7 +372,7 @@ static struct snd_soc_dai_link cht_dailink[] = {
.id = 0, .id = 0,
.no_pcm = 1, .no_pcm = 1,
.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_CBC_CFC,
.init = cht_codec_init, .init = cht_codec_init,
.be_hw_params_fixup = cht_codec_fixup, .be_hw_params_fixup = cht_codec_fixup,
.dpcm_playback = 1, .dpcm_playback = 1,
......
sound/soc/intel/boards/cht_bsw_nau8824.c
View file @ 5374b921
...@@ -214,7 +214,7 @@ static struct snd_soc_dai_link cht_dailink[] = { ...@@ -214,7 +214,7 @@ static struct snd_soc_dai_link cht_dailink[] = {
.id = 0, .id = 0,
.no_pcm = 1, .no_pcm = 1,
.dai_fmt = SND_SOC_DAIFMT_DSP_B | SND_SOC_DAIFMT_IB_NF .dai_fmt = SND_SOC_DAIFMT_DSP_B | SND_SOC_DAIFMT_IB_NF
| SND_SOC_DAIFMT_CBS_CFS, | SND_SOC_DAIFMT_CBC_CFC,
.init = cht_codec_init, .init = cht_codec_init,
.be_hw_params_fixup = cht_codec_fixup, .be_hw_params_fixup = cht_codec_fixup,
.dpcm_playback = 1, .dpcm_playback = 1,
......
sound/soc/intel/boards/cht_bsw_rt5645.c
View file @ 5374b921
...@@ -362,7 +362,7 @@ static int cht_codec_fixup(struct snd_soc_pcm_runtime *rtd, ...@@ -362,7 +362,7 @@ static int cht_codec_fixup(struct snd_soc_pcm_runtime *rtd,
ret = snd_soc_dai_set_fmt(asoc_rtd_to_cpu(rtd, 0), ret = snd_soc_dai_set_fmt(asoc_rtd_to_cpu(rtd, 0),
SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_I2S |
SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_NB_NF |
SND_SOC_DAIFMT_CBS_CFS SND_SOC_DAIFMT_CBC_CFC
); );
if (ret < 0) { if (ret < 0) {
dev_err(rtd->dev, "can't set format to I2S, err %d\n", ret); dev_err(rtd->dev, "can't set format to I2S, err %d\n", ret);
...@@ -372,7 +372,7 @@ static int cht_codec_fixup(struct snd_soc_pcm_runtime *rtd, ...@@ -372,7 +372,7 @@ static int cht_codec_fixup(struct snd_soc_pcm_runtime *rtd,
ret = snd_soc_dai_set_fmt(asoc_rtd_to_codec(rtd, 0), ret = snd_soc_dai_set_fmt(asoc_rtd_to_codec(rtd, 0),
SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_I2S |
SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_NB_NF |
SND_SOC_DAIFMT_CBS_CFS SND_SOC_DAIFMT_CBC_CFC
); );
if (ret < 0) { if (ret < 0) {
dev_err(rtd->dev, "can't set format to I2S, err %d\n", ret); dev_err(rtd->dev, "can't set format to I2S, err %d\n", ret);
...@@ -396,7 +396,7 @@ static int cht_codec_fixup(struct snd_soc_pcm_runtime *rtd, ...@@ -396,7 +396,7 @@ static int cht_codec_fixup(struct snd_soc_pcm_runtime *rtd,
ret = snd_soc_dai_set_fmt(asoc_rtd_to_codec(rtd, 0), ret = snd_soc_dai_set_fmt(asoc_rtd_to_codec(rtd, 0),
SND_SOC_DAIFMT_DSP_B | SND_SOC_DAIFMT_DSP_B |
SND_SOC_DAIFMT_IB_NF | SND_SOC_DAIFMT_IB_NF |
SND_SOC_DAIFMT_CBS_CFS); SND_SOC_DAIFMT_CBC_CFC);
if (ret < 0) { if (ret < 0) {
dev_err(rtd->dev, "can't set format to TDM %d\n", ret); dev_err(rtd->dev, "can't set format to TDM %d\n", ret);
return ret; return ret;
......
sound/soc/intel/boards/cht_bsw_rt5672.c
View file @ 5374b921
...@@ -300,7 +300,7 @@ static int cht_codec_fixup(struct snd_soc_pcm_runtime *rtd, ...@@ -300,7 +300,7 @@ static int cht_codec_fixup(struct snd_soc_pcm_runtime *rtd,
ret = snd_soc_dai_set_fmt(asoc_rtd_to_cpu(rtd, 0), ret = snd_soc_dai_set_fmt(asoc_rtd_to_cpu(rtd, 0),
SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_I2S |
SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_NB_NF |
SND_SOC_DAIFMT_CBS_CFS); SND_SOC_DAIFMT_CBC_CFC);
if (ret < 0) { if (ret < 0) {
dev_err(rtd->dev, "can't set format to I2S, err %d\n", ret); dev_err(rtd->dev, "can't set format to I2S, err %d\n", ret);
return ret; return ret;
......
sound/soc/intel/boards/glk_rt5682_max98357a.c
View file @ 5374b921
...@@ -473,7 +473,7 @@ static struct snd_soc_dai_link geminilake_dais[] = { ...@@ -473,7 +473,7 @@ static struct snd_soc_dai_link geminilake_dais[] = {
.no_pcm = 1, .no_pcm = 1,
.dai_fmt = SND_SOC_DAIFMT_I2S | .dai_fmt = SND_SOC_DAIFMT_I2S |
SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_NB_NF |
SND_SOC_DAIFMT_CBS_CFS, SND_SOC_DAIFMT_CBC_CFC,
.ignore_pmdown_time = 1, .ignore_pmdown_time = 1,
.be_hw_params_fixup = geminilake_ssp_fixup, .be_hw_params_fixup = geminilake_ssp_fixup,
.dpcm_playback = 1, .dpcm_playback = 1,
...@@ -486,7 +486,7 @@ static struct snd_soc_dai_link geminilake_dais[] = { ...@@ -486,7 +486,7 @@ static struct snd_soc_dai_link geminilake_dais[] = {
.no_pcm = 1, .no_pcm = 1,
.init = geminilake_rt5682_codec_init, .init = geminilake_rt5682_codec_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_CBS_CFS, SND_SOC_DAIFMT_CBC_CFC,
.ignore_pmdown_time = 1, .ignore_pmdown_time = 1,
.be_hw_params_fixup = geminilake_ssp_fixup, .be_hw_params_fixup = geminilake_ssp_fixup,
.ops = &geminilake_rt5682_ops, .ops = &geminilake_rt5682_ops,
......
sound/soc/intel/boards/haswell.c
View file @ 5374b921
...@@ -145,7 +145,7 @@ static struct snd_soc_dai_link haswell_rt5640_dais[] = { ...@@ -145,7 +145,7 @@ static struct snd_soc_dai_link haswell_rt5640_dais[] = {
.id = 0, .id = 0,
.no_pcm = 1, .no_pcm = 1,
.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_CBC_CFC,
.ignore_pmdown_time = 1, .ignore_pmdown_time = 1,
.be_hw_params_fixup = haswell_ssp0_fixup, .be_hw_params_fixup = haswell_ssp0_fixup,
.ops = &haswell_rt5640_ops, .ops = &haswell_rt5640_ops,
......
sound/soc/intel/boards/kbl_da7219_max98357a.c
View file @ 5374b921
...@@ -518,7 +518,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { ...@@ -518,7 +518,7 @@ static struct snd_soc_dai_link kabylake_dais[] = {
.no_pcm = 1, .no_pcm = 1,
.dai_fmt = SND_SOC_DAIFMT_I2S | .dai_fmt = SND_SOC_DAIFMT_I2S |
SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_NB_NF |
SND_SOC_DAIFMT_CBS_CFS, SND_SOC_DAIFMT_CBC_CFC,
.ignore_pmdown_time = 1, .ignore_pmdown_time = 1,
.be_hw_params_fixup = kabylake_ssp_fixup, .be_hw_params_fixup = kabylake_ssp_fixup,
.dpcm_playback = 1, .dpcm_playback = 1,
...@@ -531,7 +531,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { ...@@ -531,7 +531,7 @@ static struct snd_soc_dai_link kabylake_dais[] = {
.no_pcm = 1, .no_pcm = 1,
.init = kabylake_da7219_codec_init, .init = kabylake_da7219_codec_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_CBS_CFS, SND_SOC_DAIFMT_CBC_CFC,
.ignore_pmdown_time = 1, .ignore_pmdown_time = 1,
.be_hw_params_fixup = kabylake_ssp_fixup, .be_hw_params_fixup = kabylake_ssp_fixup,
.dpcm_playback = 1, .dpcm_playback = 1,
......
sound/soc/intel/boards/kbl_da7219_max98927.c
View file @ 5374b921
...@@ -764,7 +764,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { ...@@ -764,7 +764,7 @@ static struct snd_soc_dai_link kabylake_dais[] = {
.no_pcm = 1, .no_pcm = 1,
.dai_fmt = SND_SOC_DAIFMT_DSP_B | .dai_fmt = SND_SOC_DAIFMT_DSP_B |
SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_NB_NF |
SND_SOC_DAIFMT_CBS_CFS, SND_SOC_DAIFMT_CBC_CFC,
.dpcm_playback = 1, .dpcm_playback = 1,
.dpcm_capture = 1, .dpcm_capture = 1,
.ignore_pmdown_time = 1, .ignore_pmdown_time = 1,
...@@ -779,7 +779,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { ...@@ -779,7 +779,7 @@ static struct snd_soc_dai_link kabylake_dais[] = {
.no_pcm = 1, .no_pcm = 1,
.init = kabylake_da7219_codec_init, .init = kabylake_da7219_codec_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_CBS_CFS, SND_SOC_DAIFMT_CBC_CFC,
.ignore_pmdown_time = 1, .ignore_pmdown_time = 1,
.be_hw_params_fixup = kabylake_ssp_fixup, .be_hw_params_fixup = kabylake_ssp_fixup,
.dpcm_playback = 1, .dpcm_playback = 1,
...@@ -907,7 +907,7 @@ static struct snd_soc_dai_link kabylake_max98_927_373_dais[] = { ...@@ -907,7 +907,7 @@ static struct snd_soc_dai_link kabylake_max98_927_373_dais[] = {
.no_pcm = 1, .no_pcm = 1,
.dai_fmt = SND_SOC_DAIFMT_DSP_B | .dai_fmt = SND_SOC_DAIFMT_DSP_B |
SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_NB_NF |
SND_SOC_DAIFMT_CBS_CFS, SND_SOC_DAIFMT_CBC_CFC,
.dpcm_playback = 1, .dpcm_playback = 1,
.dpcm_capture = 1, .dpcm_capture = 1,
.ignore_pmdown_time = 1, .ignore_pmdown_time = 1,
......
sound/soc/intel/boards/kbl_rt5660.c
View file @ 5374b921
...@@ -436,7 +436,7 @@ static struct snd_soc_dai_link kabylake_rt5660_dais[] = { ...@@ -436,7 +436,7 @@ static struct snd_soc_dai_link kabylake_rt5660_dais[] = {
.exit = kabylake_rt5660_codec_exit, .exit = kabylake_rt5660_codec_exit,
.dai_fmt = SND_SOC_DAIFMT_I2S | .dai_fmt = SND_SOC_DAIFMT_I2S |
SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_NB_NF |
SND_SOC_DAIFMT_CBS_CFS, SND_SOC_DAIFMT_CBC_CFC,
.ignore_pmdown_time = 1, .ignore_pmdown_time = 1,
.be_hw_params_fixup = kabylake_ssp0_fixup, .be_hw_params_fixup = kabylake_ssp0_fixup,
.ops = &kabylake_rt5660_ops, .ops = &kabylake_rt5660_ops,
......
sound/soc/intel/boards/kbl_rt5663_max98927.c
View file @ 5374b921
...@@ -767,7 +767,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { ...@@ -767,7 +767,7 @@ static struct snd_soc_dai_link kabylake_dais[] = {
.no_pcm = 1, .no_pcm = 1,
.dai_fmt = SND_SOC_DAIFMT_DSP_B | .dai_fmt = SND_SOC_DAIFMT_DSP_B |
SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_NB_NF |
SND_SOC_DAIFMT_CBS_CFS, SND_SOC_DAIFMT_CBC_CFC,
.ignore_pmdown_time = 1, .ignore_pmdown_time = 1,
.be_hw_params_fixup = kabylake_ssp_fixup, .be_hw_params_fixup = kabylake_ssp_fixup,
.dpcm_playback = 1, .dpcm_playback = 1,
...@@ -781,7 +781,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { ...@@ -781,7 +781,7 @@ static struct snd_soc_dai_link kabylake_dais[] = {
.no_pcm = 1, .no_pcm = 1,
.init = kabylake_rt5663_max98927_codec_init, .init = kabylake_rt5663_max98927_codec_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_CBS_CFS, SND_SOC_DAIFMT_CBC_CFC,
.ignore_pmdown_time = 1, .ignore_pmdown_time = 1,
.be_hw_params_fixup = kabylake_ssp_fixup, .be_hw_params_fixup = kabylake_ssp_fixup,
.ops = &kabylake_rt5663_ops, .ops = &kabylake_rt5663_ops,
...@@ -879,7 +879,7 @@ static struct snd_soc_dai_link kabylake_5663_dais[] = { ...@@ -879,7 +879,7 @@ static struct snd_soc_dai_link kabylake_5663_dais[] = {
.no_pcm = 1, .no_pcm = 1,
.init = kabylake_rt5663_codec_init, .init = kabylake_rt5663_codec_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_CBS_CFS, SND_SOC_DAIFMT_CBC_CFC,
.ignore_pmdown_time = 1, .ignore_pmdown_time = 1,
.be_hw_params_fixup = kabylake_ssp_fixup, .be_hw_params_fixup = kabylake_ssp_fixup,
.ops = &kabylake_rt5663_ops, .ops = &kabylake_rt5663_ops,
......
sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c
View file @ 5374b921
...@@ -639,7 +639,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { ...@@ -639,7 +639,7 @@ static struct snd_soc_dai_link kabylake_dais[] = {
.no_pcm = 1, .no_pcm = 1,
.dai_fmt = SND_SOC_DAIFMT_DSP_B | .dai_fmt = SND_SOC_DAIFMT_DSP_B |
SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_NB_NF |
SND_SOC_DAIFMT_CBS_CFS, SND_SOC_DAIFMT_CBC_CFC,
.ignore_pmdown_time = 1, .ignore_pmdown_time = 1,
.be_hw_params_fixup = kabylake_ssp_fixup, .be_hw_params_fixup = kabylake_ssp_fixup,
.dpcm_playback = 1, .dpcm_playback = 1,
...@@ -653,7 +653,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { ...@@ -653,7 +653,7 @@ static struct snd_soc_dai_link kabylake_dais[] = {
.no_pcm = 1, .no_pcm = 1,
.init = kabylake_rt5663_codec_init, .init = kabylake_rt5663_codec_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_CBS_CFS, SND_SOC_DAIFMT_CBC_CFC,
.ignore_pmdown_time = 1, .ignore_pmdown_time = 1,
.be_hw_params_fixup = kabylake_ssp_fixup, .be_hw_params_fixup = kabylake_ssp_fixup,
.ops = &kabylake_rt5663_ops, .ops = &kabylake_rt5663_ops,
......
sound/soc/intel/boards/skl_nau88l25_max98357a.c
View file @ 5374b921
...@@ -539,7 +539,7 @@ static struct snd_soc_dai_link skylake_dais[] = { ...@@ -539,7 +539,7 @@ static struct snd_soc_dai_link skylake_dais[] = {
.no_pcm = 1, .no_pcm = 1,
.dai_fmt = SND_SOC_DAIFMT_I2S | .dai_fmt = SND_SOC_DAIFMT_I2S |
SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_NB_NF |
SND_SOC_DAIFMT_CBS_CFS, SND_SOC_DAIFMT_CBC_CFC,
.ignore_pmdown_time = 1, .ignore_pmdown_time = 1,
.be_hw_params_fixup = skylake_ssp_fixup, .be_hw_params_fixup = skylake_ssp_fixup,
.dpcm_playback = 1, .dpcm_playback = 1,
...@@ -552,7 +552,7 @@ static struct snd_soc_dai_link skylake_dais[] = { ...@@ -552,7 +552,7 @@ static struct snd_soc_dai_link skylake_dais[] = {
.no_pcm = 1, .no_pcm = 1,
.init = skylake_nau8825_codec_init, .init = skylake_nau8825_codec_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_CBS_CFS, SND_SOC_DAIFMT_CBC_CFC,
.ignore_pmdown_time = 1, .ignore_pmdown_time = 1,
.be_hw_params_fixup = skylake_ssp_fixup, .be_hw_params_fixup = skylake_ssp_fixup,
.ops = &skylake_nau8825_ops, .ops = &skylake_nau8825_ops,
......
sound/soc/intel/boards/skl_nau88l25_ssm4567.c
View file @ 5374b921
...@@ -578,7 +578,7 @@ static struct snd_soc_dai_link skylake_dais[] = { ...@@ -578,7 +578,7 @@ static struct snd_soc_dai_link skylake_dais[] = {
.no_pcm = 1, .no_pcm = 1,
.dai_fmt = SND_SOC_DAIFMT_DSP_A | .dai_fmt = SND_SOC_DAIFMT_DSP_A |
SND_SOC_DAIFMT_IB_NF | SND_SOC_DAIFMT_IB_NF |
SND_SOC_DAIFMT_CBS_CFS, SND_SOC_DAIFMT_CBC_CFC,
.init = skylake_ssm4567_codec_init, .init = skylake_ssm4567_codec_init,
.ignore_pmdown_time = 1, .ignore_pmdown_time = 1,
.be_hw_params_fixup = skylake_ssp_fixup, .be_hw_params_fixup = skylake_ssp_fixup,
...@@ -593,7 +593,7 @@ static struct snd_soc_dai_link skylake_dais[] = { ...@@ -593,7 +593,7 @@ static struct snd_soc_dai_link skylake_dais[] = {
.no_pcm = 1, .no_pcm = 1,
.init = skylake_nau8825_codec_init, .init = skylake_nau8825_codec_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_CBS_CFS, SND_SOC_DAIFMT_CBC_CFC,
.ignore_pmdown_time = 1, .ignore_pmdown_time = 1,
.be_hw_params_fixup = skylake_ssp_fixup, .be_hw_params_fixup = skylake_ssp_fixup,
.ops = &skylake_nau8825_ops, .ops = &skylake_nau8825_ops,
......
sound/soc/intel/boards/skl_rt286.c
View file @ 5374b921
...@@ -434,7 +434,7 @@ static struct snd_soc_dai_link skylake_rt286_dais[] = { ...@@ -434,7 +434,7 @@ static struct snd_soc_dai_link skylake_rt286_dais[] = {
.init = skylake_rt286_codec_init, .init = skylake_rt286_codec_init,
.dai_fmt = SND_SOC_DAIFMT_I2S | .dai_fmt = SND_SOC_DAIFMT_I2S |
SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_NB_NF |
SND_SOC_DAIFMT_CBS_CFS, SND_SOC_DAIFMT_CBC_CFC,
.ignore_pmdown_time = 1, .ignore_pmdown_time = 1,
.be_hw_params_fixup = skylake_ssp0_fixup, .be_hw_params_fixup = skylake_ssp0_fixup,
.ops = &skylake_rt286_ops, .ops = &skylake_rt286_ops,
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7