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

[alsa-devel] [PATCH] ASoC: Remove conditional I2C usage from tlv320aic3x driver
by Mark Brown 22 Nov '11

22 Nov '11

The driver only supports I2C so doesn't need to do things conditionally. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/tlv320aic3x.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c index 14cb553..2e2bf18 100644 --- a/sound/soc/codecs/tlv320aic3x.c +++ b/sound/soc/codecs/tlv320aic3x.c @@ -1481,7 +1481,6 @@ static struct snd_soc_codec_driver soc_codec_dev_aic3x = { .resume = aic3x_resume, }; -#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) /* * AIC3X 2 wire address can be up to 4 devices with device addresses * 0x18, 0x19, 0x1A, 0x1B @@ -1548,27 +1547,22 @@ static struct i2c_driver aic3x_i2c_driver = { .remove = aic3x_i2c_remove, .id_table = aic3x_i2c_id, }; -#endif static int __init aic3x_modinit(void) { int ret = 0; -#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) ret = i2c_add_driver(&aic3x_i2c_driver); if (ret != 0) { printk(KERN_ERR "Failed to register TLV320AIC3x I2C driver: %d\n", ret); } -#endif return ret; } module_init(aic3x_modinit); static void __exit aic3x_exit(void) { -#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) i2c_del_driver(&aic3x_i2c_driver); -#endif } module_exit(aic3x_exit); -- 1.7.7.3

2 1

[alsa-devel] [PATCH 0/3] ELD fixes for 3.2
by Wu Fengguang 22 Nov '11

22 Nov '11

Takashi, Here are 2 fixes and 1 cleanup patch targeted for 3.2. Thanks, Fengguang

2 7

[alsa-devel] hdspm - Missing PCI ID for PCIe MADI
by Andre Schramm 22 Nov '11

22 Nov '11

Hi Adrian, thanks for the latest patches. While doing some testing, I noticed that one PCI ID (d2) was missing, so the module didn't load. $ grep 'hdsp_madi,' hdsp.inf | sort | uniq %DeviceDescMadi% = hdsp_madi, PCI\VEN_10EE&DEV_3FC6&REV_C8 %DeviceDescMadi% = hdsp_madi, PCI\VEN_10EE&DEV_3FC6&REV_C9 %DeviceDescMadi% = hdsp_madi, PCI\VEN_10EE&DEV_3FC6&REV_CA %DeviceDescMadi% = hdsp_madi, PCI\VEN_10EE&DEV_3FC6&REV_CB %DeviceDescMadi% = hdsp_madi, PCI\VEN_10EE&DEV_3FC6&REV_CC %DeviceDescMadi% = hdsp_madi, PCI\VEN_10EE&DEV_3FC6&REV_CD %DeviceDescMadi% = hdsp_madi, PCI\VEN_10EE&DEV_3FC6&REV_CE %DeviceDescMadi% = hdsp_madi, PCI\VEN_10EE&DEV_3FC6&REV_CF %DeviceDescMadi% = hdsp_madi, PCI\VEN_10EE&DEV_3FC6&REV_D2 %DeviceDescMadi% = hdsp_madi, PCI\VEN_10EE&DEV_3FC6&REV_D5 Trivial patch below, that should be all then. Tested on CentOS 6.0, vanilla kernel 3.0.7 with RT-20 and latest hdspm.c from GitHub. Cheers, Andre diff -up hdspm.c.orig hdspm.c --- hdspm.c.orig 2011-11-18 11:12:36.549938179 +0100 +++ hdspm.c 2011-11-18 11:12:47.351937890 +0100 @@ -6518,8 +6518,9 @@ static int __devinit snd_hdspm_create(st hdspm->io_type = AES32; hdspm->card_name = "RME AES32"; hdspm->midiPorts = 2; - } else if ((hdspm->firmware_rev == 0xd5) || - ((hdspm->firmware_rev >= 0xc8) && + } else if ((hdspm->firmware_rev == 0xd2) || // D2 = PCIe MADI + (hdspm->firmware_rev == 0xd5) || // D5 = PCIe MADIface + ((hdspm->firmware_rev >= 0xc8) && // C8 - CF = PCI MADI (hdspm->firmware_rev <= 0xcf))) { hdspm->io_type = MADI; hdspm->card_name = "RME MADI";

