July 2011 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH V2 00/10]
by Dong Aisheng 15 Jul '11

15 Jul '11

This patch series is to add audio support based on saif for mxs platform. The driver only supports playback currently. For capturing, due to hardware limitation that we have to use two saif instances to implement full duplex (playback & recording), we need to figure out a good design to fit in ASoC as the following work. In addition, we simply just support master mode since saif tx can only work as a master due to hw limitation(rx can work in both master & slave mode). Code is written based on the branch imx-for-3.1 in sascha's tree http://git.pengutronix.de/git/imx/linux-2.6.git Tested on MX28EVK. Main changes since v1: * export saif mclk control interface to machine driver. Machine driver can decide whether it needs to use mclk supplied by saif according to its requirement. * error checking improvement * remove a few unneccesary code Dong Aisheng (10): ASoc: mxs: add mxs-pcm driver ASoc: mxs: add mxs-saif driver ASoc: mxs: add mxs-sgtl5000 machine driver ASoc: mxs: add asoc configuration files ARM: mxs: add saif clock ARM: mxs: add saif device ARM: mxs: add sgtl5000 i2c device ARM: mxs: add mxs-sgtl5000 device ARM: mxs: correct the using of frac div for saif ARM: mxs-dma: include <linux/dmaengine.h> arch/arm/mach-mxs/Kconfig | 1 + arch/arm/mach-mxs/clock-mx28.c | 8 +- arch/arm/mach-mxs/devices-mx28.h | 3 + arch/arm/mach-mxs/devices/Kconfig | 3 + arch/arm/mach-mxs/devices/Makefile | 1 + arch/arm/mach-mxs/devices/platform-mxs-saif.c | 60 ++ arch/arm/mach-mxs/include/mach/devices-common.h | 12 + arch/arm/mach-mxs/include/mach/dma.h | 2 + arch/arm/mach-mxs/mach-mx28evk.c | 39 ++ sound/soc/Kconfig | 1 + sound/soc/Makefile | 1 + sound/soc/mxs/Kconfig | 19 + sound/soc/mxs/Makefile | 10 + sound/soc/mxs/mxs-pcm.c | 367 +++++++++++++ sound/soc/mxs/mxs-pcm.h | 43 ++ sound/soc/mxs/mxs-saif.c | 656 +++++++++++++++++++++++ sound/soc/mxs/mxs-saif.h | 130 +++++ sound/soc/mxs/mxs-sgtl5000.c | 175 ++++++ 18 files changed, 1529 insertions(+), 2 deletions(-) create mode 100644 arch/arm/mach-mxs/devices/platform-mxs-saif.c create mode 100644 sound/soc/mxs/Kconfig create mode 100644 sound/soc/mxs/Makefile create mode 100644 sound/soc/mxs/mxs-pcm.c create mode 100644 sound/soc/mxs/mxs-pcm.h create mode 100644 sound/soc/mxs/mxs-saif.c create mode 100644 sound/soc/mxs/mxs-saif.h create mode 100644 sound/soc/mxs/mxs-sgtl5000.c

7 51

Re: [alsa-devel] [PATCH] ASoC: WM8983: Initial driver
by Mark Brown 15 Jul '11

15 Jul '11

On Fri, Jul 15, 2011 at 01:51:30PM +0100, Dimitris Papastamos wrote: > The WM8983 is a low power, high quality stereo CODEC > designed for portable multimedia applications. Highly flexible > analogue mixing functions enable new application features, > combining hi-fi quality audio with voice communication. I've applied this but there's one issue you should fix up later: > + /* mute all outputs and set PGAs to minimum gain */ > + for (i = WM8983_LOUT1_HP_VOLUME_CTRL; > + i <= WM8983_OUT4_MONO_MIX_CTRL; ++i) > + snd_soc_update_bits(codec, i, 0x40, 0x40); I know you're doing this to minimise artifacts on initial bias raise but we should really be doing this without affecting the default register settings.

2 2

[alsa-devel] [PATCH] ASoC: Fix shift in WM8958 accessory detection default implementation
by Mark Brown 15 Jul '11

15 Jul '11

Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm8994.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index bc62b6e..bfb7e66 100644 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c @@ -2834,7 +2834,7 @@ static void wm8958_default_micdet(u16 status, void *data) report = SND_JACK_MICROPHONE; /* Everything else is buttons; just assign slots */ - if (status & 0x1c0) + if (status & 0x1c) report |= SND_JACK_BTN_0; done: -- 1.7.5.4

1 0

Re: [alsa-devel] [PATCH] sound: codec: tlv320aic3x: remove mono controls
by Mark Brown 15 Jul '11

15 Jul '11

On Fri, Jul 15, 2011 at 12:59:15PM +0200, Jan Weitzel wrote: > Any rework needed? It'd be easier to review the patch if you sent me a copy...

1 0

[alsa-devel] [PATCH] ASoC: Handle spurious wm_hubs DC servo done interrupts
by Mark Brown 15 Jul '11

15 Jul '11

