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

3 files changed, 5 insertions, 9 deletions

diff --git a/sound/soc/intel/atom/sst-atom-controls.c b/sound/soc/intel/atom/sst-atom-controls.c
index c7b3cbf92faf..df4430bdafc0 100644
--- a/sound/soc/intel/atom/sst-atom-controls.c
+++ b/sound/soc/intel/atom/sst-atom-controls.c
@@ -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);
         }
diff --git a/sound/soc/intel/boards/bytcr_rt5640.c b/sound/soc/intel/boards/bytcr_rt5640.c
index 8d2fb2d6f532..153c04d9e95a 100644
--- a/sound/soc/intel/boards/bytcr_rt5640.c
+++ b/sound/soc/intel/boards/bytcr_rt5640.c
@@ -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,
 };
diff --git a/sound/soc/intel/boards/bytcr_rt5651.c b/sound/soc/intel/boards/bytcr_rt5651.c
index 2d24dc04b597..3186f015939f 100644
--- a/sound/soc/intel/boards/bytcr_rt5651.c
+++ b/sound/soc/intel/boards/bytcr_rt5651.c
@@ -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,
 };