3 4

[alsa-devel] [PATCH] ASoC: Remove WM5100 DSP memory windows from register default data
by Mark Brown 21 Nov '11

21 Nov '11

They're all volatile so shouldn't have defaults and as we've got pages into the DSP memory the registers themselves aren't that useful - a further patch adding support for the DSPs will provide direct diagnostic access to the DSP memories. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm5100-tables.c | 168 -------------------------------------- 1 files changed, 0 insertions(+), 168 deletions(-) diff --git a/sound/soc/codecs/wm5100-tables.c b/sound/soc/codecs/wm5100-tables.c index 3e90dea..9a18fae 100644 --- a/sound/soc/codecs/wm5100-tables.c +++ b/sound/soc/codecs/wm5100-tables.c @@ -697,90 +697,6 @@ bool wm5100_readable_register(struct device *dev, unsigned int reg) case WM5100_HPLPF3_2: case WM5100_HPLPF4_1: case WM5100_HPLPF4_2: - case WM5100_DSP1_DM_0: - case WM5100_DSP1_DM_1: - case WM5100_DSP1_DM_2: - case WM5100_DSP1_DM_3: - case WM5100_DSP1_DM_508: - case WM5100_DSP1_DM_509: - case WM5100_DSP1_DM_510: - case WM5100_DSP1_DM_511: - case WM5100_DSP1_PM_0: - case WM5100_DSP1_PM_1: - case WM5100_DSP1_PM_2: - case WM5100_DSP1_PM_3: - case WM5100_DSP1_PM_4: - case WM5100_DSP1_PM_5: - case WM5100_DSP1_PM_1530: - case WM5100_DSP1_PM_1531: - case WM5100_DSP1_PM_1532: - case WM5100_DSP1_PM_1533: - case WM5100_DSP1_PM_1534: - case WM5100_DSP1_PM_1535: - case WM5100_DSP1_ZM_0: - case WM5100_DSP1_ZM_1: - case WM5100_DSP1_ZM_2: - case WM5100_DSP1_ZM_3: - case WM5100_DSP1_ZM_2044: - case WM5100_DSP1_ZM_2045: - case WM5100_DSP1_ZM_2046: - case WM5100_DSP1_ZM_2047: - case WM5100_DSP2_DM_0: - case WM5100_DSP2_DM_1: - case WM5100_DSP2_DM_2: - case WM5100_DSP2_DM_3: - case WM5100_DSP2_DM_508: - case WM5100_DSP2_DM_509: - case WM5100_DSP2_DM_510: - case WM5100_DSP2_DM_511: - case WM5100_DSP2_PM_0: - case WM5100_DSP2_PM_1: - case WM5100_DSP2_PM_2: - case WM5100_DSP2_PM_3: - case WM5100_DSP2_PM_4: - case WM5100_DSP2_PM_5: - case WM5100_DSP2_PM_1530: - case WM5100_DSP2_PM_1531: - case WM5100_DSP2_PM_1532: - case WM5100_DSP2_PM_1533: - case WM5100_DSP2_PM_1534: - case WM5100_DSP2_PM_1535: - case WM5100_DSP2_ZM_0: - case WM5100_DSP2_ZM_1: - case WM5100_DSP2_ZM_2: - case WM5100_DSP2_ZM_3: - case WM5100_DSP2_ZM_2044: - case WM5100_DSP2_ZM_2045: - case WM5100_DSP2_ZM_2046: - case WM5100_DSP2_ZM_2047: - case WM5100_DSP3_DM_0: - case WM5100_DSP3_DM_1: - case WM5100_DSP3_DM_2: - case WM5100_DSP3_DM_3: - case WM5100_DSP3_DM_508: - case WM5100_DSP3_DM_509: - case WM5100_DSP3_DM_510: - case WM5100_DSP3_DM_511: - case WM5100_DSP3_PM_0: - case WM5100_DSP3_PM_1: - case WM5100_DSP3_PM_2: - case WM5100_DSP3_PM_3: - case WM5100_DSP3_PM_4: - case WM5100_DSP3_PM_5: - case WM5100_DSP3_PM_1530: - case WM5100_DSP3_PM_1531: - case WM5100_DSP3_PM_1532: - case WM5100_DSP3_PM_1533: - case WM5100_DSP3_PM_1534: - case WM5100_DSP3_PM_1535: - case WM5100_DSP3_ZM_0: - case WM5100_DSP3_ZM_1: - case WM5100_DSP3_ZM_2: - case WM5100_DSP3_ZM_3: - case WM5100_DSP3_ZM_2044: - case WM5100_DSP3_ZM_2045: - case WM5100_DSP3_ZM_2046: - case WM5100_DSP3_ZM_2047: return 1; default: return 0; @@ -1445,88 +1361,4 @@ struct reg_default wm5100_reg_defaults[WM5100_REGISTER_COUNT] = { { 0x0EC9, 0x0000 }, /* R3785 - HPLPF3_2 */ { 0x0ECC, 0x0000 }, /* R3788 - HPLPF4_1 */ { 0x0ECD, 0x0000 }, /* R3789 - HPLPF4_2 */ - { 0x4000, 0x0000 }, /* R16384 - DSP1 DM 0 */ - { 0x4001, 0x0000 }, /* R16385 - DSP1 DM 1 */ - { 0x4002, 0x0000 }, /* R16386 - DSP1 DM 2 */ - { 0x4003, 0x0000 }, /* R16387 - DSP1 DM 3 */ - { 0x41FC, 0x0000 }, /* R16892 - DSP1 DM 508 */ - { 0x41FD, 0x0000 }, /* R16893 - DSP1 DM 509 */ - { 0x41FE, 0x0000 }, /* R16894 - DSP1 DM 510 */ - { 0x41FF, 0x0000 }, /* R16895 - DSP1 DM 511 */ - { 0x4800, 0x0000 }, /* R18432 - DSP1 PM 0 */ - { 0x4801, 0x0000 }, /* R18433 - DSP1 PM 1 */ - { 0x4802, 0x0000 }, /* R18434 - DSP1 PM 2 */ - { 0x4803, 0x0000 }, /* R18435 - DSP1 PM 3 */ - { 0x4804, 0x0000 }, /* R18436 - DSP1 PM 4 */ - { 0x4805, 0x0000 }, /* R18437 - DSP1 PM 5 */ - { 0x4DFA, 0x0000 }, /* R19962 - DSP1 PM 1530 */ - { 0x4DFB, 0x0000 }, /* R19963 - DSP1 PM 1531 */ - { 0x4DFC, 0x0000 }, /* R19964 - DSP1 PM 1532 */ - { 0x4DFD, 0x0000 }, /* R19965 - DSP1 PM 1533 */ - { 0x4DFE, 0x0000 }, /* R19966 - DSP1 PM 1534 */ - { 0x4DFF, 0x0000 }, /* R19967 - DSP1 PM 1535 */ - { 0x5000, 0x0000 }, /* R20480 - DSP1 ZM 0 */ - { 0x5001, 0x0000 }, /* R20481 - DSP1 ZM 1 */ - { 0x5002, 0x0000 }, /* R20482 - DSP1 ZM 2 */ - { 0x5003, 0x0000 }, /* R20483 - DSP1 ZM 3 */ - { 0x57FC, 0x0000 }, /* R22524 - DSP1 ZM 2044 */ - { 0x57FD, 0x0000 }, /* R22525 - DSP1 ZM 2045 */ - { 0x57FE, 0x0000 }, /* R22526 - DSP1 ZM 2046 */ - { 0x57FF, 0x0000 }, /* R22527 - DSP1 ZM 2047 */ - { 0x6000, 0x0000 }, /* R24576 - DSP2 DM 0 */ - { 0x6001, 0x0000 }, /* R24577 - DSP2 DM 1 */ - { 0x6002, 0x0000 }, /* R24578 - DSP2 DM 2 */ - { 0x6003, 0x0000 }, /* R24579 - DSP2 DM 3 */ - { 0x61FC, 0x0000 }, /* R25084 - DSP2 DM 508 */ - { 0x61FD, 0x0000 }, /* R25085 - DSP2 DM 509 */ - { 0x61FE, 0x0000 }, /* R25086 - DSP2 DM 510 */ - { 0x61FF, 0x0000 }, /* R25087 - DSP2 DM 511 */ - { 0x6800, 0x0000 }, /* R26624 - DSP2 PM 0 */ - { 0x6801, 0x0000 }, /* R26625 - DSP2 PM 1 */ - { 0x6802, 0x0000 }, /* R26626 - DSP2 PM 2 */ - { 0x6803, 0x0000 }, /* R26627 - DSP2 PM 3 */ - { 0x6804, 0x0000 }, /* R26628 - DSP2 PM 4 */ - { 0x6805, 0x0000 }, /* R26629 - DSP2 PM 5 */ - { 0x6DFA, 0x0000 }, /* R28154 - DSP2 PM 1530 */ - { 0x6DFB, 0x0000 }, /* R28155 - DSP2 PM 1531 */ - { 0x6DFC, 0x0000 }, /* R28156 - DSP2 PM 1532 */ - { 0x6DFD, 0x0000 }, /* R28157 - DSP2 PM 1533 */ - { 0x6DFE, 0x0000 }, /* R28158 - DSP2 PM 1534 */ - { 0x6DFF, 0x0000 }, /* R28159 - DSP2 PM 1535 */ - { 0x7000, 0x0000 }, /* R28672 - DSP2 ZM 0 */ - { 0x7001, 0x0000 }, /* R28673 - DSP2 ZM 1 */ - { 0x7002, 0x0000 }, /* R28674 - DSP2 ZM 2 */ - { 0x7003, 0x0000 }, /* R28675 - DSP2 ZM 3 */ - { 0x77FC, 0x0000 }, /* R30716 - DSP2 ZM 2044 */ - { 0x77FD, 0x0000 }, /* R30717 - DSP2 ZM 2045 */ - { 0x77FE, 0x0000 }, /* R30718 - DSP2 ZM 2046 */ - { 0x77FF, 0x0000 }, /* R30719 - DSP2 ZM 2047 */ - { 0x8000, 0x0000 }, /* R32768 - DSP3 DM 0 */ - { 0x8001, 0x0000 }, /* R32769 - DSP3 DM 1 */ - { 0x8002, 0x0000 }, /* R32770 - DSP3 DM 2 */ - { 0x8003, 0x0000 }, /* R32771 - DSP3 DM 3 */ - { 0x81FC, 0x0000 }, /* R33276 - DSP3 DM 508 */ - { 0x81FD, 0x0000 }, /* R33277 - DSP3 DM 509 */ - { 0x81FE, 0x0000 }, /* R33278 - DSP3 DM 510 */ - { 0x81FF, 0x0000 }, /* R33279 - DSP3 DM 511 */ - { 0x8800, 0x0000 }, /* R34816 - DSP3 PM 0 */ - { 0x8801, 0x0000 }, /* R34817 - DSP3 PM 1 */ - { 0x8802, 0x0000 }, /* R34818 - DSP3 PM 2 */ - { 0x8803, 0x0000 }, /* R34819 - DSP3 PM 3 */ - { 0x8804, 0x0000 }, /* R34820 - DSP3 PM 4 */ - { 0x8805, 0x0000 }, /* R34821 - DSP3 PM 5 */ - { 0x8DFA, 0x0000 }, /* R36346 - DSP3 PM 1530 */ - { 0x8DFB, 0x0000 }, /* R36347 - DSP3 PM 1531 */ - { 0x8DFC, 0x0000 }, /* R36348 - DSP3 PM 1532 */ - { 0x8DFD, 0x0000 }, /* R36349 - DSP3 PM 1533 */ - { 0x8DFE, 0x0000 }, /* R36350 - DSP3 PM 1534 */ - { 0x8DFF, 0x0000 }, /* R36351 - DSP3 PM 1535 */ - { 0x9000, 0x0000 }, /* R36864 - DSP3 ZM 0 */ - { 0x9001, 0x0000 }, /* R36865 - DSP3 ZM 1 */ - { 0x9002, 0x0000 }, /* R36866 - DSP3 ZM 2 */ - { 0x9003, 0x0000 }, /* R36867 - DSP3 ZM 3 */ - { 0x97FC, 0x0000 }, /* R38908 - DSP3 ZM 2044 */ - { 0x97FD, 0x0000 }, /* R38909 - DSP3 ZM 2045 */ - { 0x97FE, 0x0000 }, /* R38910 - DSP3 ZM 2046 */ - { 0x97FF, 0x0000 }, /* R38911 - DSP3 ZM 2047 */ }; -- 1.7.7.3

