Merge branch 'topic/asoc' into to-push

1 files changed, 126 insertions, 40 deletions

diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c
index cff276ee261e..b47a749c5ea2 100644
--- a/sound/soc/codecs/tlv320aic3x.c
+++ b/sound/soc/codecs/tlv320aic3x.c
@@ -253,11 +253,17 @@ static const struct snd_kcontrol_new aic3x_snd_controls[] = {
 
         SOC_DOUBLE_R("Line DAC Playback Volume", DACL1_2_LLOPM_VOL,
                      DACR1_2_RLOPM_VOL, 0, 0x7f, 1),
-        SOC_DOUBLE_R("Line DAC Playback Switch", LLOPM_CTRL, RLOPM_CTRL, 3,
-                     0x01, 0),
-        SOC_DOUBLE_R("Line PGA Bypass Playback Volume", PGAL_2_LLOPM_VOL,
-                     PGAR_2_RLOPM_VOL, 0, 0x7f, 1),
-        SOC_DOUBLE_R("Line Line2 Bypass Playback Volume", LINE2L_2_LLOPM_VOL,
+        SOC_SINGLE("LineL Playback Switch", LLOPM_CTRL, 3, 0x01, 0),
+        SOC_SINGLE("LineR Playback Switch", RLOPM_CTRL, 3, 0x01, 0),
+        SOC_DOUBLE_R("LineL DAC Playback Volume", DACL1_2_LLOPM_VOL,
+                     DACR1_2_LLOPM_VOL, 0, 0x7f, 1),
+        SOC_SINGLE("LineL Left PGA Bypass Playback Volume", PGAL_2_LLOPM_VOL,
+                     0, 0x7f, 1),
+        SOC_SINGLE("LineR Right PGA Bypass Playback Volume", PGAR_2_RLOPM_VOL,
+                     0, 0x7f, 1),
+        SOC_DOUBLE_R("LineL Line2 Bypass Playback Volume", LINE2L_2_LLOPM_VOL,
+                     LINE2R_2_LLOPM_VOL, 0, 0x7f, 1),
+        SOC_DOUBLE_R("LineR Line2 Bypass Playback Volume", LINE2L_2_RLOPM_VOL,
                      LINE2R_2_RLOPM_VOL, 0, 0x7f, 1),
 
         SOC_DOUBLE_R("Mono DAC Playback Volume", DACL1_2_MONOLOPM_VOL,
@@ -272,8 +278,12 @@ static const struct snd_kcontrol_new aic3x_snd_controls[] = {
                      DACR1_2_HPROUT_VOL, 0, 0x7f, 1),
         SOC_DOUBLE_R("HP DAC Playback Switch", HPLOUT_CTRL, HPROUT_CTRL, 3,
                      0x01, 0),
-        SOC_DOUBLE_R("HP PGA Bypass Playback Volume", PGAL_2_HPLOUT_VOL,
+        SOC_DOUBLE_R("HP Right PGA Bypass Playback Volume", PGAR_2_HPLOUT_VOL,
                      PGAR_2_HPROUT_VOL, 0, 0x7f, 1),
+        SOC_SINGLE("HPL PGA Bypass Playback Volume", PGAL_2_HPLOUT_VOL,
+                     0, 0x7f, 1),
+        SOC_SINGLE("HPR PGA Bypass Playback Volume", PGAL_2_HPROUT_VOL,
+                     0, 0x7f, 1),
         SOC_DOUBLE_R("HP Line2 Bypass Playback Volume", LINE2L_2_HPLOUT_VOL,
                      LINE2R_2_HPROUT_VOL, 0, 0x7f, 1),
 
@@ -281,8 +291,10 @@ static const struct snd_kcontrol_new aic3x_snd_controls[] = {
                      DACR1_2_HPRCOM_VOL, 0, 0x7f, 1),
         SOC_DOUBLE_R("HPCOM DAC Playback Switch", HPLCOM_CTRL, HPRCOM_CTRL, 3,
                      0x01, 0),
-        SOC_DOUBLE_R("HPCOM PGA Bypass Playback Volume", PGAL_2_HPLCOM_VOL,
-                     PGAR_2_HPRCOM_VOL, 0, 0x7f, 1),
+        SOC_SINGLE("HPLCOM PGA Bypass Playback Volume", PGAL_2_HPLCOM_VOL,
+                     0, 0x7f, 1),
+        SOC_SINGLE("HPRCOM PGA Bypass Playback Volume", PGAL_2_HPRCOM_VOL,
+                     0, 0x7f, 1),
         SOC_DOUBLE_R("HPCOM Line2 Bypass Playback Volume", LINE2L_2_HPLCOM_VOL,
                      LINE2R_2_HPRCOM_VOL, 0, 0x7f, 1),
 
@@ -333,7 +345,8 @@ SOC_DAPM_ENUM("Route", aic3x_enum[RHPCOM_ENUM]);
 
 /* Left DAC_L1 Mixer */
 static const struct snd_kcontrol_new aic3x_left_dac_mixer_controls[] = {
-        SOC_DAPM_SINGLE("Line Switch", DACL1_2_LLOPM_VOL, 7, 1, 0),
+        SOC_DAPM_SINGLE("LineL Switch", DACL1_2_LLOPM_VOL, 7, 1, 0),
+        SOC_DAPM_SINGLE("LineR Switch", DACL1_2_RLOPM_VOL, 7, 1, 0),
         SOC_DAPM_SINGLE("Mono Switch", DACL1_2_MONOLOPM_VOL, 7, 1, 0),
         SOC_DAPM_SINGLE("HP Switch", DACL1_2_HPLOUT_VOL, 7, 1, 0),
         SOC_DAPM_SINGLE("HPCOM Switch", DACL1_2_HPLCOM_VOL, 7, 1, 0),
@@ -341,7 +354,8 @@ static const struct snd_kcontrol_new aic3x_left_dac_mixer_controls[] = {
 
 /* Right DAC_R1 Mixer */
 static const struct snd_kcontrol_new aic3x_right_dac_mixer_controls[] = {
-        SOC_DAPM_SINGLE("Line Switch", DACR1_2_RLOPM_VOL, 7, 1, 0),
+        SOC_DAPM_SINGLE("LineL Switch", DACR1_2_LLOPM_VOL, 7, 1, 0),
+        SOC_DAPM_SINGLE("LineR Switch", DACR1_2_RLOPM_VOL, 7, 1, 0),
         SOC_DAPM_SINGLE("Mono Switch", DACR1_2_MONOLOPM_VOL, 7, 1, 0),
         SOC_DAPM_SINGLE("HP Switch", DACR1_2_HPROUT_VOL, 7, 1, 0),
         SOC_DAPM_SINGLE("HPCOM Switch", DACR1_2_HPRCOM_VOL, 7, 1, 0),
@@ -350,14 +364,18 @@ static const struct snd_kcontrol_new aic3x_right_dac_mixer_controls[] = {
 /* Left PGA Mixer */
 static const struct snd_kcontrol_new aic3x_left_pga_mixer_controls[] = {
         SOC_DAPM_SINGLE_AIC3X("Line1L Switch", LINE1L_2_LADC_CTRL, 3, 1, 1),
+        SOC_DAPM_SINGLE_AIC3X("Line1R Switch", LINE1R_2_LADC_CTRL, 3, 1, 1),
         SOC_DAPM_SINGLE_AIC3X("Line2L Switch", LINE2L_2_LADC_CTRL, 3, 1, 1),
         SOC_DAPM_SINGLE_AIC3X("Mic3L Switch", MIC3LR_2_LADC_CTRL, 4, 1, 1),
+        SOC_DAPM_SINGLE_AIC3X("Mic3R Switch", MIC3LR_2_LADC_CTRL, 0, 1, 1),
 };
 
 /* Right PGA Mixer */
 static const struct snd_kcontrol_new aic3x_right_pga_mixer_controls[] = {
         SOC_DAPM_SINGLE_AIC3X("Line1R Switch", LINE1R_2_RADC_CTRL, 3, 1, 1),
+        SOC_DAPM_SINGLE_AIC3X("Line1L Switch", LINE1L_2_RADC_CTRL, 3, 1, 1),
         SOC_DAPM_SINGLE_AIC3X("Line2R Switch", LINE2R_2_RADC_CTRL, 3, 1, 1),
+        SOC_DAPM_SINGLE_AIC3X("Mic3L Switch", MIC3LR_2_RADC_CTRL, 4, 1, 1),
         SOC_DAPM_SINGLE_AIC3X("Mic3R Switch", MIC3LR_2_RADC_CTRL, 0, 1, 1),
 };
 
@@ -379,34 +397,42 @@ SOC_DAPM_ENUM("Route", aic3x_enum[LINE2R_ENUM]);
 
 /* Left PGA Bypass Mixer */
 static const struct snd_kcontrol_new aic3x_left_pga_bp_mixer_controls[] = {
-        SOC_DAPM_SINGLE("Line Switch", PGAL_2_LLOPM_VOL, 7, 1, 0),
+        SOC_DAPM_SINGLE("LineL Switch", PGAL_2_LLOPM_VOL, 7, 1, 0),
+        SOC_DAPM_SINGLE("LineR Switch", PGAL_2_RLOPM_VOL, 7, 1, 0),
         SOC_DAPM_SINGLE("Mono Switch", PGAL_2_MONOLOPM_VOL, 7, 1, 0),
-        SOC_DAPM_SINGLE("HP Switch", PGAL_2_HPLOUT_VOL, 7, 1, 0),
-        SOC_DAPM_SINGLE("HPCOM Switch", PGAL_2_HPLCOM_VOL, 7, 1, 0),
+        SOC_DAPM_SINGLE("HPL Switch", PGAL_2_HPLOUT_VOL, 7, 1, 0),
+        SOC_DAPM_SINGLE("HPR Switch", PGAL_2_HPROUT_VOL, 7, 1, 0),
+        SOC_DAPM_SINGLE("HPLCOM Switch", PGAL_2_HPLCOM_VOL, 7, 1, 0),
+        SOC_DAPM_SINGLE("HPRCOM Switch", PGAL_2_HPRCOM_VOL, 7, 1, 0),
 };
 
 /* Right PGA Bypass Mixer */
 static const struct snd_kcontrol_new aic3x_right_pga_bp_mixer_controls[] = {
-        SOC_DAPM_SINGLE("Line Switch", PGAR_2_RLOPM_VOL, 7, 1, 0),
+        SOC_DAPM_SINGLE("LineL Switch", PGAR_2_LLOPM_VOL, 7, 1, 0),
+        SOC_DAPM_SINGLE("LineR Switch", PGAR_2_RLOPM_VOL, 7, 1, 0),
         SOC_DAPM_SINGLE("Mono Switch", PGAR_2_MONOLOPM_VOL, 7, 1, 0),
-        SOC_DAPM_SINGLE("HP Switch", PGAR_2_HPROUT_VOL, 7, 1, 0),
-        SOC_DAPM_SINGLE("HPCOM Switch", PGAR_2_HPRCOM_VOL, 7, 1, 0),
+        SOC_DAPM_SINGLE("HPL Switch", PGAR_2_HPLOUT_VOL, 7, 1, 0),
+        SOC_DAPM_SINGLE("HPR Switch", PGAR_2_HPROUT_VOL, 7, 1, 0),
+        SOC_DAPM_SINGLE("HPLCOM Switch", PGAR_2_HPLCOM_VOL, 7, 1, 0),
+        SOC_DAPM_SINGLE("HPRCOM Switch", PGAR_2_HPRCOM_VOL, 7, 1, 0),
 };
 
 /* Left Line2 Bypass Mixer */
 static const struct snd_kcontrol_new aic3x_left_line2_bp_mixer_controls[] = {
-        SOC_DAPM_SINGLE("Line Switch", LINE2L_2_LLOPM_VOL, 7, 1, 0),
+        SOC_DAPM_SINGLE("LineL Switch", LINE2L_2_LLOPM_VOL, 7, 1, 0),
+        SOC_DAPM_SINGLE("LineR Switch", LINE2L_2_RLOPM_VOL, 7, 1, 0),
         SOC_DAPM_SINGLE("Mono Switch", LINE2L_2_MONOLOPM_VOL, 7, 1, 0),
         SOC_DAPM_SINGLE("HP Switch", LINE2L_2_HPLOUT_VOL, 7, 1, 0),
-        SOC_DAPM_SINGLE("HPCOM Switch", LINE2L_2_HPLCOM_VOL, 7, 1, 0),
+        SOC_DAPM_SINGLE("HPLCOM Switch", LINE2L_2_HPLCOM_VOL, 7, 1, 0),
 };
 
 /* Right Line2 Bypass Mixer */
 static const struct snd_kcontrol_new aic3x_right_line2_bp_mixer_controls[] = {
-        SOC_DAPM_SINGLE("Line Switch", LINE2R_2_RLOPM_VOL, 7, 1, 0),
+        SOC_DAPM_SINGLE("LineL Switch", LINE2R_2_LLOPM_VOL, 7, 1, 0),
+        SOC_DAPM_SINGLE("LineR Switch", LINE2R_2_RLOPM_VOL, 7, 1, 0),
         SOC_DAPM_SINGLE("Mono Switch", LINE2R_2_MONOLOPM_VOL, 7, 1, 0),
         SOC_DAPM_SINGLE("HP Switch", LINE2R_2_HPROUT_VOL, 7, 1, 0),
-        SOC_DAPM_SINGLE("HPCOM Switch", LINE2R_2_HPRCOM_VOL, 7, 1, 0),
+        SOC_DAPM_SINGLE("HPRCOM Switch", LINE2R_2_HPRCOM_VOL, 7, 1, 0),
 };
 
 static const struct snd_soc_dapm_widget aic3x_dapm_widgets[] = {
@@ -439,22 +465,26 @@ static const struct snd_soc_dapm_widget aic3x_dapm_widgets[] = {
         /* Mono Output */
         SND_SOC_DAPM_PGA("Mono Out", MONOLOPM_CTRL, 0, 0, NULL, 0),
 
-        /* Left Inputs to Left ADC */
+        /* Inputs to Left ADC */
         SND_SOC_DAPM_ADC("Left ADC", "Left Capture", LINE1L_2_LADC_CTRL, 2, 0),
         SND_SOC_DAPM_MIXER("Left PGA Mixer", SND_SOC_NOPM, 0, 0,
                            &aic3x_left_pga_mixer_controls[0],
                            ARRAY_SIZE(aic3x_left_pga_mixer_controls)),
         SND_SOC_DAPM_MUX("Left Line1L Mux", SND_SOC_NOPM, 0, 0,
                          &aic3x_left_line1_mux_controls),
+        SND_SOC_DAPM_MUX("Left Line1R Mux", SND_SOC_NOPM, 0, 0,
+                         &aic3x_left_line1_mux_controls),
         SND_SOC_DAPM_MUX("Left Line2L Mux", SND_SOC_NOPM, 0, 0,
                          &aic3x_left_line2_mux_controls),
 
-        /* Right Inputs to Right ADC */
+        /* Inputs to Right ADC */
         SND_SOC_DAPM_ADC("Right ADC", "Right Capture",
                          LINE1R_2_RADC_CTRL, 2, 0),
         SND_SOC_DAPM_MIXER("Right PGA Mixer", SND_SOC_NOPM, 0, 0,
                            &aic3x_right_pga_mixer_controls[0],
                            ARRAY_SIZE(aic3x_right_pga_mixer_controls)),
+        SND_SOC_DAPM_MUX("Right Line1L Mux", SND_SOC_NOPM, 0, 0,
+                         &aic3x_right_line1_mux_controls),
         SND_SOC_DAPM_MUX("Right Line1R Mux", SND_SOC_NOPM, 0, 0,
                          &aic3x_right_line1_mux_controls),
         SND_SOC_DAPM_MUX("Right Line2R Mux", SND_SOC_NOPM, 0, 0,
@@ -531,7 +561,8 @@ static const struct snd_soc_dapm_route intercon[] = {
         {"Left DAC Mux", "DAC_L2", "Left DAC"},
         {"Left DAC Mux", "DAC_L3", "Left DAC"},
 
-        {"Left DAC_L1 Mixer", "Line Switch", "Left DAC Mux"},
+        {"Left DAC_L1 Mixer", "LineL Switch", "Left DAC Mux"},
+        {"Left DAC_L1 Mixer", "LineR Switch", "Left DAC Mux"},
         {"Left DAC_L1 Mixer", "Mono Switch", "Left DAC Mux"},
         {"Left DAC_L1 Mixer", "HP Switch", "Left DAC Mux"},
         {"Left DAC_L1 Mixer", "HPCOM Switch", "Left DAC Mux"},
@@ -557,7 +588,8 @@ static const struct snd_soc_dapm_route intercon[] = {
         {"Right DAC Mux", "DAC_R2", "Right DAC"},
         {"Right DAC Mux", "DAC_R3", "Right DAC"},
 
-        {"Right DAC_R1 Mixer", "Line Switch", "Right DAC Mux"},
+        {"Right DAC_R1 Mixer", "LineL Switch", "Right DAC Mux"},
+        {"Right DAC_R1 Mixer", "LineR Switch", "Right DAC Mux"},
         {"Right DAC_R1 Mixer", "Mono Switch", "Right DAC Mux"},
         {"Right DAC_R1 Mixer", "HP Switch", "Right DAC Mux"},
         {"Right DAC_R1 Mixer", "HPCOM Switch", "Right DAC Mux"},
@@ -592,8 +624,10 @@ static const struct snd_soc_dapm_route intercon[] = {
         {"Left Line2L Mux", "differential", "LINE2L"},
 
         {"Left PGA Mixer", "Line1L Switch", "Left Line1L Mux"},
+        {"Left PGA Mixer", "Line1R Switch", "Left Line1R Mux"},
         {"Left PGA Mixer", "Line2L Switch", "Left Line2L Mux"},
         {"Left PGA Mixer", "Mic3L Switch", "MIC3L"},
+        {"Left PGA Mixer", "Mic3R Switch", "MIC3R"},
 
         {"Left ADC", NULL, "Left PGA Mixer"},
         {"Left ADC", NULL, "GPIO1 dmic modclk"},
@@ -605,18 +639,23 @@ static const struct snd_soc_dapm_route intercon[] = {
         {"Right Line2R Mux", "single-ended", "LINE2R"},
         {"Right Line2R Mux", "differential", "LINE2R"},
 
+        {"Right PGA Mixer", "Line1L Switch", "Right Line1L Mux"},
         {"Right PGA Mixer", "Line1R Switch", "Right Line1R Mux"},
         {"Right PGA Mixer", "Line2R Switch", "Right Line2R Mux"},
+        {"Right PGA Mixer", "Mic3L Switch", "MIC3L"},
         {"Right PGA Mixer", "Mic3R Switch", "MIC3R"},
 
         {"Right ADC", NULL, "Right PGA Mixer"},
         {"Right ADC", NULL, "GPIO1 dmic modclk"},
 
         /* Left PGA Bypass */
-        {"Left PGA Bypass Mixer", "Line Switch", "Left PGA Mixer"},
+        {"Left PGA Bypass Mixer", "LineL Switch", "Left PGA Mixer"},
+        {"Left PGA Bypass Mixer", "LineR Switch", "Left PGA Mixer"},
         {"Left PGA Bypass Mixer", "Mono Switch", "Left PGA Mixer"},
-        {"Left PGA Bypass Mixer", "HP Switch", "Left PGA Mixer"},
-        {"Left PGA Bypass Mixer", "HPCOM Switch", "Left PGA Mixer"},
+        {"Left PGA Bypass Mixer", "HPL Switch", "Left PGA Mixer"},
+        {"Left PGA Bypass Mixer", "HPR Switch", "Left PGA Mixer"},
+        {"Left PGA Bypass Mixer", "HPLCOM Switch", "Left PGA Mixer"},
+        {"Left PGA Bypass Mixer", "HPRCOM Switch", "Left PGA Mixer"},
 
         {"Left HPCOM Mux", "differential of HPLOUT", "Left PGA Bypass Mixer"},
         {"Left HPCOM Mux", "constant VCM", "Left PGA Bypass Mixer"},
@@ -627,10 +666,13 @@ static const struct snd_soc_dapm_route intercon[] = {
         {"Left HP Out", NULL, "Left PGA Bypass Mixer"},
 
         /* Right PGA Bypass */
-        {"Right PGA Bypass Mixer", "Line Switch", "Right PGA Mixer"},
+        {"Right PGA Bypass Mixer", "LineL Switch", "Right PGA Mixer"},
+        {"Right PGA Bypass Mixer", "LineR Switch", "Right PGA Mixer"},
         {"Right PGA Bypass Mixer", "Mono Switch", "Right PGA Mixer"},
-        {"Right PGA Bypass Mixer", "HP Switch", "Right PGA Mixer"},
-        {"Right PGA Bypass Mixer", "HPCOM Switch", "Right PGA Mixer"},
+        {"Right PGA Bypass Mixer", "HPL Switch", "Right PGA Mixer"},
+        {"Right PGA Bypass Mixer", "HPR Switch", "Right PGA Mixer"},
+        {"Right PGA Bypass Mixer", "HPLCOM Switch", "Right PGA Mixer"},
+        {"Right PGA Bypass Mixer", "HPRCOM Switch", "Right PGA Mixer"},
 
         {"Right HPCOM Mux", "differential of HPROUT", "Right PGA Bypass Mixer"},
         {"Right HPCOM Mux", "constant VCM", "Right PGA Bypass Mixer"},
@@ -643,10 +685,11 @@ static const struct snd_soc_dapm_route intercon[] = {
         {"Right HP Out", NULL, "Right PGA Bypass Mixer"},
 
         /* Left Line2 Bypass */
-        {"Left Line2 Bypass Mixer", "Line Switch", "Left Line2L Mux"},
+        {"Left Line2 Bypass Mixer", "LineL Switch", "Left Line2L Mux"},
+        {"Left Line2 Bypass Mixer", "LineR Switch", "Left Line2L Mux"},
         {"Left Line2 Bypass Mixer", "Mono Switch", "Left Line2L Mux"},
         {"Left Line2 Bypass Mixer", "HP Switch", "Left Line2L Mux"},
-        {"Left Line2 Bypass Mixer", "HPCOM Switch", "Left Line2L Mux"},
+        {"Left Line2 Bypass Mixer", "HPLCOM Switch", "Left Line2L Mux"},
 
         {"Left HPCOM Mux", "differential of HPLOUT", "Left Line2 Bypass Mixer"},
         {"Left HPCOM Mux", "constant VCM", "Left Line2 Bypass Mixer"},
@@ -657,10 +700,11 @@ static const struct snd_soc_dapm_route intercon[] = {
         {"Left HP Out", NULL, "Left Line2 Bypass Mixer"},
 
         /* Right Line2 Bypass */
-        {"Right Line2 Bypass Mixer", "Line Switch", "Right Line2R Mux"},
+        {"Right Line2 Bypass Mixer", "LineL Switch", "Right Line2R Mux"},
+        {"Right Line2 Bypass Mixer", "LineR Switch", "Right Line2R Mux"},
         {"Right Line2 Bypass Mixer", "Mono Switch", "Right Line2R Mux"},
         {"Right Line2 Bypass Mixer", "HP Switch", "Right Line2R Mux"},
-        {"Right Line2 Bypass Mixer", "HPCOM Switch", "Right Line2R Mux"},
+        {"Right Line2 Bypass Mixer", "HPRCOM Switch", "Right Line2R Mux"},
 
         {"Right HPCOM Mux", "differential of HPROUT", "Right Line2 Bypass Mixer"},
         {"Right HPCOM Mux", "constant VCM", "Right Line2 Bypass Mixer"},
@@ -694,7 +738,8 @@ static int aic3x_add_widgets(struct snd_soc_codec *codec)
 }
 
 static int aic3x_hw_params(struct snd_pcm_substream *substream,
-                           struct snd_pcm_hw_params *params)
+                           struct snd_pcm_hw_params *params,
+                           struct snd_soc_dai *dai)
 {
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
         struct snd_soc_device *socdev = rtd->socdev;
@@ -846,6 +891,7 @@ static int aic3x_set_dai_fmt(struct snd_soc_dai *codec_dai,
         struct snd_soc_codec *codec = codec_dai->codec;
         struct aic3x_priv *aic3x = codec->private_data;
         u8 iface_areg, iface_breg;
+        int delay = 0;
 
         iface_areg = aic3x_read_reg_cache(codec, AIC3X_ASD_INTF_CTRLA) & 0x3f;
         iface_breg = aic3x_read_reg_cache(codec, AIC3X_ASD_INTF_CTRLB) & 0x3f;
@@ -871,6 +917,8 @@ static int aic3x_set_dai_fmt(struct snd_soc_dai *codec_dai,
                        SND_SOC_DAIFMT_INV_MASK)) {
         case (SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF):
                 break;
+        case (SND_SOC_DAIFMT_DSP_A | SND_SOC_DAIFMT_IB_NF):
+                delay = 1;
         case (SND_SOC_DAIFMT_DSP_B | SND_SOC_DAIFMT_IB_NF):
                 iface_breg |= (0x01 << 6);
                 break;
@@ -887,6 +935,7 @@ static int aic3x_set_dai_fmt(struct snd_soc_dai *codec_dai,
         /* set iface */
         aic3x_write(codec, AIC3X_ASD_INTF_CTRLA, iface_areg);
         aic3x_write(codec, AIC3X_ASD_INTF_CTRLB, iface_breg);
+        aic3x_write(codec, AIC3X_ASD_INTF_CTRLC, delay);
 
         return 0;
 }
@@ -981,14 +1030,41 @@ int aic3x_get_gpio(struct snd_soc_codec *codec, int gpio)
 }
 EXPORT_SYMBOL_GPL(aic3x_get_gpio);
 
+void aic3x_set_headset_detection(struct snd_soc_codec *codec, int detect,
+                                 int headset_debounce, int button_debounce)
+{
+        u8 val;
+
+        val = ((detect & AIC3X_HEADSET_DETECT_MASK)
+                << AIC3X_HEADSET_DETECT_SHIFT) |
+              ((headset_debounce & AIC3X_HEADSET_DEBOUNCE_MASK)
+                << AIC3X_HEADSET_DEBOUNCE_SHIFT) |
+              ((button_debounce & AIC3X_BUTTON_DEBOUNCE_MASK)
+                << AIC3X_BUTTON_DEBOUNCE_SHIFT);
+
+        if (detect & AIC3X_HEADSET_DETECT_MASK)
+                val |= AIC3X_HEADSET_DETECT_ENABLED;
+
+        aic3x_write(codec, AIC3X_HEADSET_DETECT_CTRL_A, val);
+}
+EXPORT_SYMBOL_GPL(aic3x_set_headset_detection);
+
 int aic3x_headset_detected(struct snd_soc_codec *codec)
 {
         u8 val;
-        aic3x_read(codec, AIC3X_RT_IRQ_FLAGS_REG, &val);
-        return (val >> 2) & 1;
+        aic3x_read(codec, AIC3X_HEADSET_DETECT_CTRL_B, &val);
+        return (val >> 4) & 1;
 }
 EXPORT_SYMBOL_GPL(aic3x_headset_detected);
 
+int aic3x_button_pressed(struct snd_soc_codec *codec)
+{
+        u8 val;
+        aic3x_read(codec, AIC3X_HEADSET_DETECT_CTRL_B, &val);
+        return (val >> 5) & 1;
+}
+EXPORT_SYMBOL_GPL(aic3x_button_pressed);
+
 #define AIC3X_RATES     SNDRV_PCM_RATE_8000_96000
 #define AIC3X_FORMATS   (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE | \
                          SNDRV_PCM_FMTBIT_S24_3LE | SNDRV_PCM_FMTBIT_S32_LE)
@@ -1009,8 +1085,6 @@ struct snd_soc_dai aic3x_dai = {
                 .formats = AIC3X_FORMATS,},
         .ops = {
                 .hw_params = aic3x_hw_params,
-        },
-        .dai_ops = {
                 .digital_mute = aic3x_mute,
                 .set_sysclk = aic3x_set_dai_sysclk,
                 .set_fmt = aic3x_set_dai_fmt,
@@ -1152,7 +1226,7 @@ static int aic3x_init(struct snd_soc_device *socdev)
 
         aic3x_add_controls(codec);
         aic3x_add_widgets(codec);
-        ret = snd_soc_register_card(socdev);
+        ret = snd_soc_init_card(socdev);
         if (ret < 0) {
                 printk(KERN_ERR "aic3x: failed to register card\n");
                 goto card_err;
@@ -1341,6 +1415,18 @@ struct snd_soc_codec_device soc_codec_dev_aic3x = {
 };
 EXPORT_SYMBOL_GPL(soc_codec_dev_aic3x);
 
+static int __init aic3x_modinit(void)
+{
+        return snd_soc_register_dai(&aic3x_dai);
+}
+module_init(aic3x_modinit);
+
+static void __exit aic3x_exit(void)
+{
+        snd_soc_unregister_dai(&aic3x_dai);
+}
+module_exit(aic3x_exit);
+
 MODULE_DESCRIPTION("ASoC TLV320AIC3X codec driver");
 MODULE_AUTHOR("Vladimir Barinov");
 MODULE_LICENSE("GPL");