January 2014 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] Surround sound not working on ALC887 based motherboard
by Olivier Crête 14 Jan '14

14 Jan '14

Hello, I have a Asus P5G41T-M LX Plus motherboard which is ICH7 + Realtek ALC887-VD, alsa only lets me access the first 2 channels (stereo), but not the 6 other ones. It works fine in Windows. Trying to run this after killing pulseaudio fails: $ aplay -D surround40:0 -f S16_LE -r 44100 -c 4 /dev/zero -v Playing raw data '/dev/zero' : Signed 16 bit Little Endian, Rate 44100 Hz, Channels 4 aplay: set_params:1239: Channels count non available Output from alsa-info: http://www.alsa-project.org/db/?f=fe378d28f0dbb5a427b005d20866a762fd37d31a -- Olivier Crête olivier.crete(a)ocrete.ca

2 3

[alsa-devel] [PATCH] ALSA: hda - Prevent speaker from entering automute on some AIO models
by Hui Wang 14 Jan '14

14 Jan '14

On some AIO (All In One) models with the codec alc668 (Vendor ID: 0x10ec0668) on it, when we plug a headphone into the jack, the system will switch the output to headphone and set the speaker to automute as well as change the speaker Pin-ctls from 0x40 to 0x00, this will bring loud noise to the headphone. I tried to disable the corresponding EAPD, but it did not help to eliminate the noise. So far, the only way to eliminate the noise is preventing the speaker from entering automute. BugLink: https://bugs.launchpad.net/bugs/1268468 Cc: David Henningsson <david.henningsson(a)canonical.com> Cc: stable(a)vger.kernel.org Signed-off-by: Hui Wang <hui.wang(a)canonical.com> --- This problem has been reported on three Dell AIO models. sound/pci/hda/patch_realtek.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 6a705a8..27111d0 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -3589,6 +3589,17 @@ static void alc_fixup_headset_mode_alc255(struct hda_codec *codec, alc_fixup_headset_mode(codec, fix, action); } +static void alc_fixup_spk_automute_alc668(struct hda_codec *codec, + const struct hda_fixup *fix, int action) +{ + if (action == HDA_FIXUP_ACT_PRE_PROBE) { + struct alc_spec *spec = codec->spec; + /* On some AIO (All In One) machines, setting the speaker + to audomute will bring the noise to the headphone. */ + spec->gen.suppress_auto_mute = 1; + } +} + static void alc_fixup_headset_mode_alc668(struct hda_codec *codec, const struct hda_fixup *fix, int action) { @@ -4935,6 +4946,7 @@ enum { ALC662_FIXUP_BASS_CHMAP, ALC662_FIXUP_BASS_1A, ALC662_FIXUP_BASS_1A_CHMAP, + ALC668_FIXUP_AUTO_MUTE, }; static const struct hda_fixup alc662_fixups[] = { @@ -5095,6 +5107,12 @@ static const struct hda_fixup alc662_fixups[] = { .type = HDA_FIXUP_FUNC, .v.func = alc_fixup_inv_dmic_0x12, }, + [ALC668_FIXUP_AUTO_MUTE] = { + .type = HDA_FIXUP_FUNC, + .v.func = alc_fixup_spk_automute_alc668, + .chained = true, + .chain_id = ALC668_FIXUP_DELL_MIC_NO_PRESENCE + }, [ALC668_FIXUP_DELL_MIC_NO_PRESENCE] = { .type = HDA_FIXUP_PINS, .v.pins = (const struct hda_pintbl[]) { @@ -5140,11 +5158,11 @@ static const struct snd_pci_quirk alc662_fixup_tbl[] = { SND_PCI_QUIRK(0x1025, 0x038b, "Acer Aspire 8943G", ALC662_FIXUP_ASPIRE), SND_PCI_QUIRK(0x1028, 0x05d8, "Dell", ALC668_FIXUP_DELL_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1028, 0x05db, "Dell", ALC668_FIXUP_DELL_MIC_NO_PRESENCE), - SND_PCI_QUIRK(0x1028, 0x0623, "Dell", ALC668_FIXUP_DELL_MIC_NO_PRESENCE), - SND_PCI_QUIRK(0x1028, 0x0624, "Dell", ALC668_FIXUP_DELL_MIC_NO_PRESENCE), + SND_PCI_QUIRK(0x1028, 0x0623, "Dell", ALC668_FIXUP_AUTO_MUTE), + SND_PCI_QUIRK(0x1028, 0x0624, "Dell", ALC668_FIXUP_AUTO_MUTE), SND_PCI_QUIRK(0x1028, 0x0625, "Dell", ALC668_FIXUP_DELL_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1028, 0x0626, "Dell", ALC668_FIXUP_DELL_MIC_NO_PRESENCE), - SND_PCI_QUIRK(0x1028, 0x0628, "Dell", ALC668_FIXUP_DELL_MIC_NO_PRESENCE), + SND_PCI_QUIRK(0x1028, 0x0628, "Dell", ALC668_FIXUP_AUTO_MUTE), SND_PCI_QUIRK(0x103c, 0x1632, "HP RP5800", ALC662_FIXUP_HP_RP5800), SND_PCI_QUIRK(0x1043, 0x11cd, "Asus N550", ALC662_FIXUP_BASS_1A_CHMAP), SND_PCI_QUIRK(0x1043, 0x1477, "ASUS N56VZ", ALC662_FIXUP_BASS_CHMAP), -- 1.8.1.2

