October 2007 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH] Free after memory allocation failure in emu10k1
by Roel Kluin 31 Oct '07

31 Oct '07

I can confirm that it builds. -- Free after memory allocation failure Signed-off-by: Roel Kluin <12o3l(a)tiscali.nl> --- diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c index 97c41d7..88f8fb3 100644 --- a/sound/pci/emu10k1/emu10k1_main.c +++ b/sound/pci/emu10k1/emu10k1_main.c @@ -1894,25 +1894,31 @@ static unsigned char saved_regs_audigy[] = { static int __devinit alloc_pm_buffer(struct snd_emu10k1 *emu) { int size; size = ARRAY_SIZE(saved_regs); if (emu->audigy) size += ARRAY_SIZE(saved_regs_audigy); emu->saved_ptr = vmalloc(4 * NUM_G * size); if (! emu->saved_ptr) return -ENOMEM; - if (snd_emu10k1_efx_alloc_pm_buffer(emu) < 0) + + if (snd_emu10k1_efx_alloc_pm_buffer(emu) < 0) { + vfree(emu->saved_ptr); return -ENOMEM; + } + if (emu->card_capabilities->ca0151_chip && - snd_p16v_alloc_pm_buffer(emu) < 0) + snd_p16v_alloc_pm_buffer(emu) < 0) { + vfree(emu->saved_ptr); return -ENOMEM; + } return 0; } static void free_pm_buffer(struct snd_emu10k1 *emu) { vfree(emu->saved_ptr); snd_emu10k1_efx_free_pm_buffer(emu); if (emu->card_capabilities->ca0151_chip) snd_p16v_free_pm_buffer(emu); } diff --git a/sound/pci/emu10k1/emufx.c b/sound/pci/emu10k1/emufx.c index 9bf1cd5..a31ad02 100644 --- a/sound/pci/emu10k1/emufx.c +++ b/sound/pci/emu10k1/emufx.c @@ -2634,30 +2634,43 @@ int __devinit snd_emu10k1_fx8010_new(struct snd_emu10k1 *emu, int device, struct #ifdef CONFIG_PM int __devinit snd_emu10k1_efx_alloc_pm_buffer(struct snd_emu10k1 *emu) { int len; len = emu->audigy ? 0x200 : 0x100; emu->saved_gpr = kmalloc(len * 4, GFP_KERNEL); if (! emu->saved_gpr) return -ENOMEM; + len = emu->audigy ? 0x100 : 0xa0; emu->tram_val_saved = kmalloc(len * 4, GFP_KERNEL); + if (! emu->tram_val_saved) + goto free_gpr; + emu->tram_addr_saved = kmalloc(len * 4, GFP_KERNEL); - if (! emu->tram_val_saved || ! emu->tram_addr_saved) - return -ENOMEM; + if (! emu->tram_addr_saved) + goto free_tram_val; + len = emu->audigy ? 2 * 1024 : 2 * 512; emu->saved_icode = vmalloc(len * 4); if (! emu->saved_icode) - return -ENOMEM; + goto free_tram_addr; + return 0; +free_gpr: + kfree(emu->saved_gpr); +free_tram_val: + kfree(emu->tram_val_saved); +free_tram_addr: + kfree(emu->tram_addr_saved); + return -ENOMEM; } void snd_emu10k1_efx_free_pm_buffer(struct snd_emu10k1 *emu) { kfree(emu->saved_gpr); kfree(emu->tram_val_saved); kfree(emu->tram_addr_saved); vfree(emu->saved_icode); }

2 1

[alsa-devel] how to handle bt848 audio driver
by Trent Piepho 30 Oct '07

30 Oct '07

I've made some more patches for the ALSA bt87x audio driver to support more features of the Osprey 440 card. In order to support certain features, the ALSA driver needs access to the bt878's GPIO lines and I2C bus. These are controlled by PCI function 0, which is driven by the V4L driver. The bt878 DVB driver (which drives PCI function 1 just like the ALSA driver) needs to do the same thing and there is already some code to handle it. So, the ALSA driver (snd-bt87x) needs to use functions from the V4L driver (bttv). As it is now, the two drivers are completely separate and don't share any code and can be loaded individually. The DVB driver in the same tree as bttv, so this isn't a problem. But the snd-bt87x is in another tree, so it's somewhat harder, and I'm not sure what to do about it. The driver will need some header files from the bttv directory. I guess this can be handled by adding a -I flag in the Makefile, though that seems a little ugly. The bigger problem is that changes to snd-bt87x will depend on changes to bttv. How can the ALSA build system handle this? For instance, my patch to add a digital volume control to snd-bt87x requires a new function to be exported from bttv. How will ALSA build snd-bt87x if the kernel source doesn't yet have this function?

3 3

[alsa-devel] External Sound Card
by John Dey 30 Oct '07

30 Oct '07

I am looking for a external sound card that has spdif (7.1) functioning. The driver Soundblaster nx usb seems like it is under active development. The alsa documentation page says that spdif is not working. Is the documentation page out of date or is someone working on that capability? If spdif capability is not in the near future, can someone suggest a sound device (spdif capable) that I could look at. Thanks. John

2 3

Re: [alsa-devel] sysfs: WARNING: at fs/sysfs/dir.c:424 sysfs_add_one() - with ALSA
by Kamalesh Babulal 30 Oct '07

30 Oct '07

On Fri, Oct 26, 2007 at 12:44:38PM +0530, Amit Shah wrote: > On 2.6.24-rc1, I get this for all my eth interfaces: > > [ 150.389821] sysfs: duplicate filename 'eth1_rename' can not be created > [ 150.389824] WARNING: at fs/sysfs/dir.c:424 sysfs_add_one() > [ 150.389826] > [ 150.389826] Call Trace: > [ 150.389840] [<ffffffff802ee9cf>] sysfs_add_one+0xaf/0xf0 > [ 150.389844] [<ffffffff802ef9fe>] sysfs_create_link+0x9e/0x150 > [ 150.389849] [<ffffffff8038a418>] device_rename+0x1d8/0x230 > [ 150.389854] [<ffffffff803c2626>] dev_change_name+0xb6/0x230 > [ 150.389857] [<ffffffff803c2d5b>] dev_ioctl+0x2bb/0x5a0 > [ 150.389862] [<ffffffff80437436>] _spin_unlock_irqrestore+0x16/0x40 > [ 150.389864] [<ffffffff8043947a>] do_page_fault+0x24a/0x930 > [ 150.389869] [<ffffffff803b341d>] sock_ioctl+0x7d/0x250 > [ 150.389872] [<ffffffff802aafef>] do_ioctl+0x2f/0xa0 > [ 150.389875] [<ffffffff802ab0d4>] vfs_ioctl+0x74/0x2d0 > [ 150.389878] [<ffffffff802ab3c1>] sys_ioctl+0x91/0xb0 > [ 150.389881] [<ffffffff8020c32e>] system_call+0x7e/0x83 > [ 150.389884] > [ 150.389886] net eth1_rename: device_rename: sysfs_create_symlink failed (-17) > [ 151.169923] sysfs: duplicate filename 'eth2' can not be created > [ 151.169927] WARNING: at fs/sysfs/dir.c:424 sysfs_add_one() > [ 151.169929] > [ 151.169930] Call Trace: > [ 151.169946] [<ffffffff802ee9cf>] sysfs_add_one+0xaf/0xf0 > [ 151.169949] [<ffffffff802ef9fe>] sysfs_create_link+0x9e/0x150 > [ 151.169955] [<ffffffff8038a418>] device_rename+0x1d8/0x230 > [ 151.169960] [<ffffffff803c2626>] dev_change_name+0xb6/0x230 > [ 151.169963] [<ffffffff803c2d5b>] dev_ioctl+0x2bb/0x5a0 > [ 151.169967] [<ffffffff80437436>] _spin_unlock_irqrestore+0x16/0x40 > [ 151.169970] [<ffffffff8043947a>] do_page_fault+0x24a/0x930 > [ 151.169974] [<ffffffff803b341d>] sock_ioctl+0x7d/0x250 > [ 151.169978] [<ffffffff802aafef>] do_ioctl+0x2f/0xa0 > [ 151.169980] [<ffffffff802ab0d4>] vfs_ioctl+0x74/0x2d0 > [ 151.169983] [<ffffffff802ab3c1>] sys_ioctl+0x91/0xb0 > [ 151.169987] [<ffffffff8020c32e>] system_call+0x7e/0x83 > [ 151.169990] > [ 151.169992] net eth2: device_rename: sysfs_create_symlink failed (-17) > [ 151.176762] e1000: eth2: e1000_watchdog: NIC Link is Up 100 Mbps > Full Duplex, Flow Control: RX/TX > [ 151.209396] sysfs: duplicate filename 'eth0' can not be created > Hi, I get similar warning, while loading the alsa driver [ 191.933548] Advanced Linux Sound Architecture Driver Version 1.0.15 (Tue Oct 23 06:09:18 2007 UTC). [ 191.996323] ALSA sound/core/seq/oss/seq_oss.c:232: can't register device seq [ 192.046004] sysfs: duplicate filename 'audio' can not be created [ 192.086048] WARNING: at fs/sysfs/dir.c:424 sysfs_add_one() [ 192.122882] [ 192.122883] Call Trace: [ 192.154111] [<ffffffff802fbe74>] sysfs_add_one+0x5c/0xc9 [ 192.190144] [<ffffffff802fc498>] create_dir+0x58/0x93 [ 192.224571] [<ffffffff802fc50b>] sysfs_create_dir+0x38/0x4f [ 192.262068] [<ffffffff813a622b>] _spin_unlock+0x26/0x2a [ 192.297448] [<ffffffff8048eb92>] kobject_add+0x13e/0x1f9 [ 192.333292] [<ffffffff8065c746>] device_add+0xac/0x610 [ 192.367959] [<ffffffff8065ccc3>] device_register+0x19/0x1d [ 192.404621] [<ffffffff8065cda6>] device_create+0xdf/0x110 [ 192.440760] [<ffffffff8049301c>] sprintf+0x68/0x6a [ 192.473288] [<ffffffff80ff9b4a>] sound_insert_unit+0xcf/0x172 [ 192.511443] [<ffffffff80ff9ba4>] sound_insert_unit+0x129/0x172 [ 192.549996] [<ffffffff80ff9deb>] register_sound_special_device+0x14a/0x159 [ 192.594734] [<ffffffff8101ed06>] snd_register_oss_device+0x11d/0x18f [ 192.636281] [<ffffffff81034470>] register_oss_dsp+0x54/0x8a [ 192.673031] [<ffffffff802604e6>] mark_held_locks+0x4a/0x6a [ 192.709275] [<ffffffff813a50f1>] mutex_lock_nested+0x2a8/0x2c3 [ 192.747533] [<ffffffff802604e6>] mark_held_locks+0x4a/0x6a [ 192.783587] [<ffffffff813a4e32>] __mutex_unlock_slowpath+0x12e/0x13a [ 192.824764] [<ffffffff802606d0>] trace_hardirqs_on+0x11c/0x147 [ 192.862739] [<ffffffff810378d4>] snd_pcm_oss_register_minor+0x35/0x16b [ 192.904816] [<ffffffff813a4e47>] mutex_unlock+0x9/0xb [ 192.938016] [<ffffffff810208de>] snd_timer_dev_register+0x125/0x12c [ 192.978469] [<ffffffff8101e27c>] snd_device_register+0x73/0xe0 [ 193.016307] [<ffffffff8102e03d>] snd_pcm_timer_init+0xba/0xf5 [ 193.053660] [<ffffffff810245bd>] snd_pcm_dev_register+0x1d7/0x211 [ 193.093096] [<ffffffff8101e1e1>] snd_device_register_all+0x5d/0x85 [ 193.133041] [<ffffffff810197ac>] snd_card_register+0x4e/0x2ea [ 193.170427] [<ffffffff8104f66d>] snd_dummy_probe+0x201/0x21a [ 193.207240] [<ffffffff806601b5>] platform_drv_probe+0x12/0x14 [ 193.244615] [<ffffffff8065ea16>] driver_probe_device+0x132/0x1d2 [ 193.283580] [<ffffffff8065eab6>] __device_attach+0x0/0xb [ 193.318382] [<ffffffff8065eabf>] __device_attach+0x9/0xb [ 193.353173] [<ffffffff8065df69>] bus_for_each_drv+0x47/0x7d [ 193.389534] [<ffffffff8065eb5a>] device_attach+0x75/0x8d [ 193.424319] [<ffffffff8065dd78>] bus_attach_device+0x2d/0x79 [ 193.461202] [<ffffffff8065ca2d>] device_add+0x393/0x610 [ 193.495910] [<ffffffff806605a5>] platform_device_add+0x133/0x16a [ 193.534870] [<ffffffff806607a8>] platform_device_register_simple+0x46/0x64 [ 193.579013] [<ffffffff8208d029>] alsa_card_dummy_init+0x38/0x7e [ 193.617437] [<ffffffff82028678>] kernel_init+0x176/0x2ed [ 193.652173] [<ffffffff813a5d27>] trace_hardirqs_on_thunk+0x35/0x3a [ 193.692147] [<ffffffff802606d0>] trace_hardirqs_on+0x11c/0x147 [ 193.730030] [<ffffffff8020cef8>] child_rip+0xa/0x12 [ 193.762145] [<ffffffff8020c60f>] restore_args+0x0/0x30 [ 193.795821] [<ffffffff8023fc7f>] release_console_sem+0x4d/0x1f5 [ 193.834171] [<ffffffff82028502>] kernel_init+0x0/0x2ed [ 193.867870] [<ffffffff8020ceee>] child_rip+0x0/0x12 [ 193.899987] [ 193.911270] kobject_add failed for audio with -EEXIST, don't try to register things with the same name in the same directory. [ 193.983989] [ 193.983990] Call Trace: [ 194.012668] [<ffffffff8048e440>] kobject_put+0x19/0x1b [ 194.046571] [<ffffffff8048ec17>] kobject_add+0x1c3/0x1f9 [ 194.081445] [<ffffffff8065c746>] device_add+0xac/0x610 [ 194.115311] [<ffffffff8065ccc3>] device_register+0x19/0x1d [ 194.151267] [<ffffffff8065cda6>] device_create+0xdf/0x110 [ 194.186663] [<ffffffff8049301c>] sprintf+0x68/0x6a [ 194.218463] [<ffffffff80ff9b4a>] sound_insert_unit+0xcf/0x172 [ 194.255953] [<ffffffff80ff9ba4>] sound_insert_unit+0x129/0x172 [ 194.293932] [<ffffffff80ff9deb>] register_sound_special_device+0x14a/0x159 [ 194.338208] [<ffffffff8101ed06>] snd_register_oss_device+0x11d/0x18f [ 194.379363] [<ffffffff81034470>] register_oss_dsp+0x54/0x8a [ 194.415853] [<ffffffff802604e6>] mark_held_locks+0x4a/0x6a [ 194.451820] [<ffffffff813a50f1>] mutex_lock_nested+0x2a8/0x2c3 [ 194.489889] [<ffffffff802604e6>] mark_held_locks+0x4a/0x6a [ 194.525880] [<ffffffff813a4e32>] __mutex_unlock_slowpath+0x12e/0x13a [ 194.567098] [<ffffffff802606d0>] trace_hardirqs_on+0x11c/0x147 [ 194.605551] [<ffffffff810378d4>] snd_pcm_oss_register_minor+0x35/0x16b [ 194.647848] [<ffffffff813a4e47>] mutex_unlock+0x9/0xb [ 194.681271] [<ffffffff810208de>] snd_timer_dev_register+0x125/0x12c [ 194.721968] [<ffffffff8101e27c>] snd_device_register+0x73/0xe0 [ 194.760041] [<ffffffff8102e03d>] snd_pcm_timer_init+0xba/0xf5 [ 194.797490] [<ffffffff810245bd>] snd_pcm_dev_register+0x1d7/0x211 [ 194.836921] [<ffffffff8101e1e1>] snd_device_register_all+0x5d/0x85 [ 194.876879] [<ffffffff810197ac>] snd_card_register+0x4e/0x2ea [ 194.914262] [<ffffffff8104f66d>] snd_dummy_probe+0x201/0x21a [ 194.951096] [<ffffffff806601b5>] platform_drv_probe+0x12/0x14 [ 194.988480] [<ffffffff8065ea16>] driver_probe_device+0x132/0x1d2 [ 195.027449] [<ffffffff8065eab6>] __device_attach+0x0/0xb [ 195.062267] [<ffffffff8065eabf>] __device_attach+0x9/0xb [ 195.097053] [<ffffffff8065df69>] bus_for_each_drv+0x47/0x7d [ 195.133408] [<ffffffff8065eb5a>] device_attach+0x75/0x8d [ 195.168203] [<ffffffff8065dd78>] bus_attach_device+0x2d/0x79 [ 195.205133] [<ffffffff8065ca2d>] device_add+0x393/0x610 [ 195.239455] [<ffffffff806605a5>] platform_device_add+0x133/0x16a [ 195.278432] [<ffffffff806607a8>] platform_device_register_simple+0x46/0x64 [ 195.322586] [<ffffffff8208d029>] alsa_card_dummy_init+0x38/0x7e [ 195.361032] [<ffffffff82028678>] kernel_init+0x176/0x2ed [ 195.395798] [<ffffffff813a5d27>] trace_hardirqs_on_thunk+0x35/0x3a [ 195.435764] [<ffffffff802606d0>] trace_hardirqs_on+0x11c/0x147 [ 195.473657] [<ffffffff8020cef8>] child_rip+0xa/0x12 [ 195.505771] [<ffffffff8020c60f>] restore_args+0x0/0x30 [ 195.539459] [<ffffffff8023fc7f>] release_console_sem+0x4d/0x1f5 [ 195.577825] [<ffffffff82028502>] kernel_init+0x0/0x2ed [ 195.611533] [<ffffffff8020ceee>] child_rip+0x0/0x12 [ 195.643690] [ 195.659326] ALSA sound/core/rawmidi.c:1542: unable to register OSS rawmidi device 1:0 [ 195.712879] no UART detected at 0x1 [ 195.739880] Motu MidiTimePiece on parallel port irq: 7 ioport: 0x378 [ 195.804370] usbcore: registered new interface driver snd-usb-audio [ 195.844370] usbcore: registered new interface driver snd-usb-usx2y [ 195.884286] usbcore: registered new interface driver snd-usb-caiaq [ 195.924293] ASoC version 0.13.1 [ 195.946107] ALSA device list: [ 195.966550] #0: Dummy 1 [ 195.984913] #1: Virtual MIDI Card 1 [ 196.009489] #2: MTPAV on parallel port at 0x378 -- Thanks & Regards, Kamalesh Babulal, Linux Technology Center, IBM, ISTL.

5 9

[alsa-devel] [PATCH] SB Live24-External better handling
by Timofei V. Bondarenko 30 Oct '07

30 Oct '07

Hi. This patch improves support for 'SB Live 24-bit Extarnal' USB card. 1) This card can go into muted state when a headphones connected or disconnected. So notify mixer about changes in headphone jack. 2) Add LED controls and procfs support just as in similar Audigy 2 NX card. 3) Rename 'PCM Capture' conrol to 'Mic Capture' to reflect reality: the card may adjust microphone input level only. Regards. Tim.

