June 2013 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH 1/2] ASoC: tas5086: fix TAS5086_CLOCK_CONTROL register size
by Daniel Mack 28 Jun '13

28 Jun '13

The TAS5086_CLOCK_CONTROL also has a size of 1 byte. Signed-off-by: Daniel Mack <zonque(a)gmail.com> --- sound/soc/codecs/tas5086.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/tas5086.c b/sound/soc/codecs/tas5086.c index fec9a28..84c3f27 100644 --- a/sound/soc/codecs/tas5086.c +++ b/sound/soc/codecs/tas5086.c @@ -130,7 +130,7 @@ static const struct reg_default tas5086_reg_defaults[] = { static int tas5086_register_size(struct device *dev, unsigned int reg) { switch (reg) { - case TAS5086_DEV_ID ... TAS5086_BKNDERR: + case TAS5086_CLOCK_CONTROL ... TAS5086_BKNDERR: return 1; case TAS5086_INPUT_MUX: case TAS5086_PWM_OUTPUT_MUX: -- 1.8.1.4

2 2

[alsa-devel] [PATCH] ASoC: mfld: Remove unused variable
by Mark Brown 28 Jun '13

28 Jun '13

From: Mark Brown <broonie(a)linaro.org> Reported-by: Fengguang Wu <fengguang.wu(a)intel.com> Signed-off-by: Mark Brown <broonie(a)linaro.org> --- sound/soc/mid-x86/mfld_machine.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sound/soc/mid-x86/mfld_machine.c b/sound/soc/mid-x86/mfld_machine.c index aec29a8..ee36384 100644 --- a/sound/soc/mid-x86/mfld_machine.c +++ b/sound/soc/mid-x86/mfld_machine.c @@ -412,8 +412,6 @@ static int snd_mfld_mc_probe(struct platform_device *pdev) static int snd_mfld_mc_remove(struct platform_device *pdev) { - struct mfld_mc_private *mc_drv_ctx = platform_get_drvdata(pdev); - pr_debug("snd_mfld_mc_remove called\n"); snd_soc_unregister_card(&snd_soc_card_mfld); return 0; -- 1.8.3.1

1 0

[alsa-devel] [PATCH 1/2] ALSA: hda - Fix the max length of control name in generic parser
by Takashi Iwai 28 Jun '13

28 Jun '13

add_control_with_pfx() in hda_generic.c assumes a shorter name string for the control element, and this resulted in the truncation of the long but valid string like "Headphone Surround Switch" in the middle. This patch aligns the max size to the actual limit of snd_ctl_elem_id, 44. Cc: <stable(a)vger.kernel.org> [v3.9+] Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/hda/hda_generic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c index 1485d87..6460fc5 100644 --- a/sound/pci/hda/hda_generic.c +++ b/sound/pci/hda/hda_generic.c @@ -854,7 +854,7 @@ static int add_control_with_pfx(struct hda_gen_spec *spec, int type, const char *pfx, const char *dir, const char *sfx, int cidx, unsigned long val) { - char name[32]; + char name[44]; snprintf(name, sizeof(name), "%s %s %s", pfx, dir, sfx); if (!add_control(spec, type, name, cidx, val)) return -ENOMEM; -- 1.8.3.1

1 1

[alsa-devel] [PATCH] ALSA: hda - Guess what, it's two more Dell headset mic quirks
by David Henningsson 28 Jun '13

28 Jun '13

Add two more machines that need quirks for headset mics to work. Tested-by: Shawn Wang <shawn.wang(a)canonical.com> BugLink: https://bugs.launchpad.net/bugs/1195636 Signed-off-by: David Henningsson <david.henningsson(a)canonical.com> --- sound/pci/hda/patch_realtek.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 6d7041d..86c2406 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -3506,6 +3506,8 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x1028, 0x05f5, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1028, 0x05f6, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1028, 0x05f8, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE), + SND_PCI_QUIRK(0x1028, 0x05f9, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE), + SND_PCI_QUIRK(0x1028, 0x05fb, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1028, 0x0606, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1028, 0x0608, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1028, 0x0609, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE), -- 1.7.9.5

2 1

[alsa-devel] [PATCH] ALSA: hda - Yet another Dell headset mic quirk
by David Henningsson 28 Jun '13

28 Jun '13

This quirk is needed for the headset mic to work on this Dell machine. BugLink: https://bugs.launchpad.net/bugs/1195597 Signed-off-by: David Henningsson <david.henningsson(a)canonical.com> --- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index ae12111..6d7041d 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -3509,6 +3509,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x1028, 0x0606, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1028, 0x0608, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1028, 0x0609, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE), + SND_PCI_QUIRK(0x1028, 0x0613, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x103c, 0x1586, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC2), SND_PCI_QUIRK(0x103c, 0x18e6, "HP", ALC269_FIXUP_HP_GPIO_LED), SND_PCI_QUIRK(0x103c, 0x1973, "HP Pavilion", ALC269_FIXUP_HP_MUTE_LED_MIC1), -- 1.7.9.5

2 1

[alsa-devel] C-Media 6632A unsupported (asus xonar u7)
by Julius von kohout 28 Jun '13

28 Jun '13

Hi ive got a new usb soundcard with the brand new C-Media 6632A chip and want to help with debugging. xonar u7 in usb 2.0 mode C-Media 6632A Ubuntu 13.04 julius@R850:~$ alsactl init 1 Found hardware: "USB-Audio" "USB Mixer" "USB1043:857c" "" "" Hardware is initialized using a generic method julius@R850:~$ alsamixer -c 1 cannot load mixer controls: Broken pipe alsa hardware volume (numid=2,iface=MIXER,name='Speaker Playback Volume') level on start is way to low and can only be adjusted via QasHctl. The volume knob on soundcard works for pulseaudio volume. spdif can only be used via direct alsa access without pulseaudio. alsa-info script results http://pastebin.ca/2409660 julius@R850:~$ amixer -c 1 controls numid=7,iface=MIXER,name='PCM Capture Source' numid=5,iface=MIXER,name='PCM Capture Switch' numid=6,iface=MIXER,name='PCM Capture Switch',index=1 numid=4,iface=MIXER,name='IEC958 In Playback Switch' numid=3,iface=MIXER,name='Input Gain Pad Control' numid=1,iface=MIXER,name='Speaker Playback Switch' numid=2,iface=MIXER,name='Speaker Playback Volume' [ 8219.399637] usb 2-1.2.3: new high-speed USB device number 22 using ehci-pci [ 8219.513315] usb 2-1.2.3: New USB device found, idVendor=1043, idProduct=857c [ 8219.513327] usb 2-1.2.3: New USB device strings: Mfr=1, Product=2, SerialNumber=0 [ 8219.513333] usb 2-1.2.3: Product: Xonar U7 [ 8219.513338] usb 2-1.2.3: Manufacturer: ASUS [ 8219.609328] input: ASUS Xonar U7 as /devices/pci0000:00/0000:00:1d.0/usb2/2-1/2-1.2/2-1.2.3/2-1.2.3:1.4/input/input29 [ 8219.609743] hid-generic 0003:1043:857C.0016: input,hidraw4: USB HID v1.00 Device [ASUS Xonar U7] on usb-0000:00:1d.0-1.2.3/input4 [ 8219.676164] cannot get ctl value: req = 0x81, wValue = 0x0, wIndex = 0x1400, type = 3 [ 8219.697280] cannot get ctl value: req = 0x81, wValue = 0x0, wIndex = 0x1400, type = 3 [ 8219.718770] cannot get ctl value: req = 0x81, wValue = 0x0, wIndex = 0x1400, type = 3 [ 8219.738130] cannot get ctl value: req = 0x81, wValue = 0x0, wIndex = 0x1400, type = 3 [ 8219.757999] cannot get ctl value: req = 0x81, wValue = 0x0, wIndex = 0x1400, type = 3 [ 8219.779861] cannot get ctl value: req = 0x81, wValue = 0x0, wIndex = 0x1400, type = 3 [ 8219.800222] cannot get ctl value: req = 0x81, wValue = 0x0, wIndex = 0x1400, type = 3 [ 8219.823964] cannot get ctl value: req = 0x81, wValue = 0x0, wIndex = 0x1400, type = 3 [ 8520.766440] cannot get ctl value: req = 0x81, wValue = 0x0, wIndex = 0x1400, type = 3 [ 8539.332352] cannot get ctl value: req = 0x81, wValue = 0x0, wIndex = 0x1400, type = 3 julius@R850:~$ cat /proc/asound/version Advanced Linux Sound Architecture Driver Version k3.8.0-25-generic. julius@R850:~$ cat /proc/asound/cards 0 [PCH ]: HDA-Intel - HDA Intel PCH HDA Intel PCH at 0xc4820000 irq 50 1 [U7 ]: USB-Audio - Xonar U7 ASUS Xonar U7 at usb-0000:00:1d.0-1.2.3, high speed julius@R850:~$ lsmod | grep snd snd_hda_codec_hdmi 36913 1 snd_hda_codec_realtek 78399 1 snd_usb_audio 140685 0 snd_usbmidi_lib 24938 1 snd_usb_audio snd_hda_intel 39619 3 snd_hda_codec 136453 3 snd_hda_codec_realtek,snd_hda_codec_hdmi,snd_hda_intel snd_hwdep 13602 2 snd_usb_audio,snd_hda_codec snd_pcm 97451 4 snd_usb_audio,snd_hda_codec_hdmi,snd_hda_codec,snd_hda_intel snd_page_alloc 18710 2 snd_pcm,snd_hda_intel snd_seq_midi 13324 0 snd_seq_midi_event 14899 1 snd_seq_midi snd_rawmidi 30180 2 snd_usbmidi_lib,snd_seq_midi snd_seq 61554 2 snd_seq_midi_event,snd_seq_midi snd_seq_device 14497 3 snd_seq,snd_rawmidi,snd_seq_midi snd_timer 29425 2 snd_pcm,snd_seq snd 68876 18 snd_hda_codec_realtek,snd_usb_audio,snd_hwdep,snd_timer,snd_hda_codec_hdmi,snd_pcm,snd_seq,snd_rawmidi,snd_usbmidi_lib,snd_hda_codec,snd_hda_intel,snd_seq_device soundcore 12680 1 snd julius@R850:~$ lsusb Bus 001 Device 002: ID 8087:0024 Intel Corp. Integrated Rate Matching Hub Bus 002 Device 002: ID 8087:0024 Intel Corp. Integrated Rate Matching Hub Bus 001 Device 001: ID 1d6b:0002 Linux Foundation 2.0 root hub Bus 002 Device 001: ID 1d6b:0002 Linux Foundation 2.0 root hub Bus 003 Device 001: ID 1d6b:0002 Linux Foundation 2.0 root hub Bus 004 Device 001: ID 1d6b:0003 Linux Foundation 3.0 root hub Bus 002 Device 021: ID 18d1:4ee1 Google Inc. Bus 002 Device 015: ID 0424:2514 Standard Microsystems Corp. USB 2.0 Hub Bus 002 Device 016: ID 046d:c245 Logitech, Inc. Bus 002 Device 017: ID 05a4:9881 Ortek Technology, Inc. Bus 002 Device 022: ID 1043:857c iCreate Technologies Corp. Bus 002 Device 020: ID 046a:0180 Cherry GmbH julius@R850:~$ dpkg -l | grep alsa ii alsa-base 1.0.25+dfsg-0ubuntu4 all ALSA driver configuration files ii alsa-utils 1.0.25-4ubuntu2 amd64 Utilities for configuring and using ALSA ii bluez-alsa:amd64 4.101-0ubuntu8b1 amd64 Bluetooth ALSA support ii gstreamer0.10-alsa:amd64 0.10.36-1.1ubuntu1 amd64 GStreamer plugin for ALSA ii gstreamer1.0-alsa:amd64 1.0.6-1 amd64 GStreamer plugin for ALSA

2 1

[alsa-devel] How to clear the ALSA audio settings remembered by system?
by Lin, Mengdong 27 Jun '13

27 Jun '13

Hi, Could anyone tell me how to clear the ALSA audio settings remembered by system? I change some audio codec settings by amixer. And it seems the ALSA has remembered these settings and apply on next boot. And these will change my test result. How can I let system forgot these changes? Many thanks Mengdong

2 2

Re: [alsa-devel] [PATCH 3/6] sound/pci:trivial: replace numeric with standard PM state macros
by Takashi Iwai 27 Jun '13

27 Jun '13

At Thu, 27 Jun 2013 20:55:11 +0800, Yijing Wang wrote: > > Use standard PM state macros PCI_Dx instead of numeric 0/1/2.. > > Signed-off-by: Yijing Wang <wangyijing(a)huawei.com> > Cc: Jaroslav Kysela <perex(a)perex.cz> > Cc: Takashi Iwai <tiwai(a)suse.de> > Cc: Jiri Kosina <trivial(a)kernel.org> > Cc: Bill Pemberton <wfp5p(a)virginia.edu> > Cc: alsa-devel(a)alsa-project.org > Cc: linux-kernel(a)vger.kernel.org Thanks, applied. Takashi > --- > sound/pci/cs4281.c | 2 +- > sound/pci/ens1370.c | 2 +- > sound/pci/ymfpci/ymfpci_main.c | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/sound/pci/cs4281.c b/sound/pci/cs4281.c > index 6a86950..2f6a4b6 100644 > --- a/sound/pci/cs4281.c > +++ b/sound/pci/cs4281.c > @@ -1312,7 +1312,7 @@ static int snd_cs4281_free(struct cs4281 *chip) > /* Sound System Power Management - Turn Everything OFF */ > snd_cs4281_pokeBA0(chip, BA0_SSPM, 0); > /* PCI interface - D3 state */ > - pci_set_power_state(chip->pci, 3); > + pci_set_power_state(chip->pci, PCI_D3hot); > > if (chip->irq >= 0) > free_irq(chip->irq, chip); > diff --git a/sound/pci/ens1370.c b/sound/pci/ens1370.c > index db2dc83..b30afd1 100644 > --- a/sound/pci/ens1370.c > +++ b/sound/pci/ens1370.c > @@ -1939,7 +1939,7 @@ static int snd_ensoniq_free(struct ensoniq *ensoniq) > #endif > if (ensoniq->irq >= 0) > synchronize_irq(ensoniq->irq); > - pci_set_power_state(ensoniq->pci, 3); > + pci_set_power_state(ensoniq->pci, PCI_D3hot); > __hw_end: > #ifdef CHIP1370 > if (ensoniq->dma_bug.area) > diff --git a/sound/pci/ymfpci/ymfpci_main.c b/sound/pci/ymfpci/ymfpci_main.c > index 22056c5..d591c15 100644 > --- a/sound/pci/ymfpci/ymfpci_main.c > +++ b/sound/pci/ymfpci/ymfpci_main.c > @@ -2258,7 +2258,7 @@ static int snd_ymfpci_free(struct snd_ymfpci *chip) > /* FIXME: temporarily disabled, otherwise we cannot fire up > * the chip again unless reboot. ACPI bug? > */ > - pci_set_power_state(chip->pci, 3); > + pci_set_power_state(chip->pci, PCI_D3hot); > #endif > > #ifdef CONFIG_PM_SLEEP > -- > 1.7.1 > >

1 0

Re: [alsa-devel] [PATCH 2/2] ASoC: tegra20-ac97: Convert to devm_ioremap_resource()
by Mark Brown 27 Jun '13

27 Jun '13

On Thu, Jun 27, 2013 at 12:22:12PM +0200, Thierry Reding wrote: > Can you please remove this error message as well, please? A message to > the same effect is already output by devm_ioremap_resource(). Other than > that, looks good: Too late, send an incremental patch please.

1 0

[alsa-devel] [RFC PATCH v2 00/12] ARM: s3c64xx: Let amba-pl08x driver handle DMA
by Tomasz Figa 27 Jun '13

27 Jun '13

This is another version of my patches extending support of amba-pl08x DMA engine driver to PL080S DMA engine (PL080 modified by Samsung) found in Samsung S3C64xx SoCs. Changes since RFC v1: - Returned to original way of storing quirks as booleans, as suggested by Russell, Linus and Arnd. - Added reg_config field to pl08x_phy_chan struct, which stores variant-specific address of channel config register, as suggested by Russell. - Simplified handling of extended maximum transfer size of PL080S (no more conditional passing of 0 as length to pl08x_cctl_bits()). - Reworked LLI handling in the driver to stop casting arbitrary memory to a struct and allow different word count of LLI entry, as suggested by Linus. - Removed AMBA ID override from S3C64xx PL080 initialization code. - Fixed brokenness of Samsung DMA wrapper API, which caused cyclic buffers to be queued multiple times when DMA engine is used. - Included patch adding clock aliases for DMA engines (depends on Common Clock Framework driver for S3C64xx). - Fixed several minor stylistic issues. For reference, here is the original description of the series: One of the biggest roadblocks on the way of S3C64xx to DeviceTree support is its DMA driver, which is completely platform-specific and provides private API (s3c-dma), not even saying that its design is completely against multiplatform-awareness. The DMA controller present on this SoC series is a custom variant of ARM PrimeCell PL080 modified by Samsung to add some extra features. It is mostly compatible with original PL080, except: - CH_CONTROL2 register is added between CH_CONTROL and CH_CONFIG, - offset of CH_CONFIG register is different, - transfer size field is moved from CH_CONTROL to CH_CONTROL2, - transfer size field is extended to 24 bits, allowing much bigger single transfer, - LLI consists of one more word, to account for CH_CONTROL2 register. Since all the rest is fully compatible with standard PL080 there is no point in having separate driver just for this single variant, so I decided to look into adding support for it to the amba-pl08x driver. There was already some attempt to achieve this before, but this was before Russel's big rework of the driver to use virtual channels, making the old patches being not much of use. This RFC series is a proof of concept that I managed to make during last days of hacking. Except one patch adding clkdev lookup to clock driver (which is being replaced with a CCF-compliant driver ATM), this is enough to get memcpy and slave transfers to work on S3C64xx. I have tested this on Mini6410 and SMDK6410 boards using dmatest for memcpy and Samsung I2S with madplay/aplay for slave transfers. Unfortunately I do not have access to other platforms with PL08x so I could not test for any regressions introduced on them. Credits for two patches go to Alban Bedel, who made a series fixing this driver to make it usable with audio drivers. I rebased his patches on top of mine and corrected coding style a bit. OK, that's all. Any comments are welcome. Feel free to start throwing eggs and tomatoes if you find this awful, but I won't be upset if I get some Tested-by or Acked-by as well. ;) Alban Bedel (2): dmaengine: PL08x: Fix reading the byte count in cctl dmaengine: PL08x: Add cyclic transfer support Tomasz Figa (10): dmaengine: PL08x: Refactor pl08x_getbytes_chan() to lower indentation dmaengine: PL08x: Add support for different offset of CONFIG register dmaengine: PL08x: Rework LLI handling to be less fragile dmaengine: PL08x: Add support for PL080S variant dmaengine: PL08x: Add support for different maximum transfer size ASoC: Samsung: Do not queue cyclic buffers multiple times clk: samsung: s3c64xx: Add aliases for DMA clocks spi: s3c64xx: Do not require legacy DMA API in case of S3C64XX ASoC: Samsung: Do not require legacy DMA API in case of S3C64XX ARM: s3c64xx: Add support for DMA using generic amba-pl08x driver arch/arm/Kconfig | 1 + arch/arm/mach-s3c64xx/Kconfig | 8 +- arch/arm/mach-s3c64xx/Makefile | 1 + arch/arm/mach-s3c64xx/common.h | 5 + arch/arm/mach-s3c64xx/include/mach/dma.h | 65 +++++ arch/arm/mach-s3c64xx/pl080.c | 244 ++++++++++++++++++ arch/arm/plat-samsung/s3c-dma-ops.c | 13 +- drivers/clk/samsung/clk-s3c64xx.c | 2 + drivers/dma/amba-pl08x.c | 426 ++++++++++++++++++++++--------- drivers/spi/Kconfig | 2 +- include/linux/amba/pl080.h | 1 + sound/soc/samsung/Kconfig | 2 +- sound/soc/samsung/dma.c | 7 + 13 files changed, 651 insertions(+), 126 deletions(-) create mode 100644 arch/arm/mach-s3c64xx/pl080.c -- 1.8.2.1

5 29