2 3

[alsa-devel] Possible regression of Mackerel/ASoC Simple Card in next-20130107
by Simon Horman 14 Jan '14

14 Jan '14

Hi Morimoto-san, Hi all, I noticed that next-20130107 does not boot on the Mackerel board does not boot using its defconfig. The boot log is as follows. I have not investigated any further as typically when I investigate problems in next they turn out to be known problems. Linux version 3.13.0-rc7-next-20140107-00005-gad2dc8a (horms(a)ayumi.isobedori.kobe.vergenet.net) (gcc version 4.7.2 (Debian 4.7.2-4) ) #771 Wed Jan 8 12:16:31 JST 2014 CPU: ARMv7 Processor [413fc081] revision 1 (ARMv7), cr=10c53c7d CPU: PIPT / VIPT nonaliasing data cache, VIPT aliasing instruction cache Machine model: Mackerel (AP4 EVM 2nd) Memory policy: Data cache writeback CPU: All CPU(s) started in SVC mode. bootconsole [early_ttySC0] enabled Built 1 zonelists in Zone order, mobility grouping off. Total pages: 60960 Kernel command line: console=tty0, console=ttySC0,115200 earlyprintk=sh-sci.0,115200 root=/dev/nfs nfsroot=,tcp,v3 ip=dhcp mem=240m rw PID hash table entries: 1024 (order: 0, 4096 bytes) Dentry cache hash table entries: 32768 (order: 5, 131072 bytes) Inode-cache hash table entries: 16384 (order: 4, 65536 bytes) Memory: 238412K/245760K available (3419K kernel code, 200K rwdata, 1072K rodata, 148K init, 174K bss, 7348K reserved) Virtual kernel memory layout: vector : 0xffff0000 - 0xffff1000 ( 4 kB) fixmap : 0xfff00000 - 0xfffe0000 ( 896 kB) vmalloc : 0xcf800000 - 0xff000000 ( 760 MB) lowmem : 0xc0000000 - 0xcf000000 ( 240 MB) modules : 0xbf000000 - 0xc0000000 ( 16 MB) .text : 0xc0008000 - 0xc046bf6c (4496 kB) .init : 0xc046c000 - 0xc04910d0 ( 149 kB) .data : 0xc0492000 - 0xc04c41a0 ( 201 kB) .bss : 0xc04c41a0 - 0xc04efb08 ( 175 kB) NR_IRQS:16 nr_irqs:16 16 intc: Registered controller 'sh7372-intca' with 108 IRQs intc: Registered controller 'sh7372-intca-irq-lo' with 16 IRQs intc: Registered controller 'sh7372-intca-irq-hi' with 16 IRQs intc: Registered controller 'sh7372-intcs' with 61 IRQs sched_clock: 32 bits at 128 Hz, resolution 7812500ns, wraps every 16777216000000000ns Console: colour dummy device 80x30 console [tty0] enabled sh_tmu.0: used for clock events sh_tmu.0: used for periodic clock events sh_tmu.1: used as clock source Calibrating delay loop... 805.59 BogoMIPS (lpj=3145728) pid_max: default: 32768 minimum: 301 Mount-cache hash table entries: 512 CPU: Testing write buffer coherency: ok Setting up static identity map for 0x4035d778 - 0x4035d7d0 VFP support v0.3: implementor 41 architecture 3 part 30 variant c rev 3 pinctrl core: initialized pinctrl subsystem regulator-dummy: no parameters NET: Registered protocol family 16 DMA: preallocated 256 KiB pool for atomic coherent allocations sh-pfc pfc-sh7372: sh7372_pfc handling gpio 0 -> 190 sh-pfc pfc-sh7372: sh7372_pfc support registered No ATAGs? bio: create slab <bio-0> at 0 fixed-1.8V: at 1800 mV fixed-3.3V: at 3300 mV fixed-dummy: no parameters SCSI subsystem initialized usbcore: registered new interface driver usbfs usbcore: registered new interface driver hub usbcore: registered new device driver usb i2c-sh_mobile i2c-sh_mobile.0: I2C adapter 0 with bus speed 100000 Hz (L/H=f0/ce) i2c-sh_mobile i2c-sh_mobile.1: I2C adapter 1 with bus speed 100000 Hz (L/H=f0/ce) sh_cmt sh_cmt.2: used for clock events sh_cmt sh_cmt.2: used as clock source sh_tmu sh_tmu.0: kept as earlytimer sh_tmu sh_tmu.1: kept as earlytimer Advanced Linux Sound Architecture Driver Initialized. Switched to clocksource sh_tmu.1 NET: Registered protocol family 2 TCP established hash table entries: 2048 (order: 1, 8192 bytes) TCP bind hash table entries: 2048 (order: 1, 8192 bytes) TCP: Hash tables configured (established 2048 bind 2048) TCP: reno registered UDP hash table entries: 256 (order: 0, 4096 bytes) UDP-Lite hash table entries: 256 (order: 0, 4096 bytes) NET: Registered protocol family 1 RPC: Registered named UNIX socket transport module. RPC: Registered udp transport module. RPC: Registered tcp transport module. RPC: Registered tcp NFSv4.1 backchannel transport module. NFS: Registering the id_resolver key type Key type id_resolver registered Key type id_legacy registered nfs4filelayout_init: NFSv4 File Layout Driver Registering... msgmni has been set to 465 io scheduler noop registered (default) sh-mobile-hdmi sh-mobile-hdmi: Detected HDMI controller 0x0:0x0 Console: switching to colour frame buffer device 100x30 sh_mobile_lcdc_fb sh_mobile_lcdc_fb.0: registered sh_mobile_lcdc_fb.0/mainlcd as 800x480 16bpp. sh_mobile_lcdc_fb sh_mobile_lcdc_fb.1: registered sh_mobile_lcdc_fb.1/mainlcd as 1280x720 16bpp. SuperH (H)SCI(F) driver initialized sh-sci.0: ttySC0 at MMIO 0xe6c40000 (irq = 80, base_baud = 0) is a scifa console [ttySC0] enabled console [ttySC0] enabled bootconsole [early_ttySC0] disabled bootconsole [early_ttySC0] disabled sh-sci.1: ttySC1 at MMIO 0xe6c50000 (irq = 81, base_baud = 0) is a scifa sh-sci.2: ttySC2 at MMIO 0xe6c60000 (irq = 82, base_baud = 0) is a scifa sh-sci.3: ttySC3 at MMIO 0xe6c70000 (irq = 83, base_baud = 0) is a scifa sh-sci.4: ttySC4 at MMIO 0xe6c80000 (irq = 89, base_baud = 0) is a scifa sh-sci.5: ttySC5 at MMIO 0xe6cb0000 (irq = 90, base_baud = 0) is a scifa sh-sci.6: ttySC6 at MMIO 0xe6c30000 (irq = 91, base_baud = 0) is a scifb physmap platform flash device: 08000000 at 20000000 physmap-flash.0: Found 1 x16 devices at 0x0 in 16-bit bank. Manufacturer ID 0x000089 Chip ID 0x0088b1 Intel/Sharp Extended Query Table at 0x010A Intel/Sharp Extended Query Table at 0x010A Intel/Sharp Extended Query Table at 0x010A Intel/Sharp Extended Query Table at 0x010A Intel/Sharp Extended Query Table at 0x010A Using buffer write method Using auto-unlock on power-up/resume cfi_cmdset_0001: Erase suspend on write enabled Creating 5 MTD partitions on "physmap-flash.0": 0x000000000000-0x000000080000 : "loader" 0x000000080000-0x000000100000 : "bootenv" 0x000000100000-0x000000900000 : "kernel_ro" 0x000000900000-0x000001100000 : "kernel" 0x000001100000-0x000008000000 : "data" smsc911x: Driver version 2008-10-21 smsc911x smsc911x (unregistered net_device): couldn't get clock -2 libphy: smsc911x-mdio: probed smsc911x smsc911x eth0: attached PHY driver [Generic PHY] (mii_bus:phy_addr=smsc911x-fffffff:01, irq=-1) smsc911x smsc911x eth0: MAC Address: 74:90:50:00:00:ac usbcore: registered new interface driver usb-storage renesas_usbhs renesas_usbhs.0: host probed renesas_usbhs renesas_usbhs.0: gadget probed renesas_usbhs renesas_usbhs.0: probed renesas_usbhs renesas_usbhs.1: host probed renesas_usbhs renesas_usbhs.1: gadget probed renesas_usbhs renesas_usbhs.1: probed renesas_usbhs renesas_usbhs.1: USB Host Controller renesas_usbhs renesas_usbhs.1: new USB bus registered, assigned bus number 1 mousedev: PS/2 mouse device common for all mice hub 1-0:1.0: USB hub found hub 1-0:1.0: 1 port detected sh_mobile_sdhi sh_mobile_sdhi.0: mmc0 base at 0xe6850000 clock rate 99 MHz sh_mobile_sdhi sh_mobile_sdhi.2: mmc1 base at 0xe6870000 clock rate 99 MHz sh_mmcif sh_mmcif.0: driver version 2010-04-28 usbcore: registered new interface driver usbhid usbhid: USB HID core driver Unable to handle kernel NULL pointer dereference at virtual address 0000008c pgd = c0004000 [0000008c] *pgd=00000000 Internal error: Oops: 805 [#1] ARM Modules linked in: CPU: 0 PID: 1 Comm: swapper Not tainted 3.13.0-rc7-next-20140107-00005-gad2dc8a #771 task: c8041bc0 ti: c8042000 task.ti: c8042000 PC is at asoc_simple_card_probe+0x44/0x2a4 LR is at platform_drv_probe+0x20/0x50 pc : [<c02b1648>] lr : [<c01f33b0>] psr: 60000113 sp : c8043da0 ip : c8043dd0 fp : c8043dcc r10: c048a278 r9 : c8042000 r8 : 00000000 r7 : 00000000 r6 : c04a5a50 r5 : c04bf58c r4 : c04a5a40 r3 : c02b1604 r2 : 00000000 r1 : 00000000 r0 : c04a5a40 Flags: nZCv IRQs on FIQs on Mode SVC_32 ISA ARM Segment kernel Control: 10c5387d Table: 40004019 DAC: 00000015 Process swapper (pid: 1, stack limit = 0xc8042238) Stack: (0xc8043da0 to 0xc8044000) 3da0: 00000000 00000000 c04a5a50 c04bf58c 00000000 c04bf58c c0482c2c c048a278 3dc0: c8043de4 c8043dd0 c01f33b0 c02b1610 c04e4af0 c04a5a50 c8043e04 c8043de8 3de0: c01f1e28 c01f339c c04a5a50 c04bf58c c04a5a84 00000000 c8043e24 c8043e08 3e00: c01f1fd4 c01f1d20 c807f5bc 00000000 c04bf58c c01f1f40 c8043e4c c8043e28 3e20: c01f057c c01f1f4c c8030e4c c807f5b0 c839b6b4 c04bf58c c839b680 c04b6f30 3e40: c8043e5c c8043e50 c01f1934 c01f052c c8043e84 c8043e60 c01f1538 c01f191c 3e60: c0412b28 c8043e70 c04bf58c 00000006 c04c41c0 00000070 c8043e9c c8043e88 3e80: c01f265c c01f1468 c0491070 00000006 c8043eac c8043ea0 c01f3304 c01f25e8 3ea0: c8043ebc c8043eb0 c0482c44 c01f32c0 c8043f4c c8043ec0 c00094e8 c0482c38 3ec0: 00000264 c046ab4c 00000000 00000000 c8043efc c8043ee0 c8043f04 c8043ee8 3ee0: c8043f00 c8043ef0 c046c4d0 c06f0daf c0386f80 00000070 c8043f4c c8043f08 3f00: c00348bc c046c4dc c048a250 00000006 00000006 c046a44c 00000000 c043536c 3f20: c8043f4c c0491070 00000006 c04c41c0 00000070 c046c4d0 c048a26c c048a278 3f40: c8043f94 c8043f50 c046cb50 c0009400 00000006 00000006 c046c4d0 16a3cbde 3f60: a0080220 6244bd2d 21509030 00000000 c035765c 00000000 00000000 00000000 3f80: 00000000 00000000 c8043fac c8043f98 c035766c c046ca6c 00000000 00000000 3fa0: 00000000 c8043fb0 c000f478 c0357668 00000000 00000000 00000000 00000000 3fc0: 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 3fe0: 00000000 00000000 00000000 00000000 00000013 00000000 00000002 54f1c041 Backtrace: [<c02b1604>] (asoc_simple_card_probe) from [<c01f33b0>] (platform_drv_probe+0x20/0x50) r10:c048a278 r8:c0482c2c r7:c04bf58c r6:00000000 r5:c04bf58c r4:c04a5a50 [<c01f3390>] (platform_drv_probe) from [<c01f1e28>] (driver_probe_device+0x114/0x22c) r5:c04a5a50 r4:c04e4af0 [<c01f1d14>] (driver_probe_device) from [<c01f1fd4>] (__driver_attach+0x94/0x98) r7:00000000 r6:c04a5a84 r5:c04bf58c r4:c04a5a50 [<c01f1f40>] (__driver_attach) from [<c01f057c>] (bus_for_each_dev+0x5c/0x90) r6:c01f1f40 r5:c04bf58c r4:00000000 r3:c807f5bc [<c01f0520>] (bus_for_each_dev) from [<c01f1934>] (driver_attach+0x24/0x28) r6:c04b6f30 r5:c839b680 r4:c04bf58c [<c01f1910>] (driver_attach) from [<c01f1538>] (bus_add_driver+0xdc/0x1d8) [<c01f145c>] (bus_add_driver) from [<c01f265c>] (driver_register+0x80/0xfc) r7:00000070 r6:c04c41c0 r5:00000006 r4:c04bf58c [<c01f25dc>] (driver_register) from [<c01f3304>] (__platform_driver_register+0x50/0x64) r5:00000006 r4:c0491070 [<c01f32b4>] (__platform_driver_register) from [<c0482c44>] (asoc_simple_card_init+0x18/0x20) [<c0482c2c>] (asoc_simple_card_init) from [<c00094e8>] (do_one_initcall+0xf4/0x150) [<c00093f4>] (do_one_initcall) from [<c046cb50>] (kernel_init_freeable+0xf0/0x1b8) r10:c048a278 r9:c048a26c r8:c046c4d0 r7:00000070 r6:c04c41c0 r5:00000006 r4:c0491070 [<c046ca60>] (kernel_init_freeable) from [<c035766c>] (kernel_init+0x10/0x118) r10:00000000 r9:00000000 r8:00000000 r7:00000000 r6:00000000 r5:c035765c r4:00000000 [<c035765c>] (kernel_init) from [<c000f478>] (ret_from_fork+0x14/0x3c) r4:00000000 r3:00000000 Code: ebff5df2 e1500007 1a000031 e3a07000 (e587608c) ---[ end trace fa979cfc03b9a020 ]--- Kernel panic - not syncing: Attempted to kill init! exitcode=0x0000000b

