summaryrefslogtreecommitdiffstats
path: root/sound
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'fix/hda' into for-linusTakashi Iwai2009-05-281-0/+1
|\ | | | | | | | | * fix/hda: ALSA: hda - Compaq Presario CQ60 patching for Conexant
| * ALSA: hda - Compaq Presario CQ60 patching for ConexantTony Vroon2009-05-281-0/+1
| | | | | | | | | | | | | | | | | | | | A docking mic control is shown by default. The Compaq Presario CQ60 laptop has no docking connector, so designate it as a CXT5051_HP model. This makes the phantom mixer slider disappear. Signed-off-by: Tony Vroon <tony@linx.net> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | Merge branch 'fix/pcm-jiffies-check' into for-linusTakashi Iwai2009-05-272-2/+14
|\ \ | | | | | | | | | | | | | | | * fix/pcm-jiffies-check: ALSA: Enable PCM hw_ptr_jiffies check only in xrun_debug mode ALSA: Fix invalid jiffies check after pause
| * | ALSA: Enable PCM hw_ptr_jiffies check only in xrun_debug modeTakashi Iwai2009-05-271-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The PCM hw_ptr jiffies check results sometimes in problems when a hardware doesn't give smooth hw_ptr updates. So far, au88x0 and some other drivers appear not working due to this strict check. However, this check is a nice debug tool, and the capability should be still kept. Hence, we disable this check now as default unless the user enables it by setting the xrun_debug mode to the specific stream via a proc file. Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | ALSA: Fix invalid jiffies check after pauseTakashi Iwai2009-05-272-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The hw_ptr_jiffies has to be reset properly to avoid the invalid check of jiffies delta in snd_pcm_update_hw_ptr*() functions. Especailly this patch fixes the bogus jiffies check after the puase and resume. This patch is a modified version of the original patch by Jaroslav. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | | Merge branch 'fix/misc' into for-linusTakashi Iwai2009-05-274-4/+14
|\ \ \ | | | | | | | | | | | | | | | | * fix/misc: sound: usb-audio: make the MotU Fastlane work again
| * | | sound: usb-audio: make the MotU Fastlane work againClemens Ladisch2009-05-274-4/+14
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Kernel 2.6.18 broke the MotU Fastlane, which uses duplicate endpoint numbers in a manner that is not only illegal but also confuses the kernel's endpoint descriptor caching mechanism. To work around this, we have to add a separate usb_set_interface() call to guide the USB core to the correct descriptors. Signed-off-by: Clemens Ladisch <clemens@ladisch.de> Reported-and-tested-by: David Fries <david@fries.net> Cc: <stable@kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | | Merge branch 'for-linus' of ↵Linus Torvalds2009-05-263-0/+17
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | 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: ALSA: hda - Add missing check of pin vref 50 and others in Realtek codecs ALSA: hda - Add 5stack-no-fp model for STAC927x ALSA: hda - Add forced codec-slots for ASUS W5Fm
| * ALSA: hda - Add missing check of pin vref 50 and others in Realtek codecsTakashi Iwai2009-05-251-0/+6
| | | | | | | | | | | | | | | | Some Realtek codecs like ALC861 seem to support only VREF50 while the current driver assumes it's only VREF80. Check other VREF bits to set the correct value. Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: hda - Add 5stack-no-fp model for STAC927xTakashi Iwai2009-05-241-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The recent fix for the headphone volume control on IDT/STAC codecs resulted in the removal of invalid "Side" volume eventually. But, if the front panel doesn't exist, this setup could be regarded as a sort of regression, as reported in kernel bug #13250. Now as a workaround, a new model 5stack-no-fp is added so that the user without the front panel can choose this one explicitly. Reference: bko#13250 http://bugzilla.kernel.org/show_bug.cgi?id=13250 Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * ALSA: hda - Add forced codec-slots for ASUS W5FmOzan Çağlayan2009-05-241-0/+1
| | | | | | | | | | | | | | | | | | ASUS W5Fm needs the fixed codec-slots to probe to override the BIOS problem like W5F. Tested-by: Alp Kılıç <kilic.alp@gmail.com> Signed-off-by: Ozan Çağlayan <ozan@pardus.org.tr> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | Merge branch 'fix/misc' into for-linusTakashi Iwai2009-05-223-4/+7
|\ \ | | | | | | | | | | | | | | | * fix/misc: ALSA: Kill truncate warning by shortening Sigmatel-specific AC97 control name ALSA: pcsp - fix printk format warning again
| * | ALSA: Kill truncate warning by shortening Sigmatel-specific AC97 control nameAndreas Mohr2009-05-222-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ALSA sound/core/control.c:232: Control name 'Sigmatel Surround Phase Inversion Playback Switch' truncated to 'Sigmatel Surround Phase Inversion Playback ' bootup message by omitting weird Sigmatel prefix in this case; also fix up the related ca0106 mixer control removal part by using identical naming there. Signed-off-by: Andreas Mohr <andi@lisas.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | ALSA: pcsp - fix printk format warning againTakashi Iwai2009-05-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The commit 5a641bcd6398841cc4606b0a732d41a09256fd94 changed the printk format to '%lu', but the value passed seems to be dependent on the architecture. On x86-64, I got a new warning now because an int value is passed actaully. As a workaround, just cast the value always to unsigned long. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | | Merge branch 'fix/hda' into for-linusTakashi Iwai2009-05-221-0/+1
|\ \ \ | | |/ | |/| | | | | | | * fix/hda: ALSA: hda - fix audio on HP TX25xx series notebooks
| * | ALSA: hda - fix audio on HP TX25xx series notebooksAdam Williamson2009-05-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://bugtrack.alsa-project.org/alsa-bug/view.php?id=4121 Taken from https://bugzilla.redhat.com/show_bug.cgi?id=498060 Signed-off-by: Adam Williamson <awilliam@redhat.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | | [ARM] 5519/1: amba probe: pass "struct amba_id *" instead of void *Alessandro Rubini2009-05-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The second argument of the probe method points to the amba_id structure, so it's better passed with the correct type. None of the current in-tree drivers uses the pointer, so they have only been checked for a clean compile. Change suggested by Russell King. Signed-off-by: Alessandro Rubini <rubini@unipv.it> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | Merge branch 'fix/asoc' into for-linusTakashi Iwai2009-05-156-47/+125
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * fix/asoc: ASoC: DaVinci EVM board support buildfixes ASoC: DaVinci I2S updates ASoC: davinci-pcm buildfixes pxa2xx-ac97: fix reset gpio mode setting ASoC: soc-core: fix crash when removing not instantiated card
| * | | ASoC: DaVinci EVM board support buildfixesDavid Brownell2009-05-152-14/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a build fix, resyncing the DaVinci EVM ASoC board code with the version in the DaVinci tree. That resync includes support for the DM355 EVM, although that board isn't yet in mainline. (NOTE: also includes a bugfix to the platform_add_resources call, recently sent by Chaithrika U S <chaithrika@ti.com> but not yet merged into the DaVinci tree.) Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * | | ASoC: DaVinci I2S updatesDavid Brownell2009-05-151-3/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This resyncs the DaVinci I2S code with the version in the DaVinci tree. The behavioral change uses updated clock interfaces which recently merged to mainline. Two other changes include adding a comment on the ASP/McBSP/McASP confusion, and dropping pdev->id in order to support more boards than just the DM644x EVM. Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * | | ASoC: davinci-pcm buildfixesDavid Brownell2009-05-151-29/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a buildfix for the DaVinci PCM code, resyncing it with the version in the DaVinci tree. The notable change is using current EDMA interfaces, which recently merged to mainline. (The older interfaces never made it into mainline.) NOTE: open issue, the DMA should be to/from SRAM; see chip errata for more info. The artifacts are extremely easy to hear on DM355 hardware (not yet supported in mainline), but don't seem as audible on DM6446 hardwaare (which does have mainline support). Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * | | pxa2xx-ac97: fix reset gpio mode settingMike Rapoport2009-05-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Mike Rapoport <mike@compulab.co.il> Acked-by: Eric Miao <eric.miao@marvell.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * | | ASoC: soc-core: fix crash when removing not instantiated cardMike Rapoport2009-05-111-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the card was not instantiated in snd_soc_instantiate_card, calling soc-remove will crash because some of codec, cpu_dai and card .remove methods are called twice. Fix this by returning from soc_remove immediately. Signed-off-by: Mike Rapoport <mike@compulab.co.il> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
* | | | Merge branch 'fix/misc' into for-linusTakashi Iwai2009-05-152-5/+7
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | * fix/misc: ALSA: pcsp: fix printk format warning ALSA: riptide: postfix increment and off by one
| * | | ALSA: pcsp: fix printk format warningRandy Dunlap2009-05-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix printk format warning: sound/drivers/pcsp/pcsp_mixer.c:54: warning: format '%d' expects type 'int', but argument 3 has type 'long unsigned int' Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | | 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/asoc' into for-linusTakashi Iwai2009-05-101-20/+20
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * fix/asoc: ASoC: Fix errors in WM8990
| * | | ASoC: Fix errors in WM8990Jinyoung Park2009-05-051-20/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The mis-typing exist in dapm controller definitions and dapm route definitions, so happen mis-matched error when snd_soc_dapm_add_routes(). Cc: stable@kernel.org Signed-off-by: Jinyoung Park <parkjy@mtekvision.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com
* | | | 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-102-9/+4
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | * 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>
| * | | sound: serial-u16550: fix buffer overflowClemens Ladisch2009-05-051-8/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove most of the serial port parameters from the card longname string because it was way too long and overflowed into the mixername string. 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>
* | | ASoC: Remove BROKEN from mpc5200 kconfigTakashi Iwai2009-05-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The regression was fixed by commit 3e5b50165fd0be080044586f43fcdd460ed27610, so no need to mark this driver as BROKEN. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | | Merge branch 'fix/pcm-jiffies-check' into fix/asocTakashi Iwai2009-05-04271-8971/+12461
|\ \ \
| * | | ALSA: pcm core - Avoid jiffies check for devices with BATCH flagTakashi Iwai2009-04-281-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The hardware devices with SNDRV_PCM_INFO_BATCH flag can't give the precise current position. And such hardwares have often big FIFO in addition to the ring buffer, and it screws up the jiffies check in pcm_lib.c. This patch adds a simple check of info flag so that the driver skips the jiffies check in snd_pcm_period_elapsed() when BATCH flag is set. Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | | ALSA: Add missing SNDRV_PCM_INFO_BATCH flag to some driversTakashi Iwai2009-04-289-12/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/caiaq' into for-linusTakashi Iwai2009-04-272-6/+8
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * fix/caiaq: ALSA: snd-usb-caiaq: fix reported elapsed periods
| | * | | ALSA: snd-usb-caiaq: fix reported elapsed periodsDaniel Mack2009-04-272-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reset the internal period position counter upon stream startup. This fixes initial aplay underruns and problems related to latency picky applications such as pulseaudio. Bumped the version number to 1.3.14. Signed-off-by: Daniel Mack <daniel@caiaq.de> 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 branch 'fix/asoc' into for-linusTakashi Iwai2009-04-273-8/+12
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * fix/asoc: ASoC: s3c-i2s-v2 needs to declare a license for modular builds ASoC: remove non-existing referece to CONFIG_SND_SOC_CODEC_WM8991 ASoC: Fix WM8580 volume update handling for large register changes ASoC: Fix offset of freqmode in WM8580 PLL configuration
| * \ \ \ \ Merge master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2009-04-242-5/+24
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] 5460/1: Orion: reduce namespace pollution [ARM] 5458/1: pcmcia: pxa2xx-sharpsl: check if we do have Scoop config [ARM] 5457/1: mach-imx gpio buildfix [ARM] 5456/1: add sys_preadv and sys_pwritev [ARM] pxa/pcm990: start external GPIOs immediately after built-in ones [ARM] pxa/palm27x: General fix for Palm27x aSoC driver [ARM] pxa/mioa701: use GPIO95 as AC97 reset line [ARM] pxa: merge AC97 platform data structures [ARM] pxa/magician: remove un-necessary #include of pxa-regs.h and hardware.h
| | * \ \ \ \ Merge branch 'fix' of ↵Russell King2009-04-202-5/+24
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
| | | * | | | | [ARM] pxa/palm27x: General fix for Palm27x aSoC driverMarek Vasut2009-04-191-4/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Firstly, this patch makes the palm27x asoc driver a little more sane. Also, since all affected devices use GPIO95 as AC97_nRESET, this patch sets that properly. Affected are PalmT5, TX and LifeDrive. Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Eric Miao <eric.miao@marvell.com>
| | | * | | | | [ARM] pxa: merge AC97 platform data structuresMark Brown2009-04-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently there are two possible platform datas for the PXA AC97 driver: one supported by the generic AC97 driver only which provides callbacks to allow board-specific configuration at stream startup and teardown, and another for pxa2xx-ac97-lib which allows configuration of the reset GPIO for PXA2xx CPUs. Obviously this won't actually work when using the generic AC97 driver since the drivers will attempt to parse the platform data in both formats. Fix this by merging the two structures. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Robert Jarzmik <robert.jarzmik@free.fr> Cc: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Eric Miao <eric.miao@marvell.com>
OpenPOWER on IntegriCloud