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

[alsa-devel] [UPDATE RFC PATCH 15/15] ACPI/thinkpad: Fix wrong <acpi/acpi.h> inclusion in Thinkpad ACPI users.
by Lv Zheng 20 Dec '13

20 Dec '13

CONFIG_ACPI dependent code should include <linux/acpi.h> instead of directly including <acpi/acpi.h>. This patch cleans up such wrong inclusions for Thinkpad ACPI users. Cc: Henrique de Moraes Holschuh <ibm-acpi(a)hmh.eng.br> Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Takashi Iwai <tiwai(a)suse.de> Cc: alsa-devel(a)alsa-project.org Cc: ibm-acpi-devel(a)lists.sourceforge.net Cc: platform-driver-x86(a)vger.kernel.org Signed-off-by: Lv Zheng <lv.zheng(a)intel.com> --- sound/pci/hda/patch_conexant.c | 2 +- sound/pci/hda/patch_realtek.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c index 3fbf288..6df4c35 100644 --- a/sound/pci/hda/patch_conexant.c +++ b/sound/pci/hda/patch_conexant.c @@ -3243,7 +3243,7 @@ enum { #if IS_ENABLED(CONFIG_THINKPAD_ACPI) #include <linux/thinkpad_acpi.h> -#include <acpi/acpi.h> +#include <linux/acpi.h> static int (*led_set_func)(int, bool); diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 34de5dc..5dca90e 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -3726,7 +3726,7 @@ static void alc290_fixup_mono_speakers(struct hda_codec *codec, #if IS_ENABLED(CONFIG_THINKPAD_ACPI) #include <linux/thinkpad_acpi.h> -#include <acpi/acpi.h> +#include <linux/acpi.h> static int (*led_set_func)(int, bool); -- 1.7.10

2 1

[alsa-devel] HD audio problem
by Russ Whitaker 20 Dec '13

20 Dec '13

Hi Bought a new mini-itx mb: ECS KBN-I On board sound chip: VT1705CF Installed kernel linux-3.10.24 Otherwise distro is Slackware64 14.1 mplayer plays .mp3 files just fine. No sound from video clips that use Adobe flashplayer, and I get this error message: ALSA lib pcm_dmix.c:1022:(snd_pcm_dmix_open) unable to open slave I think the problem is: card0 and card1 are interchanged as card0 is listed as the HDMI video output. How to fixit, please. Thank you, Russ

1 0

[alsa-devel] [PATCH] ASoC: imx-spdif: Use module_init() to handle platform_device_register()
by Nicolin Chen 20 Dec '13

20 Dec '13

This is a quick fix for the below two issues when building spdif as modules. 1) When modprobing modules in order: snd-soc-fsl-spdif -> snd-soc-imx-spdif -> snd-soc-spdif-tx/rx, we will fail to create imx-spdif card and dai link unless we rmmod snd-soc-imx-spdif and modprobe it again due to inappropriate condition of platform_driver_unregister() in probe(). 2) After "imx-spdif sound-spdif.17: dit-hifi <-> 2004000.spdif mapping ok", doing rmmod the imx-spdif would cause kernel Oops: ------------[ cut here ]------------ WARNING: CPU: 0 PID: 1301 at /home/rmk/git/linux-rmk/fs/sysfs/dir.c:915 sysfs_hash_and_remove+0x84/0x90() sysfs: can not remove 'dapm_widget', no directory Modules linked in: snd_soc_imx_spdif(-) snd_soc_fsl_spdif imx_pcm_dma fuse bnep rfcomm bluetooth imx_sdma imx_thermal imx2_wdt snd_soc_spdif_tx hid_cypress [last unloaded: imx_pcm_dma] CPU: 0 PID: 1301 Comm: rmmod Not tainted 3.13.0-rc4+ #387 Backtrace: [<c0012640>] (dump_backtrace) from [<c00127dc>] (show_stack+0x18/0x1c) r6:00000393 r5:c016bfa4 r4:00000000 r3:00000000 [<c00127c4>] (show_stack) from [<c0683a18>] (dump_stack+0x70/0x90) [<c06839a8>] (dump_stack) from [<c00244e0>] (warn_slowpath_common+0x74/0x94) r4:dab89d30 r3:00000000 [<c002446c>] (warn_slowpath_common) from [<c00245a4>] (warn_slowpath_fmt+0x38/0x40) r8:c689ce00 r7:00000000 r6:00000000 r5:c077c04c r4:dba2a318 [<c0024570>] (warn_slowpath_fmt) from [<c016bfa4>] (sysfs_hash_and_remove+0x84/0x90) r3:c077c04c r2:c06b3c38 [<c016bf20>] (sysfs_hash_and_remove) from [<c016a00c>] (sysfs_remove_file_ns+0x18/0x1c) r7:da916900 r6:00000000 r5:db2c900c r4:dba2a318 [<c0169ff4>] (sysfs_remove_file_ns) from [<c03687d4>] (device_remove_file+0x20/0x24) [<c03687b4>] (device_remove_file) from [<c04f532c>] (snd_soc_dapm_free+0x1c/0x22c) [<c04f5310>] (snd_soc_dapm_free) from [<c04f0c98>] (soc_remove_codec+0x34/0x98) r10:dabae59c r9:00000000 r8:c689ce00 r7:da916900 r6:00000000 r5:db2c900c r4:dba2a200 r3:00000000 [<c04f0c64>] (soc_remove_codec) from [<c04f3188>] (soc_remove_dai_links.clone.28+0x3c0/0x3ec) r4:00000000 r3:00000000 [<c04f2dc8>] (soc_remove_dai_links.clone.28) from [<c04f3248>] (snd_soc_unregister_card+0x94/0xc8) r10:d8435000 r9:db924204 r8:d8435000 r7:d079d480 r6:00000001 r5:00000608 r4:dabae4b8 [<c04f31b4>] (snd_soc_unregister_card) from [<c04ffa70>] (devm_card_release+0x14/0x18) r6:00000003 r5:db924010 r4:dab89e60 r3:c04ffa5c [<c04ffa5c>] (devm_card_release) from [<c036ec74>] (release_nodes+0x190/0x1f8) [<c036eae4>] (release_nodes) from [<c036ed94>] (devres_release_all+0x38/0x54) r10:00000000 r9:dab88000 r8:c000eb44 r7:bef87600 r6:db924044 r5:bf131014 r4:db924010 [<c036ed5c>] (devres_release_all) from [<c036b7a8>] (__device_release_driver+0x80/0xd4) r4:db924010 r3:bf12f000 [<c036b728>] (__device_release_driver) from [<c036bf28>] (driver_detach+0xbc/0xc0) r5:bf131014 r4:db924010 [<c036be6c>] (driver_detach) from [<c036b490>] (bus_remove_driver+0x54/0x98) r6:dab89f3c r5:bf131058 r4:bf131014 r3:db0c8000 [<c036b43c>] (bus_remove_driver) from [<c036c588>] (driver_unregister+0x30/0x4c) r4:bf131014 r3:c68a7a80 [<c036c558>] (driver_unregister) from [<c036d21c>] (platform_driver_unregister+0x14/0x18) r4:00000000 r3:bf12f2d0 [<c036d208>] (platform_driver_unregister) from [<bf12f2e4>] (imx_spdif_driver_exit+0x14/0xd30 [snd_soc_imx_spdif]) [<bf12f2d0>] (imx_spdif_driver_exit [snd_soc_imx_spdif]) from [<c008d764>] (SyS_delete_module+0x140/0x190) [<c008d624>] (SyS_delete_module) from [<c000e980>] (ret_fast_syscall+0x0/0x48) r7:00000081 r6:000120a8 r5:bef87600 r4:00000880 ---[ end trace 09423e64ab60df46 ]--- Unable to handle kernel NULL pointer dereference at virtual address 00000008 pgd = dab9c000 [00000008] *pgd=2062f831, *pte=00000000, *ppte=00000000 Internal error: Oops: 17 [#1] SMP ARM Modules linked in: snd_soc_imx_spdif(-) snd_soc_fsl_spdif imx_pcm_dma fuse bnep rfcomm bluetooth imx_sdma imx_thermal imx2_wdt snd_soc_spdif_tx hid_cypress [last unloaded: imx_pcm_dma] CPU: 0 PID: 1301 Comm: rmmod Tainted: G W 3.13.0-rc4+ #387 task: db0c8000 ti: dab88000 task.ti: dab88000 PC is at soc_remove_codec+0x78/0x98 LR is at trace_hardirqs_on+0x14/0x18 pc : [<c04f0cdc>] lr : [<c0066514>] psr: 600f0013 sp : dab89dc8 ip : 00000020 fp : dab89ddc r10: dabae59c r9 : 00000000 r8 : c689ce00 r7 : da916900 r6 : 00000000 r5 : db2c900c r4 : dba2a200 r3 : 00000000 r2 : 00100100 r1 : dabac810 r0 : dabae5f8 Flags: nZCv IRQs on FIQs on Mode SVC_32 ISA ARM Segment user Control: 10c53c7d Table: 2ab9c059 DAC: 00000015 Process rmmod (pid: 1301, stack limit = 0xdab88240) Stack: (0xdab89dc8 to 0xdab8a000) 9dc0: 00000000 00000000 dab89e24 dab89de0 c04f3188 c04f0c70 9de0: d84355bc dabae5a0 00200200 00100100 00200200 00100100 d079d480 dabae4b8 9e00: 00000608 00000001 d079d480 d8435000 db924204 d8435000 dab89e44 dab89e28 9e20: c04f3248 c04f2dd4 c04ffa5c dab89e60 db924010 00000003 dab89e54 dab89e48 9e40: c04ffa70 c04f31c0 dab89e94 dab89e58 c036ec74 c04ffa68 dab89e94 a00f0013 9e60: dabae400 d079d480 00000002 db924010 bf131014 db924044 bef87600 c000eb44 9e80: dab88000 00000000 dab89eac dab89e98 c036ed94 c036eaf0 bf12f000 db924010 9ea0: dab89ec4 dab89eb0 c036b7a8 c036ed68 db924010 bf131014 dab89ee4 dab89ec8 9ec0: c036bf28 c036b734 db0c8000 bf131014 bf131058 dab89f3c dab89efc dab89ee8 9ee0: c036b490 c036be78 c68a7a80 bf131014 dab89f14 dab89f00 c036c588 c036b448 9f00: bf12f2d0 00000000 dab89f24 dab89f18 c036d21c c036c564 dab89f34 dab89f28 9f20: bf12f2e4 c036d214 dab89fa4 dab89f38 c008d764 bf12f2dc 00000000 5f646e73 9f40: 5f636f73 5f786d69 69647073 bef80066 dab89f74 dab89f60 c005f0d4 c0069020 9f60: 0077a008 00000000 00000880 bef87600 000120a8 00000081 bf131058 00000880 9f80: dab89f84 00000000 00000880 bef87600 000120a8 00000081 00000000 dab89fa8 9fa0: c000e980 c008d630 00000880 bef87600 bef87600 00000880 00009778 bef875f4 9fc0: 00000880 bef87600 000120a8 00000081 00000001 000120bc 00000001 00000000 9fe0: b6f03840 bef875fc 00008f75 b6f0384c 800f0010 bef87600 00000000 00000000 Backtrace: [<c04f0c64>] (soc_remove_codec) from [<c04f3188>] (soc_remove_dai_links.clone.28+0x3c0/0x3ec) r4:00000000 r3:00000000 [<c04f2dc8>] (soc_remove_dai_links.clone.28) from [<c04f3248>] (snd_soc_unregister_card+0x94/0xc8) r10:d8435000 r9:db924204 r8:d8435000 r7:d079d480 r6:00000001 r5:00000608 r4:dabae4b8 [<c04f31b4>] (snd_soc_unregister_card) from [<c04ffa70>] (devm_card_release+0x14/0x18) r6:00000003 r5:db924010 r4:dab89e60 r3:c04ffa5c [<c04ffa5c>] (devm_card_release) from [<c036ec74>] (release_nodes+0x190/0x1f8) [<c036eae4>] (release_nodes) from [<c036ed94>] (devres_release_all+0x38/0x54) r10:00000000 r9:dab88000 r8:c000eb44 r7:bef87600 r6:db924044 r5:bf131014 r4:db924010 [<c036ed5c>] (devres_release_all) from [<c036b7a8>] (__device_release_driver+0x80/0xd4) r4:db924010 r3:bf12f000 [<c036b728>] (__device_release_driver) from [<c036bf28>] (driver_detach+0xbc/0xc0) r5:bf131014 r4:db924010 [<c036be6c>] (driver_detach) from [<c036b490>] (bus_remove_driver+0x54/0x98) r6:dab89f3c r5:bf131058 r4:bf131014 r3:db0c8000 [<c036b43c>] (bus_remove_driver) from [<c036c588>] (driver_unregister+0x30/0x4c) r4:bf131014 r3:c68a7a80 [<c036c558>] (driver_unregister) from [<c036d21c>] (platform_driver_unregister+0x14/0x18) r4:00000000 r3:bf12f2d0 [<c036d208>] (platform_driver_unregister) from [<bf12f2e4>] (imx_spdif_driver_exit+0x14/0xd30 [snd_soc_imx_spdif]) [<bf12f2d0>] (imx_spdif_driver_exit [snd_soc_imx_spdif]) from [<c008d764>] (SyS_delete_module+0x140/0x190) [<c008d624>] (SyS_delete_module) from [<c000e980>] (ret_fast_syscall+0x0/0x48) r7:00000081 r6:000120a8 r5:bef87600 r4:00000880 Code: e594100c e5842068 e584306c e5913080 (e5930008) ---[ end trace 09423e64ab60df47 ]--- Ideally, we should bypass the device_unregister() if getting EPROBE_DEFER, and find the root cause of "can not remove 'dapm_widget', no directory". But the root cause seems to be beyond the imx-spdif driver level, which might be related to the disordered resource releasing of the whole link. Thus this patch can provide a quick fix, if acceptable, to these two bugs so that the driver can finely work when being built as modules. And it's also safe enough to avoid duplicate regisitering/unregistering since we don't handle them in the probe() and remove() any more. At the meantime, we can trace the root cause of the Oops without pressure. Test report: root@freescale ~$ modprobe snd-soc-spdif-rx imx-spdif sound-spdif.10: dir-hifi <-> 2004000.spdif mapping ok root@freescale ~$ rmmod snd-soc-imx-spdif root@freescale ~$ modprobe snd-soc-imx-spdif imx-spdif sound-spdif.10: dir-hifi <-> 2004000.spdif mapping ok root@freescale ~$ rmmod snd-soc-imx-spdif root@freescale ~$ rmmod snd-soc-fsl-spdif root@freescale ~$ modprobe snd-soc-imx-spdif imx-spdif sound-spdif.10: ASoC: CPU DAI (null) not registered imx-spdif sound-spdif.10: snd_soc_register_card failed: -517 platform sound-spdif.10: Driver imx-spdif requests probe deferral root@freescale ~$ modprobe snd-soc-fsl-spdif imx-spdif sound-spdif.10: dir-hifi <-> 2004000.spdif mapping ok root@freescale ~$ rmmod snd-soc-imx-spdif root@freescale ~$ rmmod snd-soc-spdif-rx root@freescale ~$ modprobe snd-soc-imx-spdif imx-spdif sound-spdif.10: ASoC: CODEC spdif-dir not registered imx-spdif sound-spdif.10: snd_soc_register_card failed: -517 platform sound-spdif.10: Driver imx-spdif requests probe deferral root@freescale ~$ modprobe snd-soc-spdif-rx imx-spdif sound-spdif.10: dir-hifi <-> 2004000.spdif mapping ok Reported-by: Russell King <linux(a)arm.linux.org.uk> Signed-off-by: Nicolin Chen <Guangyu.Chen(a)freescale.com> --- sound/soc/fsl/imx-spdif.c | 84 ++++++++++++++++++++++++----------------------- 1 file changed, 43 insertions(+), 41 deletions(-) diff --git a/sound/soc/fsl/imx-spdif.c b/sound/soc/fsl/imx-spdif.c index 980dd1f..c4b9894 100644 --- a/sound/soc/fsl/imx-spdif.c +++ b/sound/soc/fsl/imx-spdif.c @@ -16,8 +16,6 @@ struct imx_spdif_data { struct snd_soc_dai_link dai[2]; struct snd_soc_card card; - struct platform_device *txdev; - struct platform_device *rxdev; }; static int imx_spdif_audio_probe(struct platform_device *pdev) @@ -47,13 +45,6 @@ static int imx_spdif_audio_probe(struct platform_device *pdev) data->dai[num_links].cpu_of_node = spdif_np; data->dai[num_links].platform_of_node = spdif_np; num_links++; - - data->txdev = platform_device_register_simple("spdif-dit", -1, NULL, 0); - if (IS_ERR(data->txdev)) { - ret = PTR_ERR(data->txdev); - dev_err(&pdev->dev, "register dit failed: %d\n", ret); - goto end; - } } if (of_property_read_bool(np, "spdif-in")) { @@ -64,18 +55,11 @@ static int imx_spdif_audio_probe(struct platform_device *pdev) data->dai[num_links].cpu_of_node = spdif_np; data->dai[num_links].platform_of_node = spdif_np; num_links++; - - data->rxdev = platform_device_register_simple("spdif-dir", -1, NULL, 0); - if (IS_ERR(data->rxdev)) { - ret = PTR_ERR(data->rxdev); - dev_err(&pdev->dev, "register dir failed: %d\n", ret); - goto error_dit; - } } if (!num_links) { dev_err(&pdev->dev, "no enabled S/PDIF DAI link\n"); - goto error_dir; + goto end; } data->card.dev = &pdev->dev; @@ -84,24 +68,16 @@ static int imx_spdif_audio_probe(struct platform_device *pdev) ret = snd_soc_of_parse_card_name(&data->card, "model"); if (ret) - goto error_dir; + goto end; ret = devm_snd_soc_register_card(&pdev->dev, &data->card); if (ret) { dev_err(&pdev->dev, "snd_soc_register_card failed: %d\n", ret); - goto error_dir; + goto end; } platform_set_drvdata(pdev, data); - goto end; - -error_dir: - if (data->rxdev) - platform_device_unregister(data->rxdev); -error_dit: - if (data->txdev) - platform_device_unregister(data->txdev); end: if (spdif_np) of_node_put(spdif_np); @@ -109,18 +85,6 @@ end: return ret; } -static int imx_spdif_audio_remove(struct platform_device *pdev) -{ - struct imx_spdif_data *data = platform_get_drvdata(pdev); - - if (data->rxdev) - platform_device_unregister(data->rxdev); - if (data->txdev) - platform_device_unregister(data->txdev); - - return 0; -} - static const struct of_device_id imx_spdif_dt_ids[] = { { .compatible = "fsl,imx-audio-spdif", }, { /* sentinel */ } @@ -134,10 +98,48 @@ static struct platform_driver imx_spdif_driver = { .of_match_table = imx_spdif_dt_ids, }, .probe = imx_spdif_audio_probe, - .remove = imx_spdif_audio_remove, }; -module_platform_driver(imx_spdif_driver); +static struct platform_device *txdev; +static struct platform_device *rxdev; + +static int __init imx_spdif_init(void) +{ + int ret; + + txdev = platform_device_register_simple("spdif-dit", -1, NULL, 0); + if (IS_ERR(txdev)) + return PTR_ERR(txdev); + + rxdev = platform_device_register_simple("spdif-dir", -1, NULL, 0); + if (IS_ERR(rxdev)) { + ret = PTR_ERR(rxdev); + goto err; + } + + ret = platform_driver_register(&imx_spdif_driver); + if (ret) + goto err1; + + return 0; + +err1: + platform_device_unregister(rxdev); +err: + platform_device_unregister(txdev); + + return ret; +} +module_init(imx_spdif_init); + +static void __exit imx_spdif_exit(void) +{ + platform_driver_unregister(&imx_spdif_driver); + + platform_device_unregister(rxdev); + platform_device_unregister(txdev); +} +module_exit(imx_spdif_exit); MODULE_AUTHOR("Freescale Semiconductor, Inc."); MODULE_DESCRIPTION("Freescale i.MX S/PDIF machine driver"); -- 1.8.4