4 3

[alsa-devel] On mixer controls naming
by R. Lemos 14 Jan '14

14 Jan '14

Hi, I'm trying to write a new driver for a virtual sound card. It isn't actually a sound card, but only a software solution to control volume and bass of an external device (using SPI and GPIO). So it only has a mixer (no pcm or capture subdevices). I could successfully configure two controls "Master Playback Switch" and "Master Playback Volume". Alsamixer shows them correctly under "Playback" view (and very nicely it joined them together to form a single composite control "Master") The other control I've named "Tone Control - Bass", as indicated in writing-an-alsa-driver.pdf. But alsamixer shows it under both "Playback" and "Capture" views. How can I restrict this latter control to just playback? -- []'s Rodrigo

2 4

[alsa-devel] [PATCH v3] ASoC: imx: Allow using sound with DT descriptions only
by Alexander Shiyan 13 Jan '14

13 Jan '14

This patch allow using generic sound cards/codecs based on DT description. Signed-off-by: Alexander Shiyan <shc_work(a)mail.ru> --- sound/soc/fsl/Kconfig | 43 +++++++++++++++++-------------------------- 1 file changed, 17 insertions(+), 26 deletions(-) diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig index 1c7b3b7..8249000 100644 --- a/sound/soc/fsl/Kconfig +++ b/sound/soc/fsl/Kconfig @@ -7,6 +7,7 @@ config SND_SOC_FSL_SSI config SND_SOC_FSL_SPDIF tristate + select REGMAP_MMIO config SND_SOC_FSL_UTILS tristate @@ -103,27 +104,32 @@ config SND_MPC52xx_SOC_EFIKA endif # SND_POWERPC_SOC -menuconfig SND_IMX_SOC - tristate "SoC Audio for Freescale i.MX CPUs" - depends on ARCH_MXC || COMPILE_TEST - help - Say Y or M if you want to add support for codecs attached to - the i.MX CPUs. - -if SND_IMX_SOC - -config SND_SOC_IMX_SSI +config SND_SOC_IMX_AUDMUX tristate config SND_SOC_IMX_PCM_FIQ tristate select FIQ + default y if SND_SOC_IMX_SSI=y || SND_SOC_FSL_SSI=y config SND_SOC_IMX_PCM_DMA tristate select SND_SOC_GENERIC_DMAENGINE_PCM + default y if SND_SOC_IMX_SSI=y || SND_SOC_FSL_SSI=y -config SND_SOC_IMX_AUDMUX +menuconfig SND_IMX_SOC + tristate "SoC Audio for Freescale i.MX CPUs" + depends on ARCH_MXC || COMPILE_TEST + select SND_SOC_FSL_SSI if OF + select SND_SOC_IMX_AUDMUX + select SND_SOC_IMX_PCM_DMA + help + Say Y or M if you want to add support for codecs attached to + the i.MX CPUs. + +if SND_IMX_SOC + +config SND_SOC_IMX_SSI tristate config SND_MXC_SOC_WM1133_EV1 @@ -131,7 +137,6 @@ config SND_MXC_SOC_WM1133_EV1 depends on MACH_MX31ADS_WM1133_EV1 select SND_SOC_WM8350 select SND_SOC_IMX_PCM_FIQ - select SND_SOC_IMX_AUDMUX select SND_SOC_IMX_SSI help Enable support for audio on the i.MX31ADS with the WM1133-EV1 @@ -141,8 +146,6 @@ config SND_SOC_MX27VIS_AIC32X4 tristate "SoC audio support for Visstrim M10 boards" depends on MACH_IMX27_VISSTRIM_M10 && I2C select SND_SOC_TLV320AIC32X4 - select SND_SOC_IMX_PCM_DMA - select SND_SOC_IMX_AUDMUX select SND_SOC_IMX_SSI help Say Y if you want to add support for SoC audio on Visstrim SM10 @@ -154,7 +157,6 @@ config SND_SOC_PHYCORE_AC97 select SND_SOC_AC97_BUS select SND_SOC_WM9712 select SND_SOC_IMX_PCM_FIQ - select SND_SOC_IMX_AUDMUX select SND_SOC_IMX_SSI help Say Y if you want to add support for SoC audio on Phytec phyCORE @@ -169,7 +171,6 @@ config SND_SOC_EUKREA_TLV320 depends on I2C select SND_SOC_TLV320AIC23 select SND_SOC_IMX_PCM_FIQ - select SND_SOC_IMX_AUDMUX select SND_SOC_IMX_SSI help Enable I2S based access to the TLV320AIC23B codec attached @@ -179,9 +180,6 @@ config SND_SOC_IMX_WM8962 tristate "SoC Audio support for i.MX boards with wm8962" depends on OF && I2C select SND_SOC_WM8962 - select SND_SOC_IMX_PCM_DMA - select SND_SOC_IMX_AUDMUX - select SND_SOC_FSL_SSI help Say Y if you want to add support for SoC audio on an i.MX board with a wm8962 codec. @@ -190,18 +188,13 @@ config SND_SOC_IMX_SGTL5000 tristate "SoC Audio support for i.MX boards with sgtl5000" depends on OF && I2C select SND_SOC_SGTL5000 - select SND_SOC_IMX_PCM_DMA - select SND_SOC_IMX_AUDMUX - select SND_SOC_FSL_SSI help Say Y if you want to add support for SoC audio on an i.MX board with a sgtl5000 codec. config SND_SOC_IMX_SPDIF tristate "SoC Audio support for i.MX boards with S/PDIF" - select SND_SOC_IMX_PCM_DMA select SND_SOC_FSL_SPDIF - select REGMAP_MMIO help SoC Audio support for i.MX boards with S/PDIF Say Y if you want to add support for SoC audio on an i.MX board with @@ -211,8 +204,6 @@ config SND_SOC_IMX_MC13783 tristate "SoC Audio support for I.MX boards with mc13783" depends on MFD_MC13XXX && ARM select SND_SOC_IMX_SSI - select SND_SOC_IMX_AUDMUX select SND_SOC_MC13783 - select SND_SOC_IMX_PCM_DMA endif # SND_IMX_SOC -- 1.8.3.2

