ASoC Support For Moorestown

407 lines not on this page · raw message

83 lines not on this page · raw message

index 139db15..afa5eab 100644
@@ -68,16 +68,21 @@ struct snd_soc_dai_driver sst_platform_dai[] = {
 	.name = "Headset-cpu-dai",
 	.id = 0,
 	.playback = {
-		.channels_min = SST_STEREO,
+		.channels_min = SST_MONO,
 		.channels_max = SST_STEREO,
-		.rates = SNDRV_PCM_RATE_48000,
-		.formats = SNDRV_PCM_FMTBIT_S24_LE,
+		.rates = (SNDRV_PCM_RATE_48000 |
+			  SNDRV_PCM_RATE_44100 |
+			  SNDRV_PCM_RATE_8000),
+		.formats = (SNDRV_PCM_FMTBIT_S16 | SNDRV_PCM_FMTBIT_U16 |
+			    SNDRV_PCM_FMTBIT_S24 | SNDRV_PCM_FMTBIT_U24 |
+			    SNDRV_PCM_FMTBIT_S32 | SNDRV_PCM_FMTBIT_U32),
 	},
 	.capture = {
 		.channels_min = 1,
 		.channels_max = 5,
 		.rates = SNDRV_PCM_RATE_48000,
-		.formats = SNDRV_PCM_FMTBIT_S24_LE,
+		.formats = (SNDRV_PCM_FMTBIT_S16 | SNDRV_PCM_FMTBIT_U16 |
+			    SNDRV_PCM_FMTBIT_S24_LE),
 	},
 },
 {

194 lines not on this page · raw message

index 7be10ae..5b8d047 100644
@@ -303,6 +303,13 @@ static struct snd_soc_dai_driver upd9976_dais[] = {
 			    SNDRV_PCM_FMTBIT_S24 | SNDRV_PCM_FMTBIT_U24 |
 			    SNDRV_PCM_FMTBIT_S32 | SNDRV_PCM_FMTBIT_U32),
 	},
+	.capture = {
+		.stream_name = "Audio Capture",
+		.channels_min = 1,
+		.channels_max = 1,
+		.rates = SNDRV_PCM_RATE_48000,
+		.formats = (SNDRV_PCM_FMTBIT_S16 | SNDRV_PCM_FMTBIT_U16),
+	},
 	.ops = &upd9976_audio_dai_ops,
 },
 };

index 5b8d047..a668b47 100644
@@ -71,6 +71,12 @@ static DECLARE_TLV_DB_SCALE(mixer_tlv, -2500, 100, 0);
  * Audio DAC Volume: From -84 dB to 10.5 dB in 0.75 steps.
  */
 static DECLARE_TLV_DB_SCALE(adac_tlv, -8400, 75, 0);