3 7

[alsa-devel] [RFC PATCH 15/15] ACPI/thinkpad: Fix wrong <acpi/acpi.h> inclusion in Thinkpad ACPI users.
by Lv Zheng 20 Dec '13

20 Dec '13

CONFIG_ACPI dependent code should include <linux/acpi.h> instead of directly including <acpi/acpi.h>. This patch cleans up such wrong inclusions for Thinkpad ACPI users. Cc: Henrique de Moraes Holschuh <ibm-acpi(a)hmh.eng.br> Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Takashi Iwai <tiwai(a)suse.de> Cc: alsa-devel(a)alsa-project.org Cc: ibm-acpi-devel(a)lists.sourceforge.net Cc: platform-driver-x86(a)vger.kernel.org Signed-off-by: Lv Zheng <lv.zheng(a)intel.com> --- drivers/platform/x86/thinkpad_acpi.c | 1 - include/linux/thinkpad_acpi.h | 2 ++ sound/pci/hda/patch_conexant.c | 1 - sound/pci/hda/patch_realtek.c | 1 - 4 files changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c index defb6af..c114d7c 100644 --- a/drivers/platform/x86/thinkpad_acpi.c +++ b/drivers/platform/x86/thinkpad_acpi.c @@ -76,7 +76,6 @@ #include <linux/dmi.h> #include <linux/jiffies.h> #include <linux/workqueue.h> -#include <linux/acpi.h> #include <linux/pci_ids.h> #include <linux/thinkpad_acpi.h> #include <sound/core.h> diff --git a/include/linux/thinkpad_acpi.h b/include/linux/thinkpad_acpi.h index 361de59..02928eb 100644 --- a/include/linux/thinkpad_acpi.h +++ b/include/linux/thinkpad_acpi.h @@ -1,6 +1,8 @@ #ifndef __THINKPAD_ACPI_H__ #define __THINKPAD_ACPI_H__ +#include <linux/acpi.h> + /* These two functions return 0 if success, or negative error code (e g -ENODEV if no led present) */ diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c index 3fbf288..c2da489 100644 --- a/sound/pci/hda/patch_conexant.c +++ b/sound/pci/hda/patch_conexant.c @@ -3243,7 +3243,6 @@ enum { #if IS_ENABLED(CONFIG_THINKPAD_ACPI) #include <linux/thinkpad_acpi.h> -#include <acpi/acpi.h> static int (*led_set_func)(int, bool); diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 34de5dc..17306be 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -3726,7 +3726,6 @@ static void alc290_fixup_mono_speakers(struct hda_codec *codec, #if IS_ENABLED(CONFIG_THINKPAD_ACPI) #include <linux/thinkpad_acpi.h> -#include <acpi/acpi.h> static int (*led_set_func)(int, bool); -- 1.7.10.4

