Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5bf3db18 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus

parents 19532a24 f12f5c84

sound/soc/intel/atom/sst-atom-controls.c

+2 −4
Original line number Diff line number Diff line
@@ -801,13 +801,11 @@ static int sst_get_frame_sync_polarity(struct snd_soc_dai *dai, 


	switch (format) {

	case SND_SOC_DAIFMT_NB_NF:

		return SSP_FS_ACTIVE_LOW;

	case SND_SOC_DAIFMT_NB_IF:

	case SND_SOC_DAIFMT_IB_NF:

		return SSP_FS_ACTIVE_HIGH;

	case SND_SOC_DAIFMT_NB_IF:

	case SND_SOC_DAIFMT_IB_IF:

		return SSP_FS_ACTIVE_LOW;

	case SND_SOC_DAIFMT_IB_NF:

		return SSP_FS_ACTIVE_HIGH;

	default:

		dev_err(dai->dev, "Invalid frame sync polarity %d\n", format);

	}

sound/soc/intel/boards/bytcr_rt5640.c

+2 −3
Original line number Diff line number Diff line
@@ -546,7 +546,7 @@ static int byt_rt5640_codec_fixup(struct snd_soc_pcm_runtime *rtd, 
		 */

		ret = snd_soc_dai_set_fmt(rtd->cpu_dai,

					SND_SOC_DAIFMT_I2S     |

					SND_SOC_DAIFMT_NB_IF   |

					SND_SOC_DAIFMT_NB_NF   |

					SND_SOC_DAIFMT_CBS_CFS

			);

		if (ret < 0) {
@@ -572,7 +572,7 @@ static int byt_rt5640_codec_fixup(struct snd_soc_pcm_runtime *rtd, 
		 */

		ret = snd_soc_dai_set_fmt(rtd->cpu_dai,

					SND_SOC_DAIFMT_I2S     |

					SND_SOC_DAIFMT_NB_IF   |

					SND_SOC_DAIFMT_NB_NF   |

					SND_SOC_DAIFMT_CBS_CFS

			);

		if (ret < 0) {
@@ -856,7 +856,6 @@ static int snd_byt_rt5640_mc_probe(struct platform_device *pdev) 
static struct platform_driver snd_byt_rt5640_mc_driver = {

	.driver = {

		.name = "bytcr_rt5640",

		.pm = &snd_soc_pm_ops,

	},

	.probe = snd_byt_rt5640_mc_probe,

};

sound/soc/intel/boards/bytcr_rt5651.c

+1 −2
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ static int byt_rt5651_codec_fixup(struct snd_soc_pcm_runtime *rtd, 
	 */

	ret = snd_soc_dai_set_fmt(rtd->cpu_dai,

				  SND_SOC_DAIFMT_I2S     |

				  SND_SOC_DAIFMT_NB_IF   |

				  SND_SOC_DAIFMT_NB_NF   |

				  SND_SOC_DAIFMT_CBS_CFS

				  );
@@ -319,7 +319,6 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev) 
static struct platform_driver snd_byt_rt5651_mc_driver = {

	.driver = {

		.name = "bytcr_rt5651",

		.pm = &snd_soc_pm_ops,

	},

	.probe = snd_byt_rt5651_mc_probe,

};