1 0

[alsa-devel] ALSA Support for Roland Gaia SH-01
by John F Leach 21 Nov '11

21 Nov '11

All, Can someone please help to add ALSA support for the Roland Gaia (SH-01) Synthesizer? http://www.rolandus.com/products/productdetails.php?ProductId=1074 I started a sample patch for usbquirks.h (see below) but am not sure if the USB_DEVICE address is correct or what to use for the types. What should the quirk table entry look like for this device? Does quirks.c need a special case added? { /* Roland Gaia SH-01 */ USB_DEVICE(0x0582, 0x0111), .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) { .vendor_name = "Roland", .product_name = "Gaia", .ifnum = QUIRK_ANY_INTERFACE, .type = QUIRK_COMPOSITE, .data = (const struct snd_usb_audio_quirk[]) { { .ifnum = 0, .type = QUIRK_AUDIO_STANDARD_INTERFACE }, { .ifnum = 1, .type = QUIRK_AUDIO_STANDARD_INTERFACE }, { .ifnum = 2, .type = QUIRK_STANDARD_MIDI_INTERFACE, } }, { .ifnum = -1 } } } Below is the output of 'lsusb -vv' for the device. Please let me know if additional information is required. Bus 001 Device 013: ID 0582:0111 Roland Corp. Device Descriptor: bLength 18 bDescriptorType 1 bcdUSB 2.00 bDeviceClass 255 Vendor Specific Class bDeviceSubClass 0 bDeviceProtocol 255 bMaxPacketSize0 64 idVendor 0x0582 Roland Corp. idProduct 0x0111 bcdDevice 0.01 iManufacturer 1 Roland iProduct 2 SH-01 iSerial 0 bNumConfigurations 1 Configuration Descriptor: bLength 9 bDescriptorType 2 wTotalLength 167 bNumInterfaces 3 bConfigurationValue 1 iConfiguration 0 bmAttributes 0xc0 Self Powered MaxPower 0mA Interface Descriptor: bLength 9 bDescriptorType 4 bInterfaceNumber 0 bAlternateSetting 0 bNumEndpoints 0 bInterfaceClass 255 Vendor Specific Class bInterfaceSubClass 2 bInterfaceProtocol 2 iInterface 0 ** UNRECOGNIZED: 06 24 f1 01 00 00 Interface Descriptor: bLength 9 bDescriptorType 4 bInterfaceNumber 0 bAlternateSetting 1 bNumEndpoints 1 bInterfaceClass 255 Vendor Specific Class bInterfaceSubClass 2 bInterfaceProtocol 2 iInterface 0 ** UNRECOGNIZED: 07 24 01 01 00 01 00 ** UNRECOGNIZED: 0b 24 02 01 02 04 18 01 44 ac 00 Endpoint Descriptor: bLength 7 bDescriptorType 5 bEndpointAddress 0x05 EP 5 OUT bmAttributes 5 Transfer Type Isochronous Synch Type Asynchronous Usage Type Data wMaxPacketSize 0x0070 1x 112 bytes bInterval 1 Interface Descriptor: bLength 9 bDescriptorType 4 bInterfaceNumber 1 bAlternateSetting 0 bNumEndpoints 0 bInterfaceClass 255 Vendor Specific Class bInterfaceSubClass 2 bInterfaceProtocol 1 iInterface 0 Interface Descriptor: bLength 9 bDescriptorType 4 bInterfaceNumber 1 bAlternateSetting 1 bNumEndpoints 1 bInterfaceClass 255 Vendor Specific Class bInterfaceSubClass 2 bInterfaceProtocol 1 iInterface 0 ** UNRECOGNIZED: 07 24 01 07 00 01 00 ** UNRECOGNIZED: 0b 24 02 01 02 04 18 01 44 ac 00 Endpoint Descriptor: bLength 7 bDescriptorType 5 bEndpointAddress 0x84 EP 4 IN bmAttributes 37 Transfer Type Isochronous Synch Type Asynchronous Usage Type Implicit feedback Data wMaxPacketSize 0x0070 1x 112 bytes bInterval 1 Interface Descriptor: bLength 9 bDescriptorType 4 bInterfaceNumber 2 bAlternateSetting 0 bNumEndpoints 2 bInterfaceClass 255 Vendor Specific Class bInterfaceSubClass 3 bInterfaceProtocol 0 iInterface 0 ** UNRECOGNIZED: 06 24 f1 02 02 02 Endpoint Descriptor: bLength 7 bDescriptorType 5 bEndpointAddress 0x03 EP 3 OUT bmAttributes 2 Transfer Type Bulk Synch Type None Usage Type Data wMaxPacketSize 0x0200 1x 512 bytes bInterval 1 Endpoint Descriptor: bLength 7 bDescriptorType 5 bEndpointAddress 0x82 EP 2 IN bmAttributes 2 Transfer Type Bulk Synch Type None Usage Type Data wMaxPacketSize 0x0200 1x 512 bytes bInterval 0 Interface Descriptor: bLength 9 bDescriptorType 4 bInterfaceNumber 2 bAlternateSetting 1 bNumEndpoints 2 bInterfaceClass 255 Vendor Specific Class bInterfaceSubClass 3 bInterfaceProtocol 0 iInterface 0 Endpoint Descriptor: bLength 7 bDescriptorType 5 bEndpointAddress 0x03 EP 3 OUT bmAttributes 2 Transfer Type Bulk Synch Type None Usage Type Data wMaxPacketSize 0x0200 1x 512 bytes bInterval 1 Endpoint Descriptor: bLength 7 bDescriptorType 5 bEndpointAddress 0x81 EP 1 IN bmAttributes 3 Transfer Type Interrupt Synch Type None Usage Type Data wMaxPacketSize 0x0040 1x 64 bytes bInterval 1 Device Qualifier (for other device speed): bLength 10 bDescriptorType 6 bcdUSB 2.00 bDeviceClass 8 Mass Storage bDeviceSubClass 6 SCSI bDeviceProtocol 80 Bulk (Zip) bMaxPacketSize0 64 bNumConfigurations 0 Device Status: 0x0001 Self Powered Regards, John F Leach

