1 files changed, 12 insertions, 9 deletions

diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c
index 566a427c928f..cff276ee261e 100644
--- a/sound/soc/codecs/tlv320aic3x.c
+++ b/sound/soc/codecs/tlv320aic3x.c
@@ -48,7 +48,6 @@
 
 #include "tlv320aic3x.h"
 
-#define AUDIO_NAME "aic3x"
 #define AIC3X_VERSION "0.2"
 
 /* codec private data */
@@ -864,17 +863,21 @@ static int aic3x_set_dai_fmt(struct snd_soc_dai *codec_dai,
                 return -EINVAL;
         }
 
-        /* interface format */
-        switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) {
-        case SND_SOC_DAIFMT_I2S:
+        /*
+         * match both interface format and signal polarities since they
+         * are fixed
+         */
+        switch (fmt & (SND_SOC_DAIFMT_FORMAT_MASK |
+                       SND_SOC_DAIFMT_INV_MASK)) {
+        case (SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF):
                 break;
-        case SND_SOC_DAIFMT_DSP_A:
+        case (SND_SOC_DAIFMT_DSP_B | SND_SOC_DAIFMT_IB_NF):
                 iface_breg |= (0x01 << 6);
                 break;
-        case SND_SOC_DAIFMT_RIGHT_J:
+        case (SND_SOC_DAIFMT_RIGHT_J | SND_SOC_DAIFMT_NB_NF):
                 iface_breg |= (0x02 << 6);
                 break;
-        case SND_SOC_DAIFMT_LEFT_J:
+        case (SND_SOC_DAIFMT_LEFT_J | SND_SOC_DAIFMT_NB_NF):
                 iface_breg |= (0x03 << 6);
                 break;
         default:
@@ -991,7 +994,7 @@ EXPORT_SYMBOL_GPL(aic3x_headset_detected);
                          SNDRV_PCM_FMTBIT_S24_3LE | SNDRV_PCM_FMTBIT_S32_LE)
 
 struct snd_soc_dai aic3x_dai = {
-        .name = "aic3x",
+        .name = "tlv320aic3x",
         .playback = {
                 .stream_name = "Playback",
                 .channels_min = 1,
@@ -1055,7 +1058,7 @@ static int aic3x_init(struct snd_soc_device *socdev)
         struct aic3x_setup_data *setup = socdev->codec_data;
         int reg, ret = 0;
 
-        codec->name = "aic3x";
+        codec->name = "tlv320aic3x";
         codec->owner = THIS_MODULE;
         codec->read = aic3x_read_reg_cache;
         codec->write = aic3x_write;