3 5

[alsa-devel] [PATCH] ASoC: simple-card: use snd_soc_card_set/get_drvdata
by Xiubo Li 13 Jan '14

13 Jan '14

Remove asoc_simple_get_card_info macro and use snd_soc_card_set_drvdata and snd_soc_card_get_drvdata instead. Signed-off-by: Xiubo Li <Li.Xiubo(a)freescale.com> --- sound/soc/generic/simple-card.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c index dbd93cc..c025b6d 100644 --- a/sound/soc/generic/simple-card.c +++ b/sound/soc/generic/simple-card.c @@ -14,9 +14,6 @@ #include <linux/module.h> #include <sound/simple_card.h> -#define asoc_simple_get_card_info(p) \ - container_of(p->dai_link, struct asoc_simple_card_info, snd_link) - static int __asoc_simple_card_dai_init(struct snd_soc_dai *dai, struct asoc_simple_dai *set, unsigned int daifmt) @@ -41,7 +38,8 @@ static int __asoc_simple_card_dai_init(struct snd_soc_dai *dai, static int asoc_simple_card_dai_init(struct snd_soc_pcm_runtime *rtd) { - struct asoc_simple_card_info *info = asoc_simple_get_card_info(rtd); + struct asoc_simple_card_info *info = + snd_soc_card_get_drvdata(rtd->card); struct snd_soc_dai *codec = rtd->codec_dai; struct snd_soc_dai *cpu = rtd->cpu_dai; unsigned int daifmt = info->daifmt; @@ -268,6 +266,8 @@ static int asoc_simple_card_probe(struct platform_device *pdev) cinfo->snd_card.dai_link = &cinfo->snd_link; cinfo->snd_card.num_links = 1; + snd_soc_card_set_drvdata(&cinfo->snd_card, cinfo); + return devm_snd_soc_register_card(&pdev->dev, &cinfo->snd_card); } -- 1.8.4