4 5

[alsa-devel] [PATCH] ASoC: Remove redundant regcache_sync call in cs42l73_resume
by Axel Lin 21 Nov '11

21 Nov '11

It's done in cs42l73_set_bias_level when the dapm.bias_level is switching from SND_SOC_BIAS_OFF to SND_SOC_BIAS_STANDBY. Signed-off-by: Axel Lin <axel.lin(a)gmail.com> --- sound/soc/codecs/cs42l73.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/sound/soc/codecs/cs42l73.c b/sound/soc/codecs/cs42l73.c index 066d869..e8a62fe 100644 --- a/sound/soc/codecs/cs42l73.c +++ b/sound/soc/codecs/cs42l73.c @@ -1271,10 +1271,6 @@ static int cs42l73_suspend(struct snd_soc_codec *codec, pm_message_t state) static int cs42l73_resume(struct snd_soc_codec *codec) { - - struct cs42l73_private *cs42l73 = snd_soc_codec_get_drvdata(codec); - regcache_sync(cs42l73->regmap); - cs42l73_set_bias_level(codec, SND_SOC_BIAS_STANDBY); return 0; } -- 1.7.5.4

2 1

[alsa-devel] [PATCH 1/2] ASoC: cs42l73: Return proper error code if device id mismatch
by Axel Lin 21 Nov '11