Don't assume the first fire indicates that we're done. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm_hubs.c | 30 ++++++++++++++++-------------- 1 files changed, 16 insertions(+), 14 deletions(-) diff --git a/sound/soc/codecs/wm_hubs.c b/sound/soc/codecs/wm_hubs.c index ced41e8..4de6794 100644 --- a/sound/soc/codecs/wm_hubs.c +++ b/sound/soc/codecs/wm_hubs.c @@ -66,8 +66,8 @@ static void wait_for_dc_servo(struct snd_soc_codec *codec, unsigned int op) struct wm_hubs_data *hubs = snd_soc_codec_get_drvdata(codec); unsigned int reg; int count = 0; + int timeout; unsigned int val; - unsigned long timeout; val = op | WM8993_DCS_ENA_CHAN_0 | WM8993_DCS_ENA_CHAN_1; @@ -76,21 +76,23 @@ static void wait_for_dc_servo(struct snd_soc_codec *codec, unsigned int op) dev_dbg(codec->dev, "Waiting for DC servo...\n"); - if (hubs->dcs_done_irq) { - timeout = wait_for_completion_timeout(&hubs->dcs_done, - msecs_to_jiffies(500)); - if (timeout == 0) - dev_warn(codec->dev, "No DC servo interrupt\n"); + if (hubs->dcs_done_irq) + timeout = 4; + else + timeout = 400; - reg = snd_soc_read(codec, WM8993_DC_SERVO_0); - } else { - do { - count++; + do { + count++; + + if (hubs->dcs_done_irq) + wait_for_completion_timeout(&hubs->dcs_done, + msecs_to_jiffies(250)); + else msleep(1); - reg = snd_soc_read(codec, WM8993_DC_SERVO_0); - dev_dbg(codec->dev, "DC servo: %x\n", reg); - } while (reg & op && count < 400); - } + + reg = snd_soc_read(codec, WM8993_DC_SERVO_0); + dev_dbg(codec->dev, "DC servo: %x\n", reg); + } while (reg & op && count < timeout); if (reg & op) dev_err(codec->dev, "Timed out waiting for DC Servo %x\n", -- 1.7.5.4

1 0

[alsa-devel] Major reworks on patch_via.c (TESTERS WANTED)
by Takashi Iwai 15 Jul '11

15 Jul '11

Hi, as there have many problems reported for VIA codecs, I started looking at the driver code, and decided to rework on it. The current development is found in sound git tree topic/via-cleanup branch: git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git You can pull into the latest Linus tree from topic/via-cleanup branch: # this is the vanilla tree % cd linux-2.6 % git pull \ git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git \ topic/via-cleanup A good thing is that a fair amount of code reduction is done there: % git diff HEAD..topic/via-cleanup --stat sound/pci/hda/patch_via.c sound/pci/hda/patch_via.c | 5892 +++++++++++---------------------------------- 1 files changed, 1453 insertions(+), 4439 deletions(-) But, the driver isn't tested with real machines, yet. That is, I need testers with real machines. Could VIA machine owners take a look at these commits and test it if possible? Especially, I'd like to know whether the headphone auto-mute works in this form or not. FWIW, the branch was merged to sound-unstable tree, so you can build from alsa-driver-unstable snapshot tarball if you'd like to build external modules without the kernel tree and git-merge. ftp://ftp.kernel.org/pub/linux/kernel/people/tiwai/snapshot/alsa-driver-uns… Also, if anyone has alsa-info.sh outputs of VIA codecs, please let me know. It'd be very helpful for debugging, since I can check it via hda-emu with alsa-info.sh output. For now, I have the files of only VT1702, VT1708S, VT1718S, VT1828S and VT2020 codecs. The alsa-info.sh outputs of other VIA codecs would be greatly appreciated. thanks, Takashi

5 18

[alsa-devel] [PATCH] ALSA: intel8x0: Apply headphones+mute LED quirk for Dell Inspiron 9300
by Dan Chen 15 Jul '11

15 Jul '11

Hi, Attached is a patch against sound-2.6 master HEAD resolving the original reporter's volume keys issue. Please consider applying. Cheers, -Dan

2 1

[alsa-devel] [PATCH 11/20] ARM i.MX dma: Fix burstsize settings
by Sascha Hauer 14 Jul '11

14 Jul '11

From: Wolfram Sang <w.sang(a)pengutronix.de> Already upstreamed. dmaengine expects the maxburst parameter in words, not bytes. The imxdma driver and its users do this wrong. Fix this. As a side note the imx-pcm-dma-mx2 driver was 'fixed' to work with imx-dma. This broke the driver with imx-sdma support which correctly takes the maxburst parameter in words. This patch puts the sdma based sound back to work. Signed-off-by: Sascha Hauer <s.hauer(a)pengutronix.de> Cc: Vinod Koul <vinod.koul(a)intel.com> Cc: Chris Ball <cjb(a)laptop.org> Cc: linux-mmc(a)vger.kernel.org Cc: Liam Girdwood <lrg(a)ti.com> Cc: Mark Brown <broonie(a)opensource.wolfsonmicro.com> Cc: alsa-devel(a)alsa-project.org --- drivers/dma/imx-dma.c | 3 ++- sound/soc/imx/imx-pcm-dma-mx2.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/dma/imx-dma.c b/drivers/dma/imx-dma.c index e18eaab..d99f71c 100644 --- a/drivers/dma/imx-dma.c +++ b/drivers/dma/imx-dma.c @@ -135,7 +135,8 @@ static int imxdma_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd, if (ret) return ret; - imx_dma_config_burstlen(imxdmac->imxdma_channel, imxdmac->watermark_level); + imx_dma_config_burstlen(imxdmac->imxdma_channel, + imxdmac->watermark_level * imxdmac->word_size); return 0; default: diff --git a/sound/soc/imx/imx-pcm-dma-mx2.c b/sound/soc/imx/imx-pcm-dma-mx2.c index 4173b3d..43fdc24f 100644 --- a/sound/soc/imx/imx-pcm-dma-mx2.c +++ b/sound/soc/imx/imx-pcm-dma-mx2.c @@ -110,12 +110,12 @@ static int imx_ssi_dma_alloc(struct snd_pcm_substream *substream, slave_config.direction = DMA_TO_DEVICE; slave_config.dst_addr = dma_params->dma_addr; slave_config.dst_addr_width = buswidth; - slave_config.dst_maxburst = dma_params->burstsize * buswidth; + slave_config.dst_maxburst = dma_params->burstsize; } else { slave_config.direction = DMA_FROM_DEVICE; slave_config.src_addr = dma_params->dma_addr; slave_config.src_addr_width = buswidth; - slave_config.src_maxburst = dma_params->burstsize * buswidth; + slave_config.src_maxburst = dma_params->burstsize; } ret = dmaengine_slave_config(iprtd->dma_chan, &slave_config); -- 1.7.5.4

1 1

[alsa-devel] [PATCH] ALSA: hda - Disable automute feature by default
by Ben Hutchings 14 Jul '11

14 Jul '11

The default behaviour should be the same as before this feature was introduced, to avoid user confusion. Reported-by: Toni Mueller <support(a)oeko.net> References: http://bugs.debian.org/631963 Signed-off-by: Ben Hutchings <ben(a)decadent.org.uk> --- The code is rather inconsistent in whether 'mode' means the behaviour or mechanism of automute. I didn't touch that but you might want to consider some renaming. Ben. sound/pci/hda/patch_realtek.c | 74 ++--------------------------------------- 1 files changed, 3 insertions(+), 71 deletions(-) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index b48fb43..1247a04 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -306,7 +306,7 @@ struct alc_multi_io { }; enum { - ALC_AUTOMUTE_PIN, /* change the pin control */ + ALC_AUTOMUTE_PIN = 1, /* change the pin control */ ALC_AUTOMUTE_AMP, /* mute/unmute the pin AMP */ ALC_AUTOMUTE_MIXER, /* mute/unmute mixer widget AMP */ }; @@ -1599,10 +1599,9 @@ static void alc_init_auto_hp(struct hda_codec *codec) snd_hda_codec_write_cache(codec, nid, 0, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | ALC880_HP_EVENT); - spec->automute = 1; spec->automute_mode = ALC_AUTOMUTE_PIN; } - if (spec->automute && cfg->line_out_pins[0] && + if (spec->automute_mode && cfg->line_out_pins[0] && cfg->line_out_pins[0] != cfg->hp_pins[0] && cfg->line_out_pins[0] != cfg->speaker_pins[0]) { for (i = 0; i < cfg->line_outs; i++) { @@ -1619,7 +1618,7 @@ static void alc_init_auto_hp(struct hda_codec *codec) spec->automute_lines = spec->detect_line; } - if (spec->automute) { + if (spec->automute_mode) { /* create a control for automute mode */ alc_add_automute_mode_enum(codec); spec->unsol_event = alc_sku_unsol_event; @@ -2241,7 +2240,6 @@ static void alc889_automute_setup(struct hda_codec *codec) spec->autocfg.speaker_pins[2] = 0x17; spec->autocfg.speaker_pins[3] = 0x19; spec->autocfg.speaker_pins[4] = 0x1a; - spec->automute = 1; spec->automute_mode = ALC_AUTOMUTE_AMP; } @@ -2259,7 +2257,6 @@ static void alc888_fujitsu_xa3530_setup(struct hda_codec *codec) spec->autocfg.hp_pins[1] = 0x1b; /* hp */ spec->autocfg.speaker_pins[0] = 0x14; /* speaker */ spec->autocfg.speaker_pins[1] = 0x15; /* bass */ - spec->automute = 1; spec->automute_mode = ALC_AUTOMUTE_AMP; } @@ -2543,7 +2540,6 @@ static void alc888_acer_aspire_4930g_setup(struct hda_codec *codec) spec->autocfg.speaker_pins[0] = 0x14; spec->autocfg.speaker_pins[1] = 0x16; spec->autocfg.speaker_pins[2] = 0x17; - spec->automute = 1; spec->automute_mode = ALC_AUTOMUTE_AMP; } @@ -2555,7 +2551,6 @@ static void alc888_acer_aspire_6530g_setup(struct hda_codec *codec) spec->autocfg.speaker_pins[0] = 0x14; spec->autocfg.speaker_pins[1] = 0x16; spec->autocfg.speaker_pins[2] = 0x17; - spec->automute = 1; spec->automute_mode = ALC_AUTOMUTE_AMP; } @@ -2567,7 +2562,6 @@ static void alc888_acer_aspire_7730g_setup(struct hda_codec *codec) spec->autocfg.speaker_pins[0] = 0x14; spec->autocfg.speaker_pins[1] = 0x16; spec->autocfg.speaker_pins[2] = 0x17; - spec->automute = 1; spec->automute_mode = ALC_AUTOMUTE_AMP; } @@ -2579,7 +2573,6 @@ static void alc889_acer_aspire_8930g_setup(struct hda_codec *codec) spec->autocfg.speaker_pins[0] = 0x14; spec->autocfg.speaker_pins[1] = 0x16; spec->autocfg.speaker_pins[2] = 0x1b; - spec->automute = 1; spec->automute_mode = ALC_AUTOMUTE_AMP; } @@ -3667,7 +3660,6 @@ static void alc880_uniwill_setup(struct hda_codec *codec) spec->autocfg.hp_pins[0] = 0x14; spec->autocfg.speaker_pins[0] = 0x15; spec->autocfg.speaker_pins[0] = 0x16; - spec->automute = 1; spec->automute_mode = ALC_AUTOMUTE_AMP; } @@ -3699,7 +3691,6 @@ static void alc880_uniwill_p53_setup(struct hda_codec *codec) spec->autocfg.hp_pins[0] = 0x14; spec->autocfg.speaker_pins[0] = 0x15; - spec->automute = 1; spec->automute_mode = ALC_AUTOMUTE_AMP; } @@ -3969,7 +3960,6 @@ static void alc880_lg_setup(struct hda_codec *codec) spec->autocfg.hp_pins[0] = 0x1b; spec->autocfg.speaker_pins[0] = 0x17; - spec->automute = 1; spec->automute_mode = ALC_AUTOMUTE_AMP; } @@ -4055,7 +4045,6 @@ static void alc880_lg_lw_setup(struct hda_codec *codec) spec->autocfg.hp_pins[0] = 0x1b; spec->autocfg.speaker_pins[0] = 0x14; - spec->automute = 1; spec->automute_mode = ALC_AUTOMUTE_AMP; } @@ -4128,7 +4117,6 @@ static void alc880_medion_rim_setup(struct hda_codec *codec) spec->autocfg.hp_pins[0] = 0x14; spec->autocfg.speaker_pins[0] = 0x1b; - spec->automute = 1; spec->automute_mode = ALC_AUTOMUTE_AMP; } @@ -6277,7 +6265,6 @@ static void alc260_hp_setup(struct hda_codec *codec) spec->autocfg.hp_pins[0] = 0x0f; spec->autocfg.speaker_pins[0] = 0x10; spec->autocfg.speaker_pins[1] = 0x11; - spec->automute = 1; spec->automute_mode = ALC_AUTOMUTE_PIN; } @@ -6308,7 +6295,6 @@ static void alc260_hp_3013_setup(struct hda_codec *codec) spec->autocfg.hp_pins[0] = 0x15; spec->autocfg.speaker_pins[0] = 0x10; spec->autocfg.speaker_pins[1] = 0x11; - spec->automute = 1; spec->automute_mode = ALC_AUTOMUTE_PIN; } @@ -6352,7 +6338,6 @@ static void alc260_hp_3012_setup(struct hda_codec *codec) spec->autocfg.speaker_pins[0] = 0x0f; spec->autocfg.speaker_pins[1] = 0x11; spec->autocfg.speaker_pins[2] = 0x15; - spec->automute = 1; spec->automute_mode = ALC_AUTOMUTE_PIN; } @@ -8887,7 +8872,6 @@ static void alc885_imac24_setup(struct hda_codec *codec) spec->autocfg.hp_pins[0] = 0x14; spec->autocfg.speaker_pins[0] = 0x18; spec->autocfg.speaker_pins[1] = 0x1a; - spec->automute = 1; spec->automute_mode = ALC_AUTOMUTE_AMP; } @@ -8901,7 +8885,6 @@ static void alc885_mba21_setup(struct hda_codec *codec) spec->autocfg.hp_pins[0] = 0x14; spec->autocfg.speaker_pins[0] = 0x18; - spec->automute = 1; spec->automute_mode = ALC_AUTOMUTE_AMP; } @@ -8913,7 +8896,6 @@ static void alc885_mbp3_setup(struct hda_codec *codec) spec->autocfg.hp_pins[0] = 0x15; spec->autocfg.speaker_pins[0] = 0x14; - spec->automute = 1; spec->automute_mode = ALC_AUTOMUTE_AMP; } @@ -8924,7 +8906,6 @@ static void alc885_imac91_setup(struct hda_codec *codec) spec->autocfg.hp_pins[0] = 0x14; spec->autocfg.speaker_pins[0] = 0x18; spec->autocfg.speaker_pins[1] = 0x1a; - spec->automute = 1; spec->automute_mode = ALC_AUTOMUTE_AMP; } @@ -8958,7 +8939,6 @@ static void alc882_targa_setup(struct hda_codec *codec) spec->autocfg.hp_pins[0] = 0x14; spec->autocfg.speaker_pins[0] = 0x1b; - spec->automute = 1; spec->automute_mode = ALC_AUTOMUTE_AMP; } @@ -9405,7 +9385,6 @@ static void alc883_medion_wim2160_setup(struct hda_codec *codec) spec->autocfg.hp_pins[0] = 0x1a; spec->autocfg.speaker_pins[0] = 0x15; - spec->automute = 1; spec->automute_mode = ALC_AUTOMUTE_AMP; } @@ -9559,7 +9538,6 @@ static void alc883_mitac_setup(struct hda_codec *codec) spec->autocfg.hp_pins[0] = 0x15; spec->autocfg.speaker_pins[0] = 0x14; spec->autocfg.speaker_pins[1] = 0x17; - spec->automute = 1; spec->automute_mode = ALC_AUTOMUTE_AMP; } @@ -9725,7 +9703,6 @@ static void alc888_3st_hp_setup(struct hda_codec *codec) spec->autocfg.speaker_pins[0] = 0x14; spec->autocfg.speaker_pins[1] = 0x16; spec->autocfg.speaker_pins[2] = 0x18; - spec->automute = 1; spec->automute_mode = ALC_AUTOMUTE_AMP; } @@ -9786,7 +9763,6 @@ static void alc888_lenovo_ms7195_setup(struct hda_codec *codec) spec->autocfg.hp_pins[0] = 0x1b; spec->autocfg.line_out_pins[0] = 0x14; spec->autocfg.speaker_pins[0] = 0x15; - spec->automute = 1; spec->automute_mode = ALC_AUTOMUTE_AMP; } @@ -9797,7 +9773,6 @@ static void alc883_lenovo_nb0763_setup(struct hda_codec *codec) spec->autocfg.hp_pins[0] = 0x14; spec->autocfg.speaker_pins[0] = 0x15; - spec->automute = 1; spec->automute_mode = ALC_AUTOMUTE_AMP; } @@ -9811,7 +9786,6 @@ static void alc883_clevo_m720_setup(struct hda_codec *codec) spec->autocfg.hp_pins[0] = 0x15; spec->autocfg.speaker_pins[0] = 0x14; - spec->automute = 1; spec->automute_mode = ALC_AUTOMUTE_AMP; } @@ -9841,7 +9815,6 @@ static void alc883_2ch_fujitsu_pi2515_setup(struct hda_codec *codec) spec->autocfg.hp_pins[0] = 0x14; spec->autocfg.speaker_pins[0] = 0x15; - spec->automute = 1; spec->automute_mode = ALC_AUTOMUTE_AMP; } @@ -9851,7 +9824,6 @@ static void alc883_haier_w66_setup(struct hda_codec *codec) spec->autocfg.hp_pins[0] = 0x1b; spec->autocfg.speaker_pins[0] = 0x14; - spec->automute = 1; spec->automute_mode = ALC_AUTOMUTE_AMP; } @@ -9862,7 +9834,6 @@ static void alc883_lenovo_101e_setup(struct hda_codec *codec) spec->autocfg.hp_pins[0] = 0x1b; spec->autocfg.line_out_pins[0] = 0x14; spec->autocfg.speaker_pins[0] = 0x15; - spec->automute = 1; spec->detect_line = 1; spec->automute_lines = 1; spec->automute_mode = ALC_AUTOMUTE_AMP; @@ -9876,7 +9847,6 @@ static void alc883_acer_aspire_setup(struct hda_codec *codec) spec->autocfg.hp_pins[0] = 0x14; spec->autocfg.speaker_pins[0] = 0x15; spec->autocfg.speaker_pins[1] = 0x16; - spec->automute = 1; spec->automute_mode = ALC_AUTOMUTE_AMP; } @@ -9907,7 +9877,6 @@ static void alc888_6st_dell_setup(struct hda_codec *codec) spec->autocfg.speaker_pins[1] = 0x15; spec->autocfg.speaker_pins[2] = 0x16; spec->autocfg.speaker_pins[3] = 0x17; - spec->automute = 1; spec->automute_mode = ALC_AUTOMUTE_AMP; } @@ -9921,7 +9890,6 @@ static void alc888_lenovo_sky_setup(struct hda_codec *codec) spec->autocfg.speaker_pins[2] = 0x16; spec->autocfg.speaker_pins[3] = 0x17; spec->autocfg.speaker_pins[4] = 0x1a; - spec->automute = 1; spec->automute_mode = ALC_AUTOMUTE_AMP; } @@ -9932,7 +9900,6 @@ static void alc883_vaiott_setup(struct hda_codec *codec) spec->autocfg.hp_pins[0] = 0x15; spec->autocfg.speaker_pins[0] = 0x14; spec->autocfg.speaker_pins[1] = 0x17; - spec->automute = 1; spec->automute_mode = ALC_AUTOMUTE_AMP; } @@ -9959,7 +9926,6 @@ static void alc883_mode2_setup(struct hda_codec *codec) spec->ext_mic.mux_idx = 0; spec->int_mic.mux_idx = 1; spec->auto_mic = 1; - spec->automute = 1; spec->automute_mode = ALC_AUTOMUTE_AMP; } @@ -11470,7 +11436,6 @@ static void alc262_hp_bpc_setup(struct hda_codec *codec) spec->autocfg.hp_pins[0] = 0x1b; spec->autocfg.speaker_pins[0] = 0x16; - spec->automute = 1; spec->automute_mode = ALC_AUTOMUTE_PIN; } @@ -11480,7 +11445,6 @@ static void alc262_hp_wildwest_setup(struct hda_codec *codec) spec->autocfg.hp_pins[0] = 0x15; spec->autocfg.speaker_pins[0] = 0x16; - spec->automute = 1; spec->automute_mode = ALC_AUTOMUTE_PIN; } @@ -11560,7 +11524,6 @@ static void alc262_hp_t5735_setup(struct hda_codec *codec) spec->autocfg.hp_pins[0] = 0x15; spec->autocfg.speaker_pins[0] = 0x14; - spec->automute = 1; spec->automute_mode = ALC_AUTOMUTE_PIN; } @@ -11674,7 +11637,6 @@ static void alc262_hippo_setup(struct hda_codec *codec) spec->autocfg.hp_pins[0] = 0x15; spec->autocfg.speaker_pins[0] = 0x14; - spec->automute = 1; spec->automute_mode = ALC_AUTOMUTE_AMP; } @@ -11684,7 +11646,6 @@ static void alc262_hippo1_setup(struct hda_codec *codec) spec->autocfg.hp_pins[0] = 0x1b; spec->autocfg.speaker_pins[0] = 0x14; - spec->automute = 1; spec->automute_mode = ALC_AUTOMUTE_AMP; } @@ -11748,7 +11709,6 @@ static void alc262_tyan_setup(struct hda_codec *codec) spec->autocfg.hp_pins[0] = 0x1b; spec->autocfg.speaker_pins[0] = 0x15; - spec->automute = 1; spec->automute_mode = ALC_AUTOMUTE_AMP; } @@ -11893,7 +11853,6 @@ static void alc262_toshiba_s06_setup(struct hda_codec *codec) spec->int_mic.pin = 0x12; spec->int_mic.mux_idx = 9; spec->auto_mic = 1; - spec->automute = 1; spec->automute_mode = ALC_AUTOMUTE_PIN; } @@ -11998,7 +11957,6 @@ static void alc262_fujitsu_setup(struct hda_codec *codec) spec->autocfg.hp_pins[0] = 0x14; spec->autocfg.hp_pins[1] = 0x1b; spec->autocfg.speaker_pins[0] = 0x15; - spec->automute = 1; spec->automute_mode = ALC_AUTOMUTE_AMP; } @@ -12045,7 +12003,6 @@ static void alc262_lenovo_3000_setup(struct hda_codec *codec) spec->autocfg.hp_pins[0] = 0x1b; spec->autocfg.speaker_pins[0] = 0x14; spec->autocfg.speaker_pins[1] = 0x16; - spec->automute = 1; spec->automute_mode = ALC_AUTOMUTE_AMP; } @@ -13255,7 +13212,6 @@ static void alc268_acer_setup(struct hda_codec *codec) spec->autocfg.hp_pins[0] = 0x14; spec->autocfg.speaker_pins[0] = 0x15; - spec->automute = 1; spec->automute_mode = ALC_AUTOMUTE_AMP; } @@ -13339,7 +13295,6 @@ static void alc268_acer_lc_setup(struct hda_codec *codec) struct alc_spec *spec = codec->spec; spec->autocfg.hp_pins[0] = 0x15; spec->autocfg.speaker_pins[0] = 0x14; - spec->automute = 1; spec->automute_mode = ALC_AUTOMUTE_AMP; spec->ext_mic.pin = 0x18; spec->ext_mic.mux_idx = 0; @@ -13379,7 +13334,6 @@ static void alc268_dell_setup(struct hda_codec *codec) spec->int_mic.pin = 0x19; spec->int_mic.mux_idx = 1; spec->auto_mic = 1; - spec->automute = 1; spec->automute_mode = ALC_AUTOMUTE_PIN; } @@ -13411,7 +13365,6 @@ static void alc267_quanta_il1_setup(struct hda_codec *codec) spec->int_mic.pin = 0x19; spec->int_mic.mux_idx = 1; spec->auto_mic = 1; - spec->automute = 1; spec->automute_mode = ALC_AUTOMUTE_PIN; } @@ -14415,7 +14368,6 @@ static void alc269_quanta_fl1_setup(struct hda_codec *codec) spec->autocfg.hp_pins[0] = 0x15; spec->autocfg.speaker_pins[0] = 0x14; spec->automute_mixer_nid[0] = 0x0c; - spec->automute = 1; spec->automute_mode = ALC_AUTOMUTE_MIXER; spec->ext_mic.pin = 0x18; spec->ext_mic.mux_idx = 0; @@ -14437,7 +14389,6 @@ static void alc269_lifebook_setup(struct hda_codec *codec) spec->autocfg.hp_pins[1] = 0x1a; spec->autocfg.speaker_pins[0] = 0x14; spec->automute_mixer_nid[0] = 0x0c; - spec->automute = 1; spec->automute_mode = ALC_AUTOMUTE_MIXER; } @@ -14510,7 +14461,6 @@ static void alc269_laptop_amic_setup(struct hda_codec *codec) spec->autocfg.hp_pins[0] = 0x15; spec->autocfg.speaker_pins[0] = 0x14; spec->automute_mixer_nid[0] = 0x0c; - spec->automute = 1; spec->automute_mode = ALC_AUTOMUTE_MIXER; spec->ext_mic.pin = 0x18; spec->ext_mic.mux_idx = 0; @@ -14525,7 +14475,6 @@ static void alc269_laptop_dmic_setup(struct hda_codec *codec) spec->autocfg.hp_pins[0] = 0x15; spec->autocfg.speaker_pins[0] = 0x14; spec->automute_mixer_nid[0] = 0x0c; - spec->automute = 1; spec->automute_mode = ALC_AUTOMUTE_MIXER; spec->ext_mic.pin = 0x18; spec->ext_mic.mux_idx = 0; @@ -14540,7 +14489,6 @@ static void alc269vb_laptop_amic_setup(struct hda_codec *codec) spec->autocfg.hp_pins[0] = 0x21; spec->autocfg.speaker_pins[0] = 0x14; spec->automute_mixer_nid[0] = 0x0c; - spec->automute = 1; spec->automute_mode = ALC_AUTOMUTE_MIXER; spec->ext_mic.pin = 0x18; spec->ext_mic.mux_idx = 0; @@ -14555,7 +14503,6 @@ static void alc269vb_laptop_dmic_setup(struct hda_codec *codec) spec->autocfg.hp_pins[0] = 0x21; spec->autocfg.speaker_pins[0] = 0x14; spec->automute_mixer_nid[0] = 0x0c; - spec->automute = 1; spec->automute_mode = ALC_AUTOMUTE_MIXER; spec->ext_mic.pin = 0x18; spec->ext_mic.mux_idx = 0; @@ -16878,7 +16825,6 @@ static void alc861vd_lenovo_setup(struct hda_codec *codec) struct alc_spec *spec = codec->spec; spec->autocfg.hp_pins[0] = 0x1b; spec->autocfg.speaker_pins[0] = 0x14; - spec->automute = 1; spec->automute_mode = ALC_AUTOMUTE_AMP; } @@ -16953,7 +16899,6 @@ static void alc861vd_dallas_setup(struct hda_codec *codec) spec->autocfg.hp_pins[0] = 0x15; spec->autocfg.speaker_pins[0] = 0x14; - spec->automute = 1; spec->automute_mode = ALC_AUTOMUTE_AMP; } @@ -18222,7 +18167,6 @@ static void alc662_lenovo_101e_setup(struct hda_codec *codec) spec->autocfg.hp_pins[0] = 0x1b; spec->autocfg.line_out_pins[0] = 0x14; spec->autocfg.speaker_pins[0] = 0x15; - spec->automute = 1; spec->detect_line = 1; spec->automute_lines = 1; spec->automute_mode = ALC_AUTOMUTE_AMP; @@ -18246,7 +18190,6 @@ static void alc662_eeepc_ep20_setup(struct hda_codec *codec) spec->autocfg.hp_pins[0] = 0x14; spec->autocfg.speaker_pins[0] = 0x1b; - spec->automute = 1; spec->automute_mode = ALC_AUTOMUTE_AMP; } @@ -18256,7 +18199,6 @@ static void alc663_m51va_setup(struct hda_codec *codec) spec->autocfg.hp_pins[0] = 0x21; spec->autocfg.speaker_pins[0] = 0x14; spec->automute_mixer_nid[0] = 0x0c; - spec->automute = 1; spec->automute_mode = ALC_AUTOMUTE_MIXER; spec->ext_mic.pin = 0x18; spec->ext_mic.mux_idx = 0; @@ -18272,7 +18214,6 @@ static void alc663_mode1_setup(struct hda_codec *codec) spec->autocfg.hp_pins[0] = 0x21; spec->autocfg.speaker_pins[0] = 0x14; spec->automute_mixer_nid[0] = 0x0c; - spec->automute = 1; spec->automute_mode = ALC_AUTOMUTE_MIXER; spec->ext_mic.pin = 0x18; spec->ext_mic.mux_idx = 0; @@ -18287,7 +18228,6 @@ static void alc662_mode2_setup(struct hda_codec *codec) struct alc_spec *spec = codec->spec; spec->autocfg.hp_pins[0] = 0x1b; spec->autocfg.speaker_pins[0] = 0x14; - spec->automute = 1; spec->automute_mode = ALC_AUTOMUTE_PIN; spec->ext_mic.pin = 0x18; spec->ext_mic.mux_idx = 0; @@ -18303,7 +18243,6 @@ static void alc663_mode3_setup(struct hda_codec *codec) spec->autocfg.hp_pins[0] = 0x21; spec->autocfg.hp_pins[0] = 0x15; spec->autocfg.speaker_pins[0] = 0x14; - spec->automute = 1; spec->automute_mode = ALC_AUTOMUTE_PIN; spec->ext_mic.pin = 0x18; spec->ext_mic.mux_idx = 0; @@ -18321,7 +18260,6 @@ static void alc663_mode4_setup(struct hda_codec *codec) spec->autocfg.speaker_pins[1] = 0x16; spec->automute_mixer_nid[0] = 0x0c; spec->automute_mixer_nid[1] = 0x0e; - spec->automute = 1; spec->automute_mode = ALC_AUTOMUTE_MIXER; spec->ext_mic.pin = 0x18; spec->ext_mic.mux_idx = 0; @@ -18339,7 +18277,6 @@ static void alc663_mode5_setup(struct hda_codec *codec) spec->autocfg.speaker_pins[1] = 0x16; spec->automute_mixer_nid[0] = 0x0c; spec->automute_mixer_nid[1] = 0x0e; - spec->automute = 1; spec->automute_mode = ALC_AUTOMUTE_MIXER; spec->ext_mic.pin = 0x18; spec->ext_mic.mux_idx = 0; @@ -18356,7 +18293,6 @@ static void alc663_mode6_setup(struct hda_codec *codec) spec->autocfg.hp_pins[0] = 0x15; spec->autocfg.speaker_pins[0] = 0x14; spec->automute_mixer_nid[0] = 0x0c; - spec->automute = 1; spec->automute_mode = ALC_AUTOMUTE_MIXER; spec->ext_mic.pin = 0x18; spec->ext_mic.mux_idx = 0; @@ -18373,7 +18309,6 @@ static void alc663_mode7_setup(struct hda_codec *codec) spec->autocfg.hp_pins[0] = 0x21; spec->autocfg.speaker_pins[0] = 0x14; spec->autocfg.speaker_pins[0] = 0x17; - spec->automute = 1; spec->automute_mode = ALC_AUTOMUTE_PIN; spec->ext_mic.pin = 0x18; spec->ext_mic.mux_idx = 0; @@ -18390,7 +18325,6 @@ static void alc663_mode8_setup(struct hda_codec *codec) spec->autocfg.hp_pins[1] = 0x15; spec->autocfg.speaker_pins[0] = 0x14; spec->autocfg.speaker_pins[0] = 0x17; - spec->automute = 1; spec->automute_mode = ALC_AUTOMUTE_PIN; spec->ext_mic.pin = 0x18; spec->ext_mic.mux_idx = 0; @@ -18405,7 +18339,6 @@ static void alc663_g71v_setup(struct hda_codec *codec) spec->autocfg.hp_pins[0] = 0x21; spec->autocfg.line_out_pins[0] = 0x15; spec->autocfg.speaker_pins[0] = 0x14; - spec->automute = 1; spec->automute_mode = ALC_AUTOMUTE_AMP; spec->detect_line = 1; spec->automute_lines = 1; @@ -19818,7 +19751,6 @@ static void alc680_base_setup(struct hda_codec *codec) spec->autocfg.inputs[0].type = AUTO_PIN_MIC; spec->autocfg.inputs[1].pin = 0x19; spec->autocfg.inputs[1].type = AUTO_PIN_LINE_IN; - spec->automute = 1; spec->automute_mode = ALC_AUTOMUTE_AMP; } -- 1.7.5.4

2 3

[alsa-devel] [PATCH] ASoC: Correct WM8994 MICBIAS supply widget hookup
by Mark Brown 14 Jul '11

14 Jul '11

The WM8994 and WM8958 series of devices have two MICBIAS supplies rather than one, the current widget actually manages the microphone detection control register bit (which is managed separately by the relevant API). Fix this, hooking the relevant supplies up to the MICBIAS1 and MICBIAS2 widgets. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm8994.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index 79dee89..414f817 100644 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c @@ -1206,7 +1206,6 @@ SND_SOC_DAPM_INPUT("DMIC1DAT"), SND_SOC_DAPM_INPUT("DMIC2DAT"), SND_SOC_DAPM_INPUT("Clock"), -SND_SOC_DAPM_MICBIAS("MICBIAS", WM8994_MICBIAS, 2, 0), SND_SOC_DAPM_SUPPLY_S("MICBIAS Supply", 1, SND_SOC_NOPM, 0, 0, micbias_ev, SND_SOC_DAPM_PRE_PMU), @@ -1517,8 +1516,10 @@ static const struct snd_soc_dapm_route wm8994_revd_intercon[] = { { "AIF2DACDAT", NULL, "AIF1DACDAT" }, { "AIF1ADCDAT", NULL, "AIF2ADCDAT" }, { "AIF2ADCDAT", NULL, "AIF1ADCDAT" }, - { "MICBIAS", NULL, "CLK_SYS" }, - { "MICBIAS", NULL, "MICBIAS Supply" }, + { "MICBIAS1", NULL, "CLK_SYS" }, + { "MICBIAS1", NULL, "MICBIAS Supply" }, + { "MICBIAS2", NULL, "CLK_SYS" }, + { "MICBIAS2", NULL, "MICBIAS Supply" }, }; static const struct snd_soc_dapm_route wm8994_intercon[] = { -- 1.7.5.4

1 0