2 1

[alsa-devel] [PATCH] ASoC: fsl-sai: Add device tree nodes and its availiable check
by Xiubo Li 13 Jan '14

13 Jan '14

SAIs that are not connected on the board should have a status = "disabled" property in their device tree nodes. Signed-off-by: Xiubo Li <Li.Xiubo(a)freescale.com> --- sound/soc/fsl/fsl_sai.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c index cdd3fa8..6b2ab91 100644 --- a/sound/soc/fsl/fsl_sai.c +++ b/sound/soc/fsl/fsl_sai.c @@ -404,6 +404,9 @@ static int fsl_sai_probe(struct platform_device *pdev) struct resource *res; int ret; + if (!np || !of_device_is_available(np)) + return -ENODEV; + sai = devm_kzalloc(&pdev->dev, sizeof(*sai), GFP_KERNEL); if (!sai) return -ENOMEM; -- 1.8.4

3 3

[alsa-devel] [PATCH] ALSA: hda - Apply codec power_filter to FG nodes
by Takashi Iwai 13 Jan '14

13 Jan '14

Apply the codec->power_filter to the FG nodes in general for reducing hackish set_power_state ops override in patch_sigmatel.c. Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/hda/hda_codec.c | 12 +++++++++--- sound/pci/hda/hda_generic.c | 5 +++-- sound/pci/hda/hda_generic.h | 3 +++ sound/pci/hda/patch_sigmatel.c | 36 ++++++++++++------------------------ 4 files changed, 27 insertions(+), 29 deletions(-) diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index ab2a991d916f..ec4536c8d8d4 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -3927,6 +3927,8 @@ unsigned int snd_hda_codec_eapd_power_filter(struct hda_codec *codec, hda_nid_t nid, unsigned int power_state) { + if (nid == codec->afg || nid == codec->mfg) + return power_state; if (power_state == AC_PWRST_D3 && get_wcaps_type(get_wcaps(codec, nid)) == AC_WID_PIN && (snd_hda_query_pin_caps(codec, nid) & AC_PINCAP_EAPD)) { @@ -3965,9 +3967,13 @@ static unsigned int hda_set_power_state(struct hda_codec *codec, codec->patch_ops.set_power_state(codec, fg, power_state); else { - snd_hda_codec_read(codec, fg, flags, - AC_VERB_SET_POWER_STATE, - power_state); + state = power_state; + if (codec->power_filter) + state = codec->power_filter(codec, fg, state); + if (state == power_state || power_state != AC_PWRST_D3) + snd_hda_codec_read(codec, fg, flags, + AC_VERB_SET_POWER_STATE, + state); snd_hda_codec_set_power_to_all(codec, fg, power_state); } state = hda_sync_power_state(codec, fg, power_state); diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c index 7513089c8985..8321a97d5c05 100644 --- a/sound/pci/hda/hda_generic.c +++ b/sound/pci/hda/hda_generic.c @@ -4312,11 +4312,11 @@ static int check_auto_mic_availability(struct hda_codec *codec) } /* power_filter hook; make inactive widgets into power down */ -static unsigned int snd_hda_gen_path_power_filter(struct hda_codec *codec, +unsigned int snd_hda_gen_path_power_filter(struct hda_codec *codec, hda_nid_t nid, unsigned int power_state) { - if (power_state != AC_PWRST_D0) + if (power_state != AC_PWRST_D0 || nid == codec->afg) return power_state; if (get_wcaps_type(get_wcaps(codec, nid)) >= AC_WID_POWER) return power_state; @@ -4324,6 +4324,7 @@ static unsigned int snd_hda_gen_path_power_filter(struct hda_codec *codec, return power_state; return AC_PWRST_D3; } +EXPORT_SYMBOL_GPL(snd_hda_gen_path_power_filter); /* mute all aamix inputs initially; parse up to the first leaves */ static void mute_all_mixer_nid(struct hda_codec *codec, hda_nid_t mix) diff --git a/sound/pci/hda/hda_generic.h b/sound/pci/hda/hda_generic.h index 0929a06df812..07f767231c9f 100644 --- a/sound/pci/hda/hda_generic.h +++ b/sound/pci/hda/hda_generic.h @@ -335,5 +335,8 @@ void snd_hda_gen_update_outputs(struct hda_codec *codec); #ifdef CONFIG_PM int snd_hda_gen_check_power_status(struct hda_codec *codec, hda_nid_t nid); #endif +unsigned int snd_hda_gen_path_power_filter(struct hda_codec *codec, + hda_nid_t nid, + unsigned int power_state); #endif /* __SOUND_HDA_GENERIC_H */ diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c index 088a5afbd1b9..6998cf29b9bc 100644 --- a/sound/pci/hda/patch_sigmatel.c +++ b/sound/pci/hda/patch_sigmatel.c @@ -368,6 +368,17 @@ static int stac_vrefout_set(struct hda_codec *codec, return 1; } +/* prevent codec AFG to D3 state when vref-out pin is used for mute LED */ +/* this hook is set in stac_setup_gpio() */ +static unsigned int stac_vref_led_power_filter(struct hda_codec *codec, + hda_nid_t nid, + unsigned int power_state) +{ + if (nid == codec->afg && power_state == AC_PWRST_D3) + return AC_PWRST_D1; + return snd_hda_gen_path_power_filter(codec, nid, power_state); +} + /* update mute-LED accoring to the master switch */ static void stac_update_led_status(struct hda_codec *codec, int enabled) { @@ -4260,30 +4271,8 @@ static int stac_suspend(struct hda_codec *codec) stac_shutup(codec); return 0; } - -static void stac_set_power_state(struct hda_codec *codec, hda_nid_t fg, - unsigned int power_state) -{ - unsigned int afg_power_state = power_state; - struct sigmatel_spec *spec = codec->spec; - - if (power_state == AC_PWRST_D3) { - if (spec->vref_mute_led_nid) { - /* with vref-out pin used for mute led control - * codec AFG is prevented from D3 state - */ - afg_power_state = AC_PWRST_D1; - } - /* this delay seems necessary to avoid click noise at power-down */ - msleep(100); - } - snd_hda_codec_read(codec, fg, 0, AC_VERB_SET_POWER_STATE, - afg_power_state); - snd_hda_codec_set_power_to_all(codec, fg, power_state); -} #else #define stac_suspend NULL -#define stac_set_power_state NULL #endif /* CONFIG_PM */ static const struct hda_codec_ops stac_patch_ops = { @@ -4466,8 +4455,7 @@ static void stac_setup_gpio(struct hda_codec *codec) spec->gpio_dir |= spec->gpio_led; spec->gpio_data |= spec->gpio_led; } else { - codec->patch_ops.set_power_state = - stac_set_power_state; + codec->power_filter = stac_vref_led_power_filter; } } -- 1.8.5.2

1 0

[alsa-devel] [PATCH 1/1] PATCH - alsa-plugins: Modify jack client name
by Corfu, ValentinX 13 Jan '14

13 Jan '14

The current jack client name contains the process id of the application providing the audio samples. This leads to unpredictable jack client names which makes handling of the connections by a controlling application very hard. The modification now allows to specify a client name and the number of channels as parameters in the configuration file The given number of channels are then created but not connected. The implementation is backward compatible and simply adds a new configuration option to the plugin. -------------------------------------------------------------- Intel Shannon Limited Registered in Ireland Registered Office: Collinstown Industrial Park, Leixlip, County Kildare Registered Number: 308263 Business address: Dromore House, East Park, Shannon, Co. Clare This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies.

2 1

[alsa-devel] [PATCH] ALSA: hda - Don't set indep_hp flag for old AD codecs
by Takashi Iwai 13 Jan '14

13 Jan '14

Some old AD codecs don't like the independent HP handling, either it contains a single DAC (AD1981) or it mandates the mixer routing (AD1986A). This patch removes the indep_hp flag for such codecs. Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=68081 Cc: <stable(a)vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/hda/patch_analog.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c index 819d4a98abaf..7a426ed491f2 100644 --- a/sound/pci/hda/patch_analog.c +++ b/sound/pci/hda/patch_analog.c @@ -185,7 +185,7 @@ static const struct hda_codec_ops ad198x_auto_patch_ops = { }; -static int ad198x_parse_auto_config(struct hda_codec *codec) +static int ad198x_parse_auto_config(struct hda_codec *codec, bool indep_hp) { struct ad198x_spec *spec = codec->spec; struct auto_pin_cfg *cfg = &spec->gen.autocfg; @@ -195,7 +195,7 @@ static int ad198x_parse_auto_config(struct hda_codec *codec) codec->no_trigger_sense = 1; codec->no_sticky_stream = 1; - spec->gen.indep_hp = 1; + spec->gen.indep_hp = indep_hp; spec->gen.add_stereo_mix_input = 1; err = snd_hda_parse_pin_defcfg(codec, cfg, NULL, 0); @@ -379,7 +379,7 @@ static int patch_ad1986a(struct hda_codec *codec) ad1986a_fixups); snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE); - err = ad198x_parse_auto_config(codec); + err = ad198x_parse_auto_config(codec, false); if (err < 0) { snd_hda_gen_free(codec); return err; @@ -481,7 +481,7 @@ static int patch_ad1983(struct hda_codec *codec) spec->gen.beep_nid = 0x10; set_beep_amp(spec, 0x10, 0, HDA_OUTPUT); - err = ad198x_parse_auto_config(codec); + err = ad198x_parse_auto_config(codec, false); if (err < 0) goto error; err = ad1983_add_spdif_mux_ctl(codec); @@ -568,7 +568,7 @@ static int patch_ad1981(struct hda_codec *codec) snd_hda_pick_fixup(codec, NULL, ad1981_fixup_tbl, ad1981_fixups); snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE); - err = ad198x_parse_auto_config(codec); + err = ad198x_parse_auto_config(codec, false); if (err < 0) goto error; err = ad1983_add_spdif_mux_ctl(codec); @@ -894,7 +894,7 @@ static int patch_ad1988(struct hda_codec *codec) snd_hda_pick_fixup(codec, ad1988_fixup_models, NULL, ad1988_fixups); snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE); - err = ad198x_parse_auto_config(codec); + err = ad198x_parse_auto_config(codec, true); if (err < 0) goto error; err = ad1988_add_spdif_mux_ctl(codec); @@ -1071,7 +1071,7 @@ static int patch_ad1884(struct hda_codec *codec) snd_hda_pick_fixup(codec, NULL, ad1884_fixup_tbl, ad1884_fixups); snd_hda_apply_fixup(codec, HDA_FIXUP_ACT_PRE_PROBE); - err = ad198x_parse_auto_config(codec); + err = ad198x_parse_auto_config(codec, true); if (err < 0) goto error; err = ad1983_add_spdif_mux_ctl(codec); @@ -1113,7 +1113,7 @@ static int patch_ad1882(struct hda_codec *codec) spec->gen.mixer_merge_nid = 0x21; spec->gen.beep_nid = 0x10; set_beep_amp(spec, 0x10, 0, HDA_OUTPUT); - err = ad198x_parse_auto_config(codec); + err = ad198x_parse_auto_config(codec, true); if (err < 0) goto error; err = ad1988_add_spdif_mux_ctl(codec); -- 1.8.5.2

1 0