+
+/*
+ * DMIC Volume: from -63 dB to 1 dB in 1 db steps.
+ */
+static DECLARE_TLV_DB_SCALE(dmic_tlv, -6300, 100, 1);
+
 static const struct snd_kcontrol_new upd9976_snd_controls[] = {
 	SOC_DOUBLE_R_TLV("Master Volume",
 			 UPD9976_AUDIOLVOL, UPD9976_AUDIORVOL,

@@ -78,6 +84,9 @@ static const struct snd_kcontrol_new upd9976_snd_controls[] = {
 	SOC_DOUBLE_R_TLV("PCM Volume",
 			 UPD9976_HPSPRLVOL, UPD9976_HPSPRRVOL,
 			 0, 0x1f, 1, mixer_tlv),
+	SOC_SINGLE("Internal Mic Switch", UPD9976_DMICCTRL1, 6, 1, 0),
+	SOC_SINGLE_TLV("Internal Mic Capture Volume",
+		       UPD9976_DMICCTRL1, 0, 0x3f, 1, dmic_tlv),
 };
 
 static const struct snd_kcontrol_new upd9976_hp_spkr_mixer_left_controls[] = {

@@ -90,6 +99,29 @@ static const struct snd_kcontrol_new upd9976_hp_spkr_mixer_right_controls[] = {
 	SOC_DAPM_SINGLE("Audio DAC Right Switch", UPD9976_HPRMIXSEL, 3, 1, 1),
 };
 
+/* PCM2 Left Mux */
+static const char *upd9976_pcm2_left_mux_texts[] = {"AADC Left", "DMIC"};
+static const struct soc_enum upd9976_pcm2_left_mux_enum =
+	SOC_ENUM_SINGLE(UPD9976_ADCSAMPLERATE, 5, 2,
+			upd9976_pcm2_left_mux_texts);
+static const struct snd_kcontrol_new upd9976_pcm2_left_mux_control =
+	SOC_DAPM_ENUM("PCM2 Left Mux", upd9976_pcm2_left_mux_enum);
+
+/* PCM2 Right Mux */
+static const char *upd9976_pcm2_right_mux_texts[] = {"AADC Right", "DMIC"};
+static const struct soc_enum upd9976_pcm2_right_mux_enum =
+	SOC_ENUM_SINGLE(UPD9976_ADCSAMPLERATE, 4, 2,
+			upd9976_pcm2_right_mux_texts);
+static const struct snd_kcontrol_new upd9976_pcm2_right_mux_control =
+	SOC_DAPM_ENUM("PCM2 Right Mux", upd9976_pcm2_right_mux_enum);
+
+/* PCM2 Mux */
+static const char *upd9976_pcm2_mux_texts[] = {"No Mix", "Mix"};
+static const struct soc_enum upd9976_pcm2_mux_enum =
+	SOC_ENUM_SINGLE(UPD9976_ADCSAMPLERATE, 3, 2, upd9976_pcm2_mux_texts);
+static const struct snd_kcontrol_new upd9976_pcm2_mux_control =
+	SOC_DAPM_ENUM("PCM2 Mux", upd9976_pcm2_mux_enum);
+
 static const struct snd_soc_dapm_widget upd9976_dapm_widgets[] = {
 	/* Input */
 	SND_SOC_DAPM_INPUT("LINEINL"),

@@ -130,12 +162,34 @@ static const struct snd_soc_dapm_widget upd9976_dapm_widgets[] = {
 	SND_SOC_DAPM_MICBIAS("MIC1 Bias", UPD9976_MICCTRL, 6, 0),
 	SND_SOC_DAPM_MICBIAS("MIC2 Bias", UPD9976_MICCTRL, 4, 0),
 
+	SND_SOC_DAPM_MIXER("PCM2 In Mixer", SND_SOC_NOPM, 0, 0, NULL, 0),
+	SND_SOC_DAPM_MIXER("PCM2 In No Mixer", SND_SOC_NOPM, 0, 0, NULL, 0),
+
+	/* Mux */
+	SND_SOC_DAPM_MUX("PCM2 Left Mux", SND_SOC_NOPM, 0, 0,
+			 &upd9976_pcm2_left_mux_control),
+	SND_SOC_DAPM_MUX("PCM2 Right Mux", SND_SOC_NOPM, 0, 0,
+			 &upd9976_pcm2_right_mux_control),
+	SND_SOC_DAPM_MUX("PCM2 Mux", SND_SOC_NOPM, 0, 0,
+			 &upd9976_pcm2_mux_control),
+
 	/* PGA */
 	SND_SOC_DAPM_PGA("HP Playback Left PGA", UPD9976_DRVPOWERCTRL,
 			 2, 0, NULL, 0),
 	SND_SOC_DAPM_PGA("HP Playback Right PGA", UPD9976_DRVPOWERCTRL,
 			 1, 0, NULL, 0),
 
+	SND_SOC_DAPM_PGA("AADC Left PGA", SND_SOC_NOPM, 0, 0, NULL, 0),
+	SND_SOC_DAPM_PGA("AADC Right PGA", SND_SOC_NOPM, 0, 0, NULL, 0),
+
+	SND_SOC_DAPM_PGA("DMIC Gain PGA", UPD9976_DMICCTRL1, 7, 0, NULL, 0),
+
+	/* Audio Interface */
+	SND_SOC_DAPM_AIF_OUT("PCM2 Out", "Audio Capture", 0, SND_SOC_NOPM, 0,
+			     0),
+
+	/* Supply */
+	SND_SOC_DAPM_SUPPLY("DMIC Supply", UPD9976_POWERCTRL2, 1, 0, NULL, 0),
 };
 
 static const struct snd_soc_dapm_route upd9976_dapm_routes[] = {

@@ -154,6 +208,28 @@ static const struct snd_soc_dapm_route upd9976_dapm_routes[] = {
 	{"HPOUTL", NULL, "HP Playback Left PGA"},
 	{"HPOUTR", NULL, "HP Playback Right PGA"},
 
+	{"DMICDAT", NULL, "DMIC Supply"},
+	{"DMIC Gain PGA", NULL, "DMICDAT"},
+
+	{"AADC Left PGA", NULL, "AADC"},
+	{"AADC Right PGA", NULL, "AADC"},
+
+	{"PCM2 Left Mux", "DMIC", "DMIC Gain PGA"},
+	{"PCM2 Left Mux", "AADC Left", "AADC Left PGA"},
+
+	{"PCM2 Right Mux", "DMIC", "DMIC Gain PGA"},
+	{"PCM2 Right Mux", "AADC Right", "AADC Right PGA"},
+
+	{"PCM2 In Mixer", NULL, "PCM2 Left Mux"},
+	{"PCM2 In No Mixer", NULL, "PCM2 Left Mux"},
+
+	{"PCM2 In Mixer", NULL, "PCM2 Right Mux"},
+	{"PCM2 In No Mixer", NULL, "PCM2 Right Mux"},
+
+	{"PCM2 Mux", "Mix", "PCM2 In Mixer"},
+	{"PCM2 Mux", "No Mix", "PCM2 In No Mixer"},
+
+	{"PCM2 Out", NULL, "PCM2 Mux"},
 };
 
 static int upd9976_audio_digital_mute(struct snd_soc_dai *dai, int mute)

index a668b47..cbcfbb2 100644
@@ -77,6 +77,11 @@ static DECLARE_TLV_DB_SCALE(adac_tlv, -8400, 75, 0);
  */
 static DECLARE_TLV_DB_SCALE(dmic_tlv, -6300, 100, 1);
 
+/*
+ * Analog Volume: from -25 dB to 6 dB in 1 dB steps.
+ */
+static DECLARE_TLV_DB_SCALE(analog_tlv, -2500, 100, 0);
+
 static const struct snd_kcontrol_new upd9976_snd_controls[] = {
 	SOC_DOUBLE_R_TLV("Master Volume",
 			 UPD9976_AUDIOLVOL, UPD9976_AUDIORVOL,

@@ -87,6 +92,11 @@ static const struct snd_kcontrol_new upd9976_snd_controls[] = {
 	SOC_SINGLE("Internal Mic Switch", UPD9976_DMICCTRL1, 6, 1, 0),
 	SOC_SINGLE_TLV("Internal Mic Capture Volume",
 		       UPD9976_DMICCTRL1, 0, 0x3f, 1, dmic_tlv),
+	SOC_DOUBLE_R("Analog Mic Switch", UPD9976_LILSEL, UPD9976_LIRSEL,
+		     6, 1, 0),
+	SOC_DOUBLE_R_TLV("Analog Capture Volume",
+			 UPD9976_LILSEL, UPD9976_LILSEL,
+			 0, 0x1f, 1, analog_tlv),
 };
 
 static const struct snd_kcontrol_new upd9976_hp_spkr_mixer_left_controls[] = {

@@ -99,6 +109,13 @@ static const struct snd_kcontrol_new upd9976_hp_spkr_mixer_right_controls[] = {
 	SOC_DAPM_SINGLE("Audio DAC Right Switch", UPD9976_HPRMIXSEL, 3, 1, 1),
 };
 
+/* Analog Right Mux */
+static const char *upd9976_analog_mux_texts[] = {"MIC", "LineIn"};
+static const struct soc_enum upd9976_ar_mux_enum =
+	SOC_ENUM_SINGLE(UPD9976_LIRSEL, 7, 2, upd9976_analog_mux_texts);
+static const struct snd_kcontrol_new upd9976_ar_mux_control =
+	SOC_DAPM_ENUM("Route", upd9976_ar_mux_enum);
+
 /* PCM2 Left Mux */
 static const char *upd9976_pcm2_left_mux_texts[] = {"AADC Left", "DMIC"};
 static const struct soc_enum upd9976_pcm2_left_mux_enum =

@@ -166,6 +183,9 @@ static const struct snd_soc_dapm_widget upd9976_dapm_widgets[] = {
 	SND_SOC_DAPM_MIXER("PCM2 In No Mixer", SND_SOC_NOPM, 0, 0, NULL, 0),
 
 	/* Mux */
+	SND_SOC_DAPM_MUX("Analog Right Mux", UPD9976_POWERCTRL1, 4, 0,
+			 &upd9976_ar_mux_control),
+
 	SND_SOC_DAPM_MUX("PCM2 Left Mux", SND_SOC_NOPM, 0, 0,
 			 &upd9976_pcm2_left_mux_control),
 	SND_SOC_DAPM_MUX("PCM2 Right Mux", SND_SOC_NOPM, 0, 0,

@@ -184,6 +204,8 @@ static const struct snd_soc_dapm_widget upd9976_dapm_widgets[] = {
 
 	SND_SOC_DAPM_PGA("DMIC Gain PGA", UPD9976_DMICCTRL1, 7, 0, NULL, 0),
 
+	SND_SOC_DAPM_PGA("MIC2 In PGA", UPD9976_POWERCTRL1, 2, 0, NULL, 0),
+
 	/* Audio Interface */
 	SND_SOC_DAPM_AIF_OUT("PCM2 Out", "Audio Capture", 0, SND_SOC_NOPM, 0,
 			     0),

@@ -208,6 +230,13 @@ static const struct snd_soc_dapm_route upd9976_dapm_routes[] = {
 	{"HPOUTL", NULL, "HP Playback Left PGA"},
 	{"HPOUTR", NULL, "HP Playback Right PGA"},
 
+	{"MIC2 In PGA", NULL, "MIC2"},
+
+	{"Analog Right Mux", "MIC", "MIC2 In PGA"},
+	{"Analog Right Mux", "LineIn", "LINEINR"},
+
+	{"AADC", NULL, "Analog Right Mux"},
+
 	{"DMICDAT", NULL, "DMIC Supply"},
 	{"DMIC Gain PGA", NULL, "DMICDAT"},
 

index 4a790c5..c1b08f9 100644
@@ -27,6 +27,8 @@
  */
 #include <linux/platform_device.h>
 #include <linux/slab.h>
+#include <linux/io.h>
+#include <linux/list.h>
 #include <asm/intel_scu_ipc.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>

@@ -37,6 +39,97 @@
 #include <sound/jack.h>
 #include "upd9976.h"
 
+struct upd9976_priv {
+	int irq;
+	struct resource *irq_mem;
+	void __iomem *int_base;
+	struct snd_soc_jack *jack;
+	int jack_init;
+	struct list_head pending_status;
+	spinlock_t lock;
+};
+
+struct upd9976_jack_node {
+	struct list_head list;
+	u8 interrupt_status;
+};
+
+static irqreturn_t upd9976_jack_intr_handler(int irq, void *dev)
+{
+	struct upd9976_priv *upd9976 = dev;
+	u8 interrupt_status;
+	struct upd9976_jack_node *node;
+	unsigned long flags;
+
+	memcpy_fromio(&interrupt_status,
+		      upd9976->int_base,
+		      sizeof(u8));
+
+	/* check if it's valid */
+	if (!(interrupt_status & 0xf))
+		return IRQ_NONE;
+
+	node = kzalloc(sizeof(*node), GFP_ATOMIC);
+	if (!node)
+		return IRQ_NONE;
+
+	INIT_LIST_HEAD(&node->list);
+	node->interrupt_status = interrupt_status;
+
+	spin_lock_irqsave(&upd9976->lock, flags);
+	list_add_tail(&node->list, &upd9976->pending_status);
+	spin_unlock_irqrestore(&upd9976->lock, flags);
+
+	return IRQ_WAKE_THREAD;
+}
+
+static irqreturn_t upd9976_jack_thread_handler(int irq, void *data)
+{
+	struct upd9976_priv *upd9976 = data;
+	struct snd_soc_jack *jack = upd9976->jack;
+	struct snd_soc_codec *codec = jack->codec;
+	struct upd9976_jack_node *node;
+	u8 interrupt_status;
+	unsigned long flags;
+	int status = 0;
+	unsigned int value = 0;
+	int mask = SND_JACK_BTN_0 | SND_JACK_BTN_1 | SND_JACK_HEADSET;
+
+	spin_lock_irqsave(&upd9976->lock, flags);
+	if (list_empty(&upd9976->pending_status)) {
+		spin_unlock_irqrestore(&upd9976->lock, flags);
+		return IRQ_HANDLED;
+	}
+	node = list_first_entry(&upd9976->pending_status,
+				struct upd9976_jack_node,
+				list);
+	interrupt_status = node->interrupt_status;
+	list_del(&node->list);
+	kfree(node);
+	spin_unlock_irqrestore(&upd9976->lock, flags);
+
+	if (interrupt_status & 0x3)
+		value = snd_soc_read(codec, UPD9976_SAUXINT);
+
+	if (interrupt_status & 0x1 && value == 0x1)
+		status |= SND_JACK_HEADSET;
+
+	if (interrupt_status & 0x2 && value == 0x2)
+		status |= SND_JACK_HEADPHONE;
+
+	if (interrupt_status & 0x4)
+		status |= SND_JACK_HEADSET | SND_JACK_BTN_0;
+
+	if (interrupt_status & 0x8)
+		status |= SND_JACK_HEADSET | SND_JACK_BTN_1;
+
+	snd_soc_jack_report(jack, status, mask);
+	if (status & (SND_JACK_BTN_0 | SND_JACK_BTN_1))
+		snd_soc_jack_report(jack, SND_JACK_HEADSET, mask);
+
+	return IRQ_HANDLED;
+}
+
 static inline unsigned int upd9976_read(struct snd_soc_codec *codec,
 					unsigned int reg)
 {

@@ -62,6 +155,24 @@ static inline int upd9976_write(struct snd_soc_codec *codec,
 	return ret;
 }
 
+int upd9976_jack_detect(struct snd_soc_codec *codec,
+			struct snd_soc_jack *jack,
+			unsigned int debounce)
+{
+	struct upd9976_priv *upd9976 = snd_soc_codec_get_drvdata(codec);
+
+	if (!upd9976->jack_init)
+		return -ENODEV;
+
+	upd9976->jack = jack;
+
+	/* set debounce time */
+	snd_soc_write(codec, UPD9976_AUXDBNC, debounce);
+
+	return 0;
+}
+EXPORT_SYMBOL_GPL(upd9976_jack_detect);
+
 /*
  * Mixing Volume: from -25 dB to 6 dB in 1 dB steps.
  */

@@ -452,13 +563,50 @@ static int upd9976_set_bias_level(struct snd_soc_codec *codec,
 
 static int upd9976_codec_probe(struct snd_soc_codec *codec)
 {
+	struct upd9976_priv *upd9976 = snd_soc_codec_get_drvdata(codec);
+
 	upd9976_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
 
+	/* disable jack detection first, will be enabled later */
+	snd_soc_update_bits(codec, UPD9976_MICCTRL, BIT(4), 0);
+
+	spin_lock_init(&upd9976->lock);
+	INIT_LIST_HEAD(&upd9976->pending_status);
+
+	upd9976->jack_init = 0;
+
+	if (upd9976->irq < 0 || !upd9976->irq_mem)
+		return 0;
+
+	upd9976->int_base = ioremap_nocache(upd9976->irq_mem->start,
+					    resource_size(upd9976->irq_mem));
+	if (!upd9976->int_base)
+		return 0;
+
+	if (request_threaded_irq(upd9976->irq,
+				 upd9976_jack_intr_handler,
+				 upd9976_jack_thread_handler,
+				 IRQF_SHARED,
+				 "jack detection",
+				 upd9976)) {
+		iounmap(upd9976->int_base);
+		return 0;
+	}
+
+	upd9976->jack_init = 1;
+
 	return 0;
 }
 
 static int upd9976_codec_remove(struct snd_soc_codec *codec)
 {
+	struct upd9976_priv *upd9976 = snd_soc_codec_get_drvdata(codec);
+
+	if (upd9976->jack_init) {
+		free_irq(upd9976->irq, upd9976);
+		iounmap(upd9976->int_base);
+	}
+
 	upd9976_set_bias_level(codec, SND_SOC_BIAS_OFF);
 
 	return 0;

@@ -481,13 +629,43 @@ static struct snd_soc_codec_driver upd9976_codec = {
 
 static int __devinit upd9976_device_probe(struct platform_device *pdev)
 {
-	return snd_soc_register_codec(&pdev->dev, &upd9976_codec,
-				      upd9976_dais, ARRAY_SIZE(upd9976_dais));
+	struct upd9976_priv *upd9976;
+	int err;
+
+	upd9976 = kzalloc(sizeof(*upd9976), GFP_KERNEL);
+	if (!upd9976) {
+		err = -ENOMEM;
+		goto fail;
+	}
+
+	upd9976->irq = platform_get_irq(pdev, 0);
+	upd9976->irq_mem = platform_get_resource_byname(pdev,
+							IORESOURCE_MEM,
+							"IRQ_BASE");
+	platform_set_drvdata(pdev, upd9976);
+
+	err = snd_soc_register_codec(&pdev->dev, &upd9976_codec,
+				     upd9976_dais, ARRAY_SIZE(upd9976_dais));
+	if (err)
+		goto fail_register_codec;
+
+	return 0;
+
+fail_register_codec:
+	platform_set_drvdata(pdev, NULL);
+	kfree(upd9976);
+fail:
+	return err;
 }
 
 static int __devexit upd9976_device_remove(struct platform_device *pdev)
 {
+	struct upd9976_priv *upd9976 = platform_get_drvdata(pdev);
+
 	snd_soc_unregister_codec(&pdev->dev);
+	platform_set_drvdata(pdev, NULL);
+	kfree(upd9976);
+
 	return 0;
 }
 

index ab2ea15..b1bb8d0 100644
@@ -80,4 +80,8 @@
 
 #define UPD9976_SAUXINT		0x132
 
+int upd9976_jack_detect(struct snd_soc_codec *codec,
+			struct snd_soc_jack *jack,
+			unsigned int debounce);
+
 #endif

index 10e4d40..131deff 100644
@@ -39,6 +39,9 @@
 static const struct snd_kcontrol_new mrst_snd_controls[] = {
 	SOC_DAPM_PIN_SWITCH("Headphone"),
 	SOC_DAPM_PIN_SWITCH("Speaker"),
+
+	SOC_DAPM_PIN_SWITCH("Headset MIC"),
+	SOC_DAPM_PIN_SWITCH("Internal MIC"),
 };
 
 /*

@@ -59,6 +62,9 @@ static int mrst_speaker_event(struct snd_soc_dapm_widget *widget,
 static const struct snd_soc_dapm_widget mrst_audio_widgets[] = {
 	SND_SOC_DAPM_HP("Headphone", NULL),
 	SND_SOC_DAPM_SPK("Speaker", mrst_speaker_event),
+
+	SND_SOC_DAPM_MIC("Headset MIC", NULL),
+	SND_SOC_DAPM_MIC("Internal MIC", NULL),
 };
 
 static const struct snd_soc_dapm_route mrst_audio_map[] = {

@@ -70,6 +76,9 @@ static const struct snd_soc_dapm_route mrst_audio_map[] = {
 
 	{"Speaker", NULL, "PREOUTL"},
 	{"Speaker", NULL, "PREOUTR"},
+
+	{"MIC2", NULL, "Headset MIC"},
+	{"DMICDAT", NULL, "Internal MIC"},
 };
 
 static int mrst_audio_init(struct snd_soc_pcm_runtime *runtime)

@@ -85,6 +94,9 @@ static int mrst_audio_init(struct snd_soc_pcm_runtime *runtime)
 	snd_soc_dapm_disable_pin(dapm, "Headphone");
 	snd_soc_dapm_enable_pin(dapm, "Speaker");
 
+	snd_soc_dapm_disable_pin(dapm, "Headset MIC");
+	snd_soc_dapm_enable_pin(dapm, "Internal MIC");
+
 	snd_soc_dapm_sync(dapm);
 
 	return 0;

index 131deff..eb52a2b 100644
@@ -35,6 +35,10 @@
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
+#include <sound/jack.h>
+#include <../codecs/upd9976.h>
+
+static struct snd_soc_jack mrst_jack;
 
 static const struct snd_kcontrol_new mrst_snd_controls[] = {
 	SOC_DAPM_PIN_SWITCH("Headphone"),

@@ -85,6 +89,7 @@ static int mrst_audio_init(struct snd_soc_pcm_runtime *runtime)
 {
 	struct snd_soc_codec *codec = runtime->codec;
 	struct snd_soc_dapm_context *dapm = &codec->dapm;
+	int ret;
 
 	snd_soc_dapm_nc_pin(dapm, "LINEINL");
 	snd_soc_dapm_nc_pin(dapm, "LINEINR");

@@ -99,6 +104,17 @@ static int mrst_audio_init(struct snd_soc_pcm_runtime *runtime)
 
 	snd_soc_dapm_sync(dapm);
 
+	ret = snd_soc_jack_new(codec, "Intel(R) MID Audio Jack",
+			       (SND_JACK_HEADSET |
+				SND_JACK_BTN_0 |
+				SND_JACK_BTN_1),
+			       &mrst_jack);
+	if (ret)
+		return ret;
+
+	if (!upd9976_jack_detect(codec, &mrst_jack, 0xff))
+		snd_soc_dapm_force_enable_pin(dapm, "MIC2 Bias");
+
 	return 0;
 }
 

index eb52a2b..806d18c 100644
@@ -91,6 +91,12 @@ static int mrst_audio_init(struct snd_soc_pcm_runtime *runtime)
 	struct snd_soc_dapm_context *dapm = &codec->dapm;
 	int ret;
 
+	/* DMIC configuration: mono output to PCM2 */
+	snd_soc_update_bits(codec, UPD9976_MICCTRL, BIT(1)|BIT(0), 0x1);
+
+	/* Set MIC2 to pseudo-differential */
+	snd_soc_update_bits(codec, UPD9976_MICSELVOL, BIT(4), BIT(4));
+
 	snd_soc_dapm_nc_pin(dapm, "LINEINL");
 	snd_soc_dapm_nc_pin(dapm, "LINEINR");
 	snd_soc_dapm_nc_pin(dapm, "LINEOUTL");