4 4

[alsa-devel] [PATCH] Add support for Focusrite Saffire 6 USB
by Eduard Gilmutdinov 20 Dec '13

20 Dec '13

Signed-off-by: Eduard Gilmutdinov <edgilmutdinov(a)gmail.com> --- sound/usb/quirks-table.h | 40 ++++++++++++++++++++++++++++++++++++++++ sound/usb/quirks.c | 9 +++++---- 2 files changed, 45 insertions(+), 4 deletions(-) diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h index f5f0595..3454780 100644 --- a/sound/usb/quirks-table.h +++ b/sound/usb/quirks-table.h @@ -2569,6 +2569,46 @@ YAMAHA_DEVICE(0x7010, "UB99"), .type = QUIRK_MIDI_NOVATION } }, +{ + USB_DEVICE(0x1235, 0x0010), + .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) { + .vendor_name = "Focusrite", + .product_name = "Saffire 6 USB", + .ifnum = QUIRK_ANY_INTERFACE, + .type = QUIRK_COMPOSITE, + .data = (const struct snd_usb_audio_quirk[]) { + { + .ifnum = 0, + .type = QUIRK_AUDIO_FIXED_ENDPOINT, + .data = &(const struct audioformat) { + .formats = SNDRV_PCM_FMTBIT_S24_3LE, + .channels = 4, + .iface = 0, + .altsetting = 1, + .altset_idx = 1, + .attributes = UAC_EP_CS_ATTR_SAMPLE_RATE, + .endpoint = 0x01, + .ep_attr = USB_ENDPOINT_XFER_ISOC, + .rates = SNDRV_PCM_RATE_44100 | + SNDRV_PCM_RATE_48000, + .rate_min = 44100, + .rate_max = 48000, + .nr_rates = 2, + .rate_table = (unsigned int[]) { + 44100, 48000 + } + } + }, + { + .ifnum = 1, + .type = QUIRK_MIDI_RAW_BYTES + }, + { + .ifnum = -1 + } + } + } +}, /* Access Music devices */ { diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c index 0df9ede..e9a59e9 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c @@ -662,8 +662,9 @@ static int snd_usb_cm6206_boot_quirk(struct usb_device *dev) /* * Novation Twitch DJ controller + * Focusrite Novation Saffire 6 USB audio card */ -static int snd_usb_twitch_boot_quirk(struct usb_device *dev) +static int snd_usb_novation_boot_quirk(struct usb_device *dev) { /* preemptively set up the device because otherwise the * raw MIDI endpoints are not active */ @@ -972,9 +973,9 @@ int snd_usb_apply_boot_quirk(struct usb_device *dev, /* Digidesign Mbox 2 */ return snd_usb_mbox2_boot_quirk(dev); - case USB_ID(0x1235, 0x0018): - /* Focusrite Novation Twitch */ - return snd_usb_twitch_boot_quirk(dev); + case USB_ID(0x1235, 0x0010): /* Focusrite Novation Saffire 6 USB */ + case USB_ID(0x1235, 0x0018): /* Focusrite Novation Twitch */ + return snd_usb_novation_boot_quirk(dev); case USB_ID(0x133e, 0x0815): /* Access Music VirusTI Desktop */ -- 1.8.5.2

1 0

[alsa-devel] [PATCH] ASoC: fsl-sai: Remove fsl_sai_remove()
by Xiubo Li 20 Dec '13

20 Dec '13

There is no need of this function and makes the code slightly shorter Signed-off-by: Xiubo Li <Li.Xiubo(a)freescale.com> --- sound/soc/fsl/fsl_sai.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c index 50a797e..1868ec3 100644 --- a/sound/soc/fsl/fsl_sai.c +++ b/sound/soc/fsl/fsl_sai.c @@ -385,19 +385,8 @@ static int fsl_sai_dai_probe(struct snd_soc_dai *cpu_dai) return 0; } -static int fsl_sai_dai_remove(struct snd_soc_dai *cpu_dai) -{ - cpu_dai->playback_dma_data = NULL; - cpu_dai->capture_dma_data = NULL; - - snd_soc_dai_set_drvdata(cpu_dai, NULL); - - return 0; -} - static struct snd_soc_dai_driver fsl_sai_dai = { .probe = fsl_sai_dai_probe, - .remove = fsl_sai_dai_remove, .playback = { .channels_min = 1, .channels_max = 2, -- 1.8.4

1 0

[alsa-devel] [PATCHv3 0/8] ALSA: Add SAI driver and enable SGT15000 codec
by Xiubo Li 20 Dec '13

20 Dec '13

This patch series is mostly Freescale's SAI SoC Digital Audio Interface driver implementation. And the implementation is only compatible with device tree definition. This patch series is based on linux-next and has been tested on Vybrid VF610 Tower board using device tree. Changed in v3: - Add big-endian mode support. - Revise some commit comments, coding styles,etc. - Keep header files ordered by alphabet,etc. - Add MODULE_ALIAS("platform:fsl-sai") for SAI driver. - Rename the files to be in a same pattern with the existed ones. - Remove some not useful functions or code. - Only enable the clock while the device is in active use. - Revise one error message according to Bill. Changed in v2: - Use default settings for the generic dmaengine PCM driver. - Separate receive and transmit setting in most functions, but some couldn't for the HW limitation. - Drop some not reduntant code. - Use devm_snd_soc_register_component() instead of snd_soc_register_component(). - Use devm_snd_soc_register_card() instead of devm_snd_soc_register_card(). - Adjust the code sentences sequence. - Make the namespacing consistent. - Rename CONFIG_SND_SOC_FSL_SGTL5000 to CONFIG_SND_SOC_FSL_SGTL5000_VF610. - Drop some meaningless lines. - Rename the binding document file. Added in v1: - Add SAI SoC Digital Audio Interface driver. - Add Freescale SAI ALSA SoC Digital Audio Interface node for VF610. - Enables SAI ALSA SoC DAI device for Vybrid VF610 TOWER board. - Add device tree bindings for Freescale SAI. - Revise the bugs about the sgt15000 codec. - Add SGT15000 based audio machine driver. - Enable SGT15000 codec based audio driver node for VF610. - Add device tree bindings for Freescale VF610 sound.

3 15

[alsa-devel] [PATCHv4 0/4] ALSA: Add Freescale SAI driver
by Li.Xiubo＠freescale.com 20 Dec '13

20 Dec '13

This patch series is mostly Freescale's SAI SoC Digital Audio Interface driver implementation. And the implementation is only compatible with device tree definition. This patch series is based on linux-next and has been tested on Vybrid VF610 Tower board using device tree. Changed in v4: - Remove the uneeded function fsl_sai_dai_remove(). - Use snd_soc_dai_init_dma_data(). - Adjust the Konfig file. Changed in v3: - Add big-endian mode support. - Revise some commit comments, coding styles,etc. - Keep header files ordered by alphabet,etc. - Add MODULE_ALIAS("platform:fsl-sai") for SAI driver. - Rename the files to be in a same pattern with the existed ones. - Remove some not useful functions or code. - Only enable the clock while the device is in active use. - Revise one error message according to Bill. Changed in v2: - Use default settings for the generic dmaengine PCM driver. - Separate receive and transmit setting in most functions, but some couldn't for the HW limitation. - Drop some not reduntant code. - Use devm_snd_soc_register_component() instead of snd_soc_register_component(). - Use devm_snd_soc_register_card() instead of devm_snd_soc_register_card(). - Adjust the code sentences sequence. - Make the namespacing consistent. - Rename CONFIG_SND_SOC_FSL_SGTL5000 to CONFIG_SND_SOC_FSL_SGTL5000_VF610. - Drop some meaningless lines. - Rename the binding document file. Added in v1: - Add SAI SoC Digital Audio Interface driver. - Add Freescale SAI ALSA SoC Digital Audio Interface node for VF610. - Enables SAI ALSA SoC DAI device for Vybrid VF610 TOWER board. - Add device tree bindings for Freescale SAI. - Revise the bugs about the sgt15000 codec. - Add SGT15000 based audio machine driver. - Enable SGT15000 codec based audio driver node for VF610. - Add device tree bindings for Freescale VF610 sound.

1 0

[alsa-devel] [RFC PATCH 1/2] ASoC: wm_adsp: Factor out ADSP2 boot proceedure
by Charles Keepax 19 Dec '13

19 Dec '13

Move the ADSP2 boot proceedure into a work structure in preparation for running it asynchronously with the rest of the audio path bring up. Signed-off-by: Charles Keepax <ckeepax(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm_adsp.c | 186 +++++++++++++++++++++++++------------------ sound/soc/codecs/wm_adsp.h | 5 +- 2 files changed, 112 insertions(+), 79 deletions(-) diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c index fb0c678..4475790 100644 --- a/sound/soc/codecs/wm_adsp.c +++ b/sound/soc/codecs/wm_adsp.c @@ -1497,107 +1497,136 @@ static int wm_adsp2_ena(struct wm_adsp *dsp) return 0; } -int wm_adsp2_event(struct snd_soc_dapm_widget *w, - struct snd_kcontrol *kcontrol, int event) +void wm_adsp2_boot_work(struct work_struct *work) { - struct snd_soc_codec *codec = w->codec; - struct wm_adsp *dsps = snd_soc_codec_get_drvdata(codec); - struct wm_adsp *dsp = &dsps[w->shift]; - struct wm_adsp_alg_region *alg_region; - struct wm_coeff_ctl *ctl; - unsigned int val; + struct wm_adsp *dsp = container_of(work, + struct wm_adsp, + boot_work); int ret; + unsigned int val; - dsp->card = codec->card; + /* + * For simplicity set the DSP clock rate to be the + * SYSCLK rate rather than making it configurable. + */ + ret = regmap_read(dsp->regmap, ARIZONA_SYSTEM_CLOCK_1, &val); + if (ret != 0) { + adsp_err(dsp, "Failed to read SYSCLK state: %d\n", ret); + return; + } + val = (val & ARIZONA_SYSCLK_FREQ_MASK) + >> ARIZONA_SYSCLK_FREQ_SHIFT; - switch (event) { - case SND_SOC_DAPM_POST_PMU: - /* - * For simplicity set the DSP clock rate to be the - * SYSCLK rate rather than making it configurable. - */ - ret = regmap_read(dsp->regmap, ARIZONA_SYSTEM_CLOCK_1, &val); - if (ret != 0) { - adsp_err(dsp, "Failed to read SYSCLK state: %d\n", - ret); - return ret; - } - val = (val & ARIZONA_SYSCLK_FREQ_MASK) - >> ARIZONA_SYSCLK_FREQ_SHIFT; + ret = regmap_update_bits_async(dsp->regmap, + dsp->base + ADSP2_CLOCKING, + ADSP2_CLK_SEL_MASK, val); + if (ret != 0) { + adsp_err(dsp, "Failed to set clock rate: %d\n", ret); + return; + } - ret = regmap_update_bits_async(dsp->regmap, - dsp->base + ADSP2_CLOCKING, - ADSP2_CLK_SEL_MASK, val); + if (dsp->dvfs) { + ret = regmap_read(dsp->regmap, + dsp->base + ADSP2_CLOCKING, &val); if (ret != 0) { - adsp_err(dsp, "Failed to set clock rate: %d\n", - ret); - return ret; + dev_err(dsp->dev, "Failed to read clocking: %d\n", ret); + return; } - if (dsp->dvfs) { - ret = regmap_read(dsp->regmap, - dsp->base + ADSP2_CLOCKING, &val); + if ((val & ADSP2_CLK_SEL_MASK) >= 3) { + ret = regulator_enable(dsp->dvfs); if (ret != 0) { dev_err(dsp->dev, - "Failed to read clocking: %d\n", ret); - return ret; + "Failed to enable supply: %d\n", + ret); + return; } - if ((val & ADSP2_CLK_SEL_MASK) >= 3) { - ret = regulator_enable(dsp->dvfs); - if (ret != 0) { - dev_err(dsp->dev, - "Failed to enable supply: %d\n", - ret); - return ret; - } - - ret = regulator_set_voltage(dsp->dvfs, - 1800000, - 1800000); - if (ret != 0) { - dev_err(dsp->dev, - "Failed to raise supply: %d\n", - ret); - return ret; - } + ret = regulator_set_voltage(dsp->dvfs, + 1800000, + 1800000); + if (ret != 0) { + dev_err(dsp->dev, + "Failed to raise supply: %d\n", + ret); + return; } } + } - ret = wm_adsp2_ena(dsp); - if (ret != 0) - return ret; + ret = wm_adsp2_ena(dsp); + if (ret != 0) + return; - ret = wm_adsp_load(dsp); - if (ret != 0) - goto err; + ret = wm_adsp_load(dsp); + if (ret != 0) + goto err; - ret = wm_adsp_setup_algs(dsp); - if (ret != 0) - goto err; + ret = wm_adsp_setup_algs(dsp); + if (ret != 0) + goto err; - ret = wm_adsp_load_coeff(dsp); - if (ret != 0) - goto err; + ret = wm_adsp_load_coeff(dsp); + if (ret != 0) + goto err; - /* Initialize caches for enabled and unset controls */ - ret = wm_coeff_init_control_caches(dsp); - if (ret != 0) - goto err; + /* Initialize caches for enabled and unset controls */ + ret = wm_coeff_init_control_caches(dsp); + if (ret != 0) + goto err; - /* Sync set controls */ - ret = wm_coeff_sync_controls(dsp); - if (ret != 0) - goto err; + /* Sync set controls */ + ret = wm_coeff_sync_controls(dsp); + if (ret != 0) + goto err; + + ret = regmap_update_bits_async(dsp->regmap, + dsp->base + ADSP2_CONTROL, + ADSP2_CORE_ENA, + ADSP2_CORE_ENA); + if (ret != 0) + goto err; + + dsp->running = true; + + return; + +err: + regmap_update_bits(dsp->regmap, dsp->base + ADSP2_CONTROL, + ADSP2_SYS_ENA | ADSP2_CORE_ENA | ADSP2_START, 0); +} - ret = regmap_update_bits_async(dsp->regmap, - dsp->base + ADSP2_CONTROL, - ADSP2_CORE_ENA | ADSP2_START, - ADSP2_CORE_ENA | ADSP2_START); +int wm_adsp2_event(struct snd_soc_dapm_widget *w, + struct snd_kcontrol *kcontrol, int event) +{ + struct snd_soc_codec *codec = w->codec; + struct wm_adsp *dsps = snd_soc_codec_get_drvdata(codec); + struct wm_adsp *dsp = &dsps[w->shift]; + struct wm_adsp_alg_region *alg_region; + struct wm_coeff_ctl *ctl; + int ret; + + dsp->card = codec->card; + + switch (event) { + case SND_SOC_DAPM_PRE_PMU: + schedule_work(&dsp->boot_work); + flush_work(&dsp->boot_work); + + if (!dsp->running) + return -EIO; + break; + + case SND_SOC_DAPM_POST_PMU: + if (!dsp->running) + return -EIO; + + ret = regmap_update_bits(dsp->regmap, + dsp->base + ADSP2_CONTROL, + ADSP2_START, + ADSP2_START); if (ret != 0) goto err; - - dsp->running = true; break; case SND_SOC_DAPM_PRE_PMD: @@ -1668,6 +1697,7 @@ int wm_adsp2_init(struct wm_adsp *adsp, bool dvfs) INIT_LIST_HEAD(&adsp->alg_regions); INIT_LIST_HEAD(&adsp->ctl_list); + INIT_WORK(&adsp->boot_work, wm_adsp2_boot_work); if (dvfs) { adsp->dvfs = devm_regulator_get(adsp->dev, "DCVDD"); diff --git a/sound/soc/codecs/wm_adsp.h b/sound/soc/codecs/wm_adsp.h index d018dea..20b6b4b 100644 --- a/sound/soc/codecs/wm_adsp.h +++ b/sound/soc/codecs/wm_adsp.h @@ -59,6 +59,8 @@ struct wm_adsp { struct regulator *dvfs; struct list_head ctl_list; + + struct work_struct boot_work; }; #define WM_ADSP1(wname, num) \ @@ -67,7 +69,8 @@ struct wm_adsp { #define WM_ADSP2(wname, num) \ SND_SOC_DAPM_PGA_E(wname, SND_SOC_NOPM, num, 0, NULL, 0, \ - wm_adsp2_event, SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD) + wm_adsp2_event, SND_SOC_DAPM_PRE_PMU | \ + SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD) extern const struct snd_kcontrol_new wm_adsp1_fw_controls[]; extern const struct snd_kcontrol_new wm_adsp2_fw_controls[]; -- 1.7.2.5

2 2

[alsa-devel] [PATCH 0/5] ASoC/MFD: twl6040: Remove codec driver local reg cache
by Peter Ujfalusi 19 Dec '13

19 Dec '13

Hi Mark, It was not straight forward task to remove the local reg cache from the twl6040 codec driver. I also needed to change the MFD part so it will take over the caching of registers via regmap. So far I have the following patches working on top of mainline kernel. Is this close enough of what you had in mind when asked me to look at this? twl4030 codec is going to be a bit more complicated AFAIK but it will come eventually. Regards, Peter --- Peter Ujfalusi (5): ASoC: twl6040: Rename twl6040_is_path_unmuted -> twl6040_can_write_to_chip ASoC: twl6040: Custom caching for sensitive DL1/2 path registers MFD: twl6040: reg_defaults support for regmap ASoC: twl6040: Remove register restore functionality ASoC: twl6040: Remove self managed local reg_cache support drivers/mfd/twl6040.c | 92 +++++++++++++++++- sound/soc/codecs/twl6040.c | 227 +++++++++++++-------------------------------- 2 files changed, 155 insertions(+), 164 deletions(-) -- 1.8.4.2

3 14