2 3

[alsa-devel] Removal of sequencer instrument layer
by Takashi Iwai 30 Oct '07

30 Oct '07

Hi, JFYI, together with OPL3 hwdep loader, $SUBJECT is done as I mentioned earlier. This resulted in removal of 5600 LOC in alsa-kernel tree. Yeah, a good number. Takashi

1 0

[alsa-devel] cmipci CM_FLINKOFF disables multinchannel playback
by Timofei V. Bondarenko 30 Oct '07

30 Oct '07

Hi. I found the latest cmipci driver cannot playback in multichannel mode anymore. My hardware is 'CMI8738 model 55' attempting to play 2 or 4 channels through the 2nd DAC i get no sound at all. 6 ch produces sound only at center/bass while front and rear still mute. I found the root of problem in redefinition of some bits of the CM_REG_MISC_CTRL (0x18) register. Was: CM_FLINKON=0x40, CM_FLINKOFF=0x20 Now it is: CM_FLINKON=0x80 CM_FLINKOFF=0x40 Note the CM_FLINKOFF does collide with the CM_MUTECH1=0x40 bit. This bit disables playback on 2nd DAC. The CM_FLINKOFF/CM_FLINKON bits used in the 'Modem' mixer control only. During startup the mixer turns the modem off somewhere and this disables 2nd DAC as well. Complete removal of this 'Modem' control fixes the problem. Is it an acceptable solution? I guess the snd_cmipci_control_switches could be removed too. Regards. Tim. --- alsa-driver-hg20071027/alsa-kernel/pci/cmipci.c 2007-09-18 04:00:10.000000000 +0400 +++ alsa-driver/alsa-kernel/pci/cmipci.c 2007-10-29 17:09:31.000000000 +0300 @@ -2389,7 +2389,6 @@ DEFINE_BIT_SWITCH_ARG(fourch, CM_REG_MIS // DEFINE_BIT_SWITCH_ARG(line_rear, CM_REG_MIXER1, CM_REAR2LIN, 1, 0); // DEFINE_BIT_SWITCH_ARG(line_bass, CM_REG_LEGACY_CTRL, CM_CENTR2LIN|CM_BASE2LIN, 0, 0); // DEFINE_BIT_SWITCH_ARG(joystick, CM_REG_FUNCTRL1, CM_JYSTK_EN, 0, 0); /* now module option */ -DEFINE_SWITCH_ARG(modem, CM_REG_MISC_CTRL, CM_FLINKON|CM_FLINKOFF, CM_FLINKON, 0, 0); #define DEFINE_SWITCH(sname, stype, sarg) \ { .name = sname, \ @@ -2597,7 +2596,7 @@ static struct snd_kcontrol_new snd_cmipc /* card control switches */ static struct snd_kcontrol_new snd_cmipci_control_switches[] __devinitdata = { // DEFINE_CARD_SWITCH("Joystick", joystick), /* now module option */ - DEFINE_CARD_SWITCH("Modem", modem), +// DEFINE_CARD_SWITCH("Modem", modem), };

2 3

[alsa-devel] PATCH: ln2440sbc ac97 support
by Ivan Kuten 29 Oct '07

29 Oct '07

Hello, This patch adds ac97 support for ln2440sbc board from LittleChips. This board is based on s3c2440 SoC + AC97 Realtek ALC650 codec. Existing s3c2443 implementation is slightly modified because s3c2440 and s3c2443 have different AC97 interrupts. Regards, Ivan Signed-off-by: Ivan Kuten <ivan.kuten(a)promwad.com> diff -urN linux-2.6.23/sound/soc/s3c24xx/Kconfig linux-2.6.23-2440/sound/soc/s3c24xx/Kconfig --- linux-2.6.23/sound/soc/s3c24xx/Kconfig 2007-10-09 22:31:38.000000000 +0200 +++ linux-2.6.23-2440/sound/soc/s3c24xx/Kconfig 2007-10-28 01:18:23.000000000 +0200 @@ -34,4 +34,12 @@ Say Y if you want to add support for SoC audio on smdk2443 with the WM9710. +config SND_S3C24XX_SOC_LN2440SBC_ALC650 + tristate "SoC AC97 Audio support for LN2440SBC - ALC650" + depends on SND_S3C24XX_SOC + select SND_S3C2443_SOC_AC97 + select SND_SOC_AC97_CODEC + help + Say Y if you want to add support for SoC audio on ln2440sbc + with the ALC650. diff -urN linux-2.6.23/sound/soc/s3c24xx/Makefile linux-2.6.23-2440/sound/soc/s3c24xx/Makefile --- linux-2.6.23/sound/soc/s3c24xx/Makefile 2007-10-09 22:31:38.000000000 +0200 +++ linux-2.6.23-2440/sound/soc/s3c24xx/Makefile 2007-10-25 01:28:18.000000000 +0200 @@ -10,6 +10,8 @@ # S3C24XX Machine Support snd-soc-neo1973-wm8753-objs := neo1973_wm8753.o snd-soc-smdk2443-wm9710-objs := smdk2443_wm9710.o +snd-soc-ln2440sbc-alc650-objs := ln2440sbc_alc650.o obj-$(CONFIG_SND_S3C24XX_SOC_NEO1973_WM8753) += snd-soc-neo1973-wm8753.o obj-$(CONFIG_SND_S3C24XX_SOC_SMDK2443_WM9710) += snd-soc-smdk2443-wm9710.o +obj-$(CONFIG_SND_S3C24XX_SOC_LN2440SBC_ALC650) += snd-soc-ln2440sbc-alc650.o diff -urN linux-2.6.23/sound/soc/s3c24xx/ln2440sbc_alc650.c linux-2.6.23-2440/sound/soc/s3c24xx/ln2440sbc_alc650.c --- linux-2.6.23/sound/soc/s3c24xx/ln2440sbc_alc650.c 1970-01-01 01:00:00.000000000 +0100 +++ linux-2.6.23-2440/sound/soc/s3c24xx/ln2440sbc_alc650.c 2007-10-28 00:27:41.000000000 +0200 @@ -0,0 +1,86 @@ +/* + * SoC audio for ln2440sbc + * + * Copyright 2007 KonekTel, a.s. + * Author: Ivan Kuten + * ivan.kuten(a)promwad.com + * + * Heavily based on smdk2443_wm9710.c + * Copyright 2007 Wolfson Microelectronics PLC. + * Author: Graeme Gregory + * graeme.gregory(a)wolfsonmicro.com or linux(a)wolfsonmicro.com + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + */ + +#include <linux/module.h> +#include <linux/device.h> +#include <sound/driver.h> +#include <sound/core.h> +#include <sound/pcm.h> +#include <sound/soc.h> +#include <sound/soc-dapm.h> + +#include "../codecs/ac97.h" +#include "s3c24xx-pcm.h" +#include "s3c24xx-ac97.h" + +static struct snd_soc_machine ln2440sbc; + +static struct snd_soc_dai_link ln2440sbc_dai[] = { +{ + .name = "AC97", + .stream_name = "AC97 HiFi", + .cpu_dai = &s3c2443_ac97_dai[0], + .codec_dai = &ac97_dai, +}, +}; + +static struct snd_soc_machine ln2440sbc = { + .name = "LN2440SBC", + .dai_link = ln2440sbc_dai, + .num_links = ARRAY_SIZE(ln2440sbc_dai), +}; + +static struct snd_soc_device ln2440sbc_snd_ac97_devdata = { + .machine = &ln2440sbc, + .platform = &s3c24xx_soc_platform, + .codec_dev = &soc_codec_dev_ac97, +}; + +static struct platform_device *ln2440sbc_snd_ac97_device; + +static int __init ln2440sbc_init(void) +{ + int ret; + + ln2440sbc_snd_ac97_device = platform_device_alloc("soc-audio", -1); + if (!ln2440sbc_snd_ac97_device) + return -ENOMEM; + + platform_set_drvdata(ln2440sbc_snd_ac97_device, + &ln2440sbc_snd_ac97_devdata); + ln2440sbc_snd_ac97_devdata.dev = &ln2440sbc_snd_ac97_device->dev; + ret = platform_device_add(ln2440sbc_snd_ac97_device); + + if (ret) + platform_device_put(ln2440sbc_snd_ac97_device); + + return ret; +} + +static void __exit ln2440sbc_exit(void) +{ + platform_device_unregister(ln2440sbc_snd_ac97_device); +} + +module_init(ln2440sbc_init); +module_exit(ln2440sbc_exit); + +/* Module information */ +MODULE_AUTHOR("Ivan Kuten"); +MODULE_DESCRIPTION("ALSA SoC ALC650 LN2440SBC"); +MODULE_LICENSE("GPL"); diff -urN linux-2.6.23/sound/soc/s3c24xx/s3c2443-ac97.c linux-2.6.23-2440/sound/soc/s3c24xx/s3c2443-ac97.c --- linux-2.6.23/sound/soc/s3c24xx/s3c2443-ac97.c 2007-10-09 22:31:38.000000000 +0200 +++ linux-2.6.23-2440/sound/soc/s3c24xx/s3c2443-ac97.c 2007-10-28 00:55:57.000000000 +0200 @@ -32,7 +32,7 @@ #include <asm/hardware.h> #include <asm/io.h> -#include <asm/arch/regs-ac97.h> +#include <asm/plat-s3c/regs-ac97.h> #include <asm/arch/regs-gpio.h> #include <asm/arch/regs-clock.h> #include <asm/arch/audio.h> @@ -253,7 +253,7 @@ ac_glbctrl |= S3C_AC97_GLBCTRL_TRANSFERDATAENABLE; writel(ac_glbctrl, s3c24xx_ac97.regs + S3C_AC97_GLBCTRL); - ret = request_irq(IRQ_S3C2443_AC97, s3c2443_ac97_irq, + ret = request_irq(IRQ_S3C244x_AC97, s3c2443_ac97_irq, IRQF_DISABLED, "AC97", NULL); if (ret < 0) { printk(KERN_ERR "s3c24xx-ac97: interrupt request failed.\n"); @@ -266,7 +266,7 @@ static void s3c2443_ac97_remove(struct platform_device *pdev) { - free_irq(IRQ_S3C2443_AC97, NULL); + free_irq(IRQ_S3C244x_AC97, NULL); clk_disable(s3c24xx_ac97.ac97_clk); clk_put(s3c24xx_ac97.ac97_clk); iounmap(s3c24xx_ac97.regs); diff -urN linux-2.6.23/sound/soc/s3c24xx/s3c24xx-ac97.h linux-2.6.23-2440/sound/soc/s3c24xx/s3c24xx-ac97.h --- linux-2.6.23/sound/soc/s3c24xx/s3c24xx-ac97.h 2007-10-09 22:31:38.000000000 +0200 +++ linux-2.6.23-2440/sound/soc/s3c24xx/s3c24xx-ac97.h 2007-10-28 00:32:04.000000000 +0200 @@ -20,6 +20,12 @@ #define AC_CMD_ADDR(x) (x << 16) #define AC_CMD_DATA(x) (x & 0xffff) +#ifdef CONFIG_CPU_S3C2440 +#define IRQ_S3C244x_AC97 IRQ_S3C2440_AC97 +#else +#define IRQ_S3C244x_AC97 IRQ_S3C2443_AC97 +#endif + extern struct snd_soc_cpu_dai s3c2443_ac97_dai[]; #endif /*S3C24XXAC97_H_*/

3 3

[alsa-devel] [PATCH] ac97_patch: compilation warning fix
by Krzysztof Helt 29 Oct '07

29 Oct '07

From: Krzysztof Helt <krzysztof.h1(a)wp.pl> This patch kills these two compilation warnings if power management is disabled: sound/pci/ac97/ac97_patch.h:86: warning: 'snd_ac97_restore_status' declared 'static' but never defined sound/pci/ac97/ac97_patch.h:87: warning: 'snd_ac97_restore_iec958' declared 'static' but never defined Signed-off-by: Krzysztof Helt <krzysztof.h1(a)wp.pl> --- The patch was done against kernel 2.6.24-rc1-git4. diff -urp linux-ref/sound/pci/ac97/ac97_patch.h linux-new/sound/pci/ac97/ac97_patch.h --- linux-ref/sound/pci/ac97/ac97_patch.h 2007-10-28 11:11:20.000000000 +0100 +++ linux-new/sound/pci/ac97/ac97_patch.h 2007-10-28 12:46:34.000000000 +0100 @@ -83,8 +83,10 @@ static int snd_ac97_swap_ctl(struct snd_ const char *s2, const char *suffix); static void snd_ac97_rename_vol_ctl(struct snd_ac97 *ac97, const char *src, const char *dst); +#ifdef CONFIG_PM static void snd_ac97_restore_status(struct snd_ac97 *ac97); static void snd_ac97_restore_iec958(struct snd_ac97 *ac97); +#endif static int snd_ac97_info_enum_double(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo); static int snd_ac97_get_enum_double(struct snd_kcontrol *kcontrol,

2 1

[alsa-devel] [PATCH] Dreamcast AICA sound - Get rid of annoying compiler warning
by Adrian McMenamin 29 Oct '07

29 Oct '07

This patch supresses an annoying compiler warning that the variable err may be used uninitialised. Signed-off by: Adrian McMenamin <adrian(a)mcmen.demon.co.uk> diff --git a/sound/sh/aica.c b/sound/sh/aica.c index 88dc840..8861d2f 100644 --- a/sound/sh/aica.c +++ b/sound/sh/aica.c @@ -237,6 +237,7 @@ static int aica_dma_transfer(int channels, int buffer_size, struct snd_card_aica *dreamcastcard; struct snd_pcm_runtime *runtime; unsigned long flags; + err = 0; dreamcastcard = substream->pcm->private_data; period_offset = dreamcastcard->clicks; period_offset %= (AICA_PERIOD_NUMBER / channels);

2 1