From 0e06ee711116cf8d5daf7f11050ed11a0b47a197 Mon Sep 17 00:00:00 2001 From: Matthew Ranostay Date: Mon, 5 Nov 2007 15:30:13 +0100 Subject: [PATCH] --- yaml --- r: 81471 b: refs/heads/master c: f1f208d0b4fb79f99d2ca5031c61ff5b52e42e75 h: refs/heads/master i: 81469: 92904f4336e268ca2306a3ea8cecfd4e2263f30a 81467: 62cf0109e813de2465694060a09f0a3ae0f67b16 81463: 00115c152616c7b635180418bb395165091c021f 81455: 20ee941ba3792d4f9a417289d2191ec6530918e4 81439: 2a6d9fed50bfe4657c8fb21f76da55d6057ef903 81407: 3b11ce1c0e382e1902edd325b7073115139af94f v: v3 --- [refs] | 2 +- trunk/sound/pci/hda/patch_sigmatel.c | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 9d3128cb608d..a683f216d3c3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d9f9b8baa0fbdba93b0ebb8e5b3ec042a6b4a8fb +refs/heads/master: f1f208d0b4fb79f99d2ca5031c61ff5b52e42e75 diff --git a/trunk/sound/pci/hda/patch_sigmatel.c b/trunk/sound/pci/hda/patch_sigmatel.c index 876e1d493239..4dc09ef899bf 100644 --- a/trunk/sound/pci/hda/patch_sigmatel.c +++ b/trunk/sound/pci/hda/patch_sigmatel.c @@ -2723,14 +2723,21 @@ static int patch_stac927x(struct hda_codec *codec) spec->dmic_nids = stac927x_dmic_nids; spec->num_dmics = STAC927X_NUM_DMICS; spec->dmux_nid = 0x1b; + + /* Enable DMIC0 */ + stac92xx_set_config_reg(codec, 0x13, 0x90a60040); + + /* GPIO2 High = Enable EAPD */ + spec->gpio_mask = spec->gpio_data = 0x00000004; break; default: - spec->num_dmics = 0; + spec->num_dmics = 0; + + /* GPIO0 High = Enable EAPD */ + spec->gpio_mask = spec->gpio_data = 0x00000001; } spec->multiout.dac_nids = spec->dac_nids; - /* GPIO0 High = Enable EAPD */ - spec->gpio_mask = spec->gpio_data = 0x00000001; stac92xx_enable_gpio_mask(codec); err = stac92xx_parse_auto_config(codec, 0x1e, 0x20);