summaryrefslogtreecommitdiffstats
path: root/sound/pci
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'fix/misc' into for-linusTakashi Iwai2009-05-151-4/+6
|\ | | | | | | | | | | * fix/misc: ALSA: pcsp: fix printk format warning ALSA: riptide: postfix increment and off by one
| * ALSA: riptide: postfix increment and off by oneRoel Kluin2009-05-141-4/+6
| | | | | | | | | | | | | | | | | | With a postfix increment these variables are incremented beyond CMDIF_TIMEOUT / MAX_WRITE_RETRY. Signed-off-by: Roel Kluin <roel.kluin@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | Merge branch 'fix/hda' into for-linusTakashi Iwai2009-05-101-1/+6
|\ \ | | | | | | | | | | | | * fix/hda: ALSA: hda - Fix line-in on Mac Mini Core2 Duo
| * | ALSA: hda - Fix line-in on Mac Mini Core2 DuoTakashi Iwai2009-05-081-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BIOS on Mac Mini Core2 Duo sets both INPUT and OUTPUT pinctl bits to the line-in jack, and it confuses the driver as if it's a valid input. This patch adds the check of OUTPUT bit so that the driver fixes the invalid pin setup. Tested-by: Tino Keitel <tino.keitel@gmx.de> Cc: <stable@kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | | Merge branch 'fix/misc' into for-linusTakashi Iwai2009-05-101-1/+1
|\ \ \ | | |/ | |/| | | | | | | | | | * fix/misc: sound: via82xx: fix DXS volume range sound: serial-u16550: fix buffer overflow
| * | sound: via82xx: fix DXS volume rangeClemens Ladisch2009-05-051-1/+1
| | | | | | | | | | | | | | | | | | | | | With 5 bits and 1.5 dB per step, the DXS volume range is only 48 dB. Signed-off-by: Clemens Ladisch <clemens@ladisch.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | | Merge branch 'fix/misc' into for-linusTakashi Iwai2009-05-042-0/+2
|\ \ \ | |/ / | | | | | | | | | * fix/misc: ALSA: indigo-express: add missing 64KHz flags
| * | ALSA: indigo-express: add missing 64KHz flagsGiuliano Pochini2009-04-282-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Indigo-express cards also support 64KHz sampling rate: this patch adds missing SNDRV_PCM_RATE_64000 flags. Signed-off-by: Giuliano Pochini <pochini@shiny.it> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | | ALSA: Add missing SNDRV_PCM_INFO_BATCH flag to some driversTakashi Iwai2009-04-282-4/+8
| | | | | | | | | | | | | | | | | | | | | Added SNDRV_PCM_INFO_BATCH flag to PCM info field of some drivers that really don't give the precise pointer value. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | | Merge branch 'fix/misc' into for-linusTakashi Iwai2009-04-271-1/+1
|\ \ \ | |/ / | | | | | | | | | * fix/misc: ALSA: Fix Trivial Warnining in sound/pci/cmipci.c
| * | ALSA: Fix Trivial Warnining in sound/pci/cmipci.cSubrata Modak2009-04-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed the compile warning below by initializatin iomidi variable properly. sound/pci/cmipci.c: In function ‘snd_cmipci_probe’: sound/pci/cmipci.c:3017: warning: ‘iomidi’ may be used uninitialized in this function Signed-off-by: Subrata Modak <subrata@linux.vnet.ibm.com> Cc: linux-pci <linux-pci@atrey.karlin.mff.cuni.cz> Cc: Balbir Singh <balbir@linux.vnet.ibm.com> Cc: Sachin P Sant <sachinp@linux.vnet.ibm.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | | Merge branch 'fix/hda' into for-linusTakashi Iwai2009-04-271-1/+44
|\ \ \ | | |/ | |/| | | | | | | * fix/hda: ALSA: hda - Fix init verbs of AD1884A mobile model
| * | ALSA: hda - Fix init verbs of AD1884A mobile modelTakashi Iwai2009-04-231-1/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current ad1884a-mobile model has a problem that the speaker output doesn't work sometimes after boot or power-saving on some HP laptops. It seems that the verbs accessing to the non-functional widgets cause this problem. This patch simplifies the init verbs for mobile model not to touch unnecessary setups so that it avoids the speaker-mute problem. Reference: Novell bnc#495668 https://bugzilla.novell.com/show_bug.cgi?id=495668 Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | | Merge commit 'alsa/master' into for-linusTakashi Iwai2009-04-222-3/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | * commit 'alsa/master': [ALSA] intel8x0: another attempt to fix ac97_clock measure routine [ALSA] ac97_codec: increase timeout for analog subsections
| * | | [ALSA] intel8x0: another attempt to fix ac97_clock measure routineJaroslav Kysela2009-04-211-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Appearently, a big delay ~300ms is required before hw is settled and ready to transfer samples on some hardware variants. Also, return back "clocking to 48000Hz" message when something fails. Signed-off-by: Jaroslav Kysela <perex@perex.cz>
| * | | [ALSA] ac97_codec: increase timeout for analog subsectionsJaroslav Kysela2009-04-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | On some hardware platforms, the AC97 codec requires more time to wake up. Signed-off-by: Jaroslav Kysela <perex@perex.cz>
* | | | Merge branch 'fix/hda' into for-linusTakashi Iwai2009-04-211-0/+1
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * fix/hda: ALSA: hda - Add quirk for Packard Bell RS65
| * | | ALSA: hda - Add quirk for Packard Bell RS65Takashi Iwai2009-04-211-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a quirk (model=m51va) for Packard Bell RS65 with ALC663. Reference: Novell bnc#496787 https://bugzilla.novell.com/show_bug.cgi?id=496787 Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | | | Merge branch 'fix/misc' into for-linusTakashi Iwai2009-04-211-0/+6
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | * fix/misc: ALSA: Atiixp: Add SSID for mute_led quirk (unknown HP model)
| * | | ALSA: Atiixp: Add SSID for mute_led quirk (unknown HP model)Daniel T Chen2009-04-201-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reference: Ubuntu #84973 (https://launchpad.net/bugs/84973) Reference: Linux #8001 (http://bugzilla.kernel.org/show_bug.cgi?id=8001) Make the mute LED function properly on this unknown HP model. Signed-off-by: Daniel T Chen <seven.steps@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | | | Merge branch 'fix/hda' into for-linusTakashi Iwai2009-04-211-7/+98
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | * fix/hda: ALSA: hda - Add quirks for Realtek codecs ALSA: hda - Fix alc662_init_verbs
| * | | ALSA: hda - Add quirks for Realtek codecsKailang Yang2009-04-211-0/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Support ASUS F81Se F5Q P80 U20A U80 U50 UX50 for ALC269 - Support ASUS F70SL UX20 X58LE F50Z N80Vc N81Te N505Tp Vx3V N5051A for ALC663 - Support DELL ZM1 for ALC272 Signed-off-by: Kailang Yang <kailang@realtek.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | | ALSA: hda - Fix alc662_init_verbsKailang Yang2009-04-211-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't unmute unneeded amps for input mixers of ALC662 & co. It caused possible recording noises. Signed-off-by: Kailang Yang <kailang@realtek.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | | | Merge branch 'fix/misc' into for-linusTakashi Iwai2009-04-191-1/+1
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | * fix/misc: ALSA: MAINTAINERS - Update SOUND ALSA: emu10k1 - off by 1 in snd_emu10k1_wait()
| * | | ALSA: emu10k1 - off by 1 in snd_emu10k1_wait()Roel Kluin2009-04-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | With `while (count++ < 16384)' count reaches 16385. Signed-off-by: Roel Kluin <roel.kluin@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | | | Merge branch 'fix/intel8x0' into for-linusTakashi Iwai2009-04-191-6/+6
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | * fix/intel8x0: ALSA: Intel8x0: Add hp_only quirk for SSID 0x1028016a (Dell Inspiron 8600) ALSA: Intel8x0: Remove conflicting quirk for SSID 0x103c0934
| * | | ALSA: Intel8x0: Add hp_only quirk for SSID 0x1028016a (Dell Inspiron 8600)Daniel T Chen2009-04-161-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Subject says it all. Briefly, use hp_only for another Dell Inspiron 8600. Reference: Ubuntu #41015 (https://launchpad.net/bugs/41015) Signed-off-by: Daniel T Chen <seven.steps@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | | ALSA: Intel8x0: Remove conflicting quirk for SSID 0x103c0934Daniel T Chen2009-04-161-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While cleaning up quirks, I noticed that there is a duplicated quirk for the SSID 0x103c0934. Looking back through the bug reports, I've concluded that there is only one necessary quirk (hp_mute_led), so this patch removes the conflicting one. Reference: Ubuntu #44066 (https://launchpad.net/bugs/44066) Signed-off-by: Daniel T Chen <seven.steps@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | | | ALSA: hda - Set function_id only on FG nodesTakashi Iwai2009-04-171-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | (Re)set function_id only from the value on FG nodes. The current code overrides the value with the last widget. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | | | ALSA: hda - Add upper-limit of mixer amp for AD1884A-laptop model, tooTakashi Iwai2009-04-161-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the upper-limit of mixer amp for AD1884A-laptop model just like the mobile model for some HP laptops. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | | | ALSA: hda - Fix headphone-detection on some machines with STAC/IDT codecsTakashi Iwai2009-04-161-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the headphone can have no unique DAC, the current code doesn't check the HP-detection although it should. Put the hp-detection check before the DAC check to fix this bug. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | | | ALSA: hda_intel.c - Consolidate bitfieldsJoe Perches2009-04-161-1/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | Commit fa00e046b41663cbda9b1affc0594669e5f14219 added a new bitfield not adjacent to other bitfields in the same struct. Moved the new one. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | | Merge branch 'topic/hda' into for-linusTakashi Iwai2009-04-151-1/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | * topic/hda: ALSA: hda - Fix the cmd cache keys for amp verbs ALSA: add missing definitions(letters) to HD-Audio.txt
| * | | ALSA: hda - Fix the cmd cache keys for amp verbsTakashi Iwai2009-04-151-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the key value generation for get/set amp verbs. The upper bits of the parameter have to be combined with the verb value to be unique for each direction/index of amp access. This fixes the resume problem on some hardwares like Macbook after the channel mode is changed. Tested-by: Johannes Berg <johannes@sipsolutions.net> Cc: <stable@kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | | | Merge branch 'topic/memdup_user' into for-linusTakashi Iwai2009-04-151-28/+13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * topic/memdup_user: ALSA: sound/pci: use memdup_user() ALSA: sound/usb: use memdup_user() ALSA: sound/isa: use memdup_user() ALSA: sound/core: use memdup_user()
| * | | | ALSA: sound/pci: use memdup_user()Li Zefan2009-04-141-28/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove open-coded memdup_user(). Signed-off-by: Li Zefan <lizf@cn.fujitsu.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | | | | Merge branch 'topic/hda' into for-linusTakashi Iwai2009-04-153-11/+42
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | * topic/hda: ALSA: hda - Add quirk mask for Fujitsu Amilo laptops with ALC883 ALSA: hda - Avoid call of snd_jack_report at release ALSA: add private_data to struct snd_jack
| * | | | Merge branch 'topic/jack-free-fix' into topic/hdaTakashi Iwai2009-04-152-8/+40
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * topic/jack-free-fix: ALSA: hda - Avoid call of snd_jack_report at release ALSA: add private_data to struct snd_jack
| | * | | | ALSA: hda - Avoid call of snd_jack_report at releaseTakashi Iwai2009-04-142-8/+40
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't call snd_jack_report at release of sigmatel and conexnat codecs which results in Oops at unloading the module. The Oops is triggered by the power-up sequence during the free due to the pincfg restoration. Since the power-up sequence is involved with the unsol handling, the jack reporting may be issued during that. The Oops occurs with this jack reporting because the jack instances have been already released but the codec doesn't do the proper book-keeping. This patch adds the book-keeping of jack instances to avoid the access to bogus pointers. Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | | | ALSA: hda - Add quirk mask for Fujitsu Amilo laptops with ALC883Takashi Iwai2009-04-151-3/+2
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added the models for quirk bitmask 1734:110x and 1734:113x of Fujitsu laptops. This will fix the model detection for Amilo Xa3540. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | | | Merge branch 'master' of git://git.alsa-project.org/alsa-kernel into for-linusTakashi Iwai2009-04-152-35/+95
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | | | | | | | | | | | | | | | * 'master' of git://git.alsa-project.org/alsa-kernel: [ALSA] intel8x0: add one retry to the ac97_clock measurement routine [ALSA] intel8x0: fix wrong conditions in ac97_clock measure routine [ALSA] intel8x0: do not use zero value from PICB register [ALSA] intel8x0: an attempt to make ac97_clock measurement more reliable [ALSA] pcm-midlevel: Add more strict buffer position checks based on jiffies [ALSA] hda_intel: fix unexpected ring buffer positions
| * | [ALSA] intel8x0: add one retry to the ac97_clock measurement routineJaroslav Kysela2009-04-151-4/+11
| | | | | | | | | | | | | | | | | | | | | It seems that on some hardware platforms, the first measurement is wrong. This patch adds second measurement to this case. Signed-off-by: Jaroslav Kysela <perex@perex.cz>
| * | [ALSA] intel8x0: fix wrong conditions in ac97_clock measure routineJaroslav Kysela2009-04-141-3/+3
| | | | | | | | | | | | | | | | | | Also add a little code cleanup. Signed-off-by: Jaroslav Kysela <perex@perex.cz>
| * | [ALSA] intel8x0: do not use zero value from PICB registerJaroslav Kysela2009-04-131-10/+33
| | | | | | | | | | | | | | | | | | | | | | | | It seems that the zero value from the PICB (position in current buffer) register is not reliable. Use jiffies to correct returned value from the ring buffer pointer callback. Signed-off-by: Jaroslav Kysela <perex@perex.cz>
| * | [ALSA] intel8x0: an attempt to make ac97_clock measurement more reliableJaroslav Kysela2009-04-131-9/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - use monotonic posix clock to measure time - try to avoid reading zero from PICB (position in current buffer) register - show also measured samples - when clock is near 41000 or 44100, use exactly these values (they appears to be reference clocks for hardware manufacturers) Signed-off-by: Jaroslav Kysela <perex@perex.cz>
| * | [ALSA] hda_intel: fix unexpected ring buffer positionsJaroslav Kysela2009-04-101-14/+25
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | I found two issues with ICH7-M (it should be related to other HDA chipsets as well): - the ring buffer position is not reset when stream restarts (after xrun) - solved by moving azx_stream_reset() call from open() to prepare() callback and reset posbuf to zero (it might be filled with hw later than position() callback is called) - irq_ignore flag should be set also when ring buffer memory area is not changed in prepare() callback - this patch replaces irq_ignore with more universal check based on jiffies clock Signed-off-by: Jaroslav Kysela <perex@perex.cz>
* | Replace all DMA_nBIT_MASK macro with DMA_BIT_MASK(n)Yang Hongyang2009-04-131-4/+4
|/ | | | | | | | | | | | | | | | This is the second go through of the old DMA_nBIT_MASK macro,and there're not so many of them left,so I put them into one patch.I hope this is the last round. After this the definition of the old DMA_nBIT_MASK macro could be removed. Signed-off-by: Yang Hongyang <yanghy@cn.fujitsu.com> Cc: Russell King <rmk@arm.linux.org.uk> Cc: Tony Lindgren <tony@atomide.com> Cc: "David S. Miller" <davem@davemloft.net> Cc: James Bottomley <James.Bottomley@HansenPartnership.com> Cc: Greg KH <greg@kroah.com> Cc: Takashi Iwai <tiwai@suse.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* Merge branch 'for-linus' of ↵Linus Torvalds2009-04-073-1/+26
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (36 commits) ALSA: hda - Add VREF powerdown sequence for another board ALSA: oss - volume control for CSWITCH and CROUTE ALSA: hda - add missing comma in ad1884_slave_vols sound: usb-audio: allow period sizes less than 1 ms sound: usb-audio: save data packet interval in audioformat structure sound: usb-audio: remove check_hw_params_convention() sound: usb-audio: show sample format width in proc file ASoC: fsl_dma: Pass the proper device for dma mapping routines ASoC: Fix null dereference in ak4535_remove() ALSA: hda - enable SPDIF output for Intel DX58SO board ALSA: snd-atmel-abdac: increase periods_min to 6 instead of 4 ALSA: snd-atmel-abdac: replace bus_id with dev_name() ALSA: snd-atmel-ac97c: replace bus_id with dev_name() ALSA: snd-atmel-ac97c: cleanup registers when removing driver ALSA: snd-atmel-ac97c: do a proper reset of the external codec ALSA: snd-atmel-ac97c: enable interrupts to catch events for error reporting ALSA: snd-atmel-ac97c: set correct size for buffer hardware parameter ALSA: snd-atmel-ac97c: do not overwrite OCA and ICA when assigning channels ALSA: snd-atmel-ac97c: remove dead break statements after return in switch case ALSA: snd-atmel-ac97c: cleanup register definitions ...
| * Merge branch 'topic/hda' into for-linusTakashi Iwai2009-04-072-1/+19
| |\
| | * ALSA: hda - Add VREF powerdown sequence for another boardMatthew Ranostay2009-04-071-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | Add powerdown sequence for VREF using a shared jack when the headphone is present and the microphone isn't on. Signed-off-by: Matthew Ranostay <mranostay@embeddedalley.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
OpenPOWER on IntegriCloud