21 Nov '11

Return -ENODEV instead of 0 if device id mismatch. Signed-off-by: Axel Lin <axel.lin(a)gmail.com> --- sound/soc/codecs/cs42l73.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/sound/soc/codecs/cs42l73.c b/sound/soc/codecs/cs42l73.c index aadfd6b..3eed21e 100644 --- a/sound/soc/codecs/cs42l73.c +++ b/sound/soc/codecs/cs42l73.c @@ -1370,6 +1370,7 @@ static __devinit int cs42l73_i2c_probe(struct i2c_client *i2c_client, if (devid != CS42L73_DEVID) { + ret = -ENODEV; dev_err(&i2c_client->dev, "CS42L73 Device ID (%X). Expected %X\n", devid, CS42L73_DEVID); -- 1.7.5.4

2 3

[alsa-devel] [PATCH] ASoC: Convert WM8753 to table based DAPM and control init
by Mark Brown 21 Nov '11

21 Nov '11

Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm8753.c | 24 ++++++++---------------- 1 files changed, 8 insertions(+), 16 deletions(-) diff --git a/sound/soc/codecs/wm8753.c b/sound/soc/codecs/wm8753.c index 3f3541b..03cd46b 100644 --- a/sound/soc/codecs/wm8753.c +++ b/sound/soc/codecs/wm8753.c @@ -486,7 +486,7 @@ SND_SOC_DAPM_INPUT("MIC2"), SND_SOC_DAPM_VMID("VREF"), }; -static const struct snd_soc_dapm_route audio_map[] = { +static const struct snd_soc_dapm_route wm8753_dapm_routes[] = { /* left mixer */ {"Left Mixer", "Left Playback Switch", "Left DAC"}, {"Left Mixer", "Voice Playback Switch", "Voice DAC"}, @@ -640,17 +640,6 @@ static const struct snd_soc_dapm_route audio_map[] = { {"ACOP", NULL, "ALC Mixer"}, }; -static int wm8753_add_widgets(struct snd_soc_codec *codec) -{ - struct snd_soc_dapm_context *dapm = &codec->dapm; - - snd_soc_dapm_new_controls(dapm, wm8753_dapm_widgets, - ARRAY_SIZE(wm8753_dapm_widgets)); - snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map)); - - return 0; -} - /* PLL divisors */ struct _pll_div { u32 div2:1; @@ -1468,10 +1457,6 @@ static int wm8753_probe(struct snd_soc_codec *codec) snd_soc_update_bits(codec, WM8753_LINVOL, 0x0100, 0x0100); snd_soc_update_bits(codec, WM8753_RINVOL, 0x0100, 0x0100); - snd_soc_add_controls(codec, wm8753_snd_controls, - ARRAY_SIZE(wm8753_snd_controls)); - wm8753_add_widgets(codec); - return 0; } @@ -1493,6 +1478,13 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8753 = { .reg_cache_size = ARRAY_SIZE(wm8753_reg), .reg_word_size = sizeof(u16), .reg_cache_default = wm8753_reg, + + .controls = wm8753_snd_controls, + .num_controls = ARRAY_SIZE(wm8753_snd_controls), + .dapm_widgets = wm8753_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(wm8753_dapm_widgets), + .dapm_routes = wm8753_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(wm8753_dapm_routes), }; static const struct of_device_id wm8753_of_match[] = { -- 1.7.7.3

1 0

[alsa-devel] Firmware during bootup
by anish kumar 21 Nov '11

21 Nov '11

Hello Everyone, I have a hardware(Noise processing chip) for which I am writing the driver.Is it a good idea to download the firmware in probe function by spawing kthread?I can't download the firmware using request_firmware api as this hardware is required during bootup for boot-up sound and request_firmware is out of question because of no support in user-space. Am i missing something?I am bit concerned about boot-up time as well. Please help me.

1 0

[alsa-devel] [PATCH 0/2] ASoC: Fix Panda board support
by Peter Ujfalusi 21 Nov '11

21 Nov '11

Hello, The following two patch fixes the audio support for Panda board. The sdp4430 machine driver suppose to handle sdp4430/panda board, but for some reason the machine_is check was excluding the Panda board. It would be nice if this can be integrated to 3.2. Regards, Peter --- Peter Ujfalusi (2): ASoC: sdp4430: No need to announce the loading of the driver ASoC: sdp4430: Fix Panda support sound/soc/omap/sdp4430.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) -- 1.7.8.rc3

4 9