aboutsummaryrefslogtreecommitdiffstats
path: root/sound
Commit message (Collapse)AuthorAge
* Remove multiple KERN_ prefixes from printk formatsJoe Perches2009-07-08
| | | | | | | | | | | | | | Commit 5fd29d6ccbc98884569d6f3105aeca70858b3e0f ("printk: clean up handling of log-levels and newlines") changed printk semantics. printk lines with multiple KERN_<level> prefixes are no longer emitted as before the patch. <level> is now included in the output on each additional use. Remove all uses of multiple KERN_<level>s in formats. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* Merge branch 'fix/soundcore' into for-linusTakashi Iwai2009-07-03
|\ | | | | | | | | * fix/soundcore: sound: do not set DEVNAME for OSS devices
| * sound: do not set DEVNAME for OSS devicesKay Sievers2009-07-03
| | | | | | | | | | Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | Merge branch 'fix/hda' into for-linusTakashi Iwai2009-07-03
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | * fix/hda: ALSA: hda - Add sanity check in PCM open callback ALSA: hda - Call snd_pcm_lib_hw_rates() again after codec open callback ALSA: hda - Avoid invalid formats and rates with shared SPDIF ALSA: hda - Improve ASUS eeePC 1000 mixer ALSA: hda - Add GPIO1 control at muting with HP laptops
| * | ALSA: hda - Add sanity check in PCM open callbackTakashi Iwai2009-07-03
| | | | | | | | | | | | | | | | | | | | | | | | Add some sanity checks of struct snd_pcm_hardware fields in the PCM open callback of hda driver. This makes a bit easier to debug any PCM setup errors in the codec side. Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | ALSA: hda - Call snd_pcm_lib_hw_rates() again after codec open callbackTakashi Iwai2009-07-03
| | | | | | | | | | | | | | | | | | | | | | | | The PCM rates bit field may have been changed by the codec open callback. In that case, we need to reset rate_min and rate_max. So, simply call snd_pcm_lib_hw_rates() again after the codec open callback. Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | ALSA: hda - Avoid invalid formats and rates with shared SPDIFTakashi Iwai2009-07-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | Check whether formats and rates don't result in zero due to the restriction of SPDIF sharing. If any of them can be zero, disable the SPDIF sharing mode instead. Otherwise it will lead to a PCM configuration error. Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | ALSA: hda - Improve ASUS eeePC 1000 mixerTakashi Iwai2009-07-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The mixer elements created for ASUS eeePC 1000 with ALC269 aren't standard but strange words like "LineOut". Rename the element names to follow the standard one like "Headphone" and "Speaker". Also, split the volumes to each so that the virtual master can control them. The alc269_fujitsu_mixer is removed because it's now identical with the new eeepc mixer. Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | ALSA: hda - Add GPIO1 control at muting with HP laptopsTakashi Iwai2009-07-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HP laptops with AD1984A codecs (at least mobile models) need to set GPIO1 appropriately to indicate the mute state. The BIOS checks this bit to judge whether the mute on or off is sent via F8 key. Without changing this bit, the BIOS can be confused and may toggle the mute wrongly. Reference: Novell bnc#515266 https://bugzilla.novell.com/show_bug.cgi?id=515266 Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | | Merge branch 'fix/oxygen' into for-linusTakashi Iwai2009-07-02
|\ \ \ | | | | | | | | | | | | | | | | * fix/oxygen: sound: virtuoso: fix Xonar D1/DX silence after resume
| * | | sound: virtuoso: fix Xonar D1/DX silence after resumeClemens Ladisch2009-07-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When resuming, we better take the DACs out of the reset state before trying to use them. Reference: kernel bug #13599 http://bugzilla.kernel.org/show_bug.cgi?id=13599 Signed-off-by: Clemens Ladisch <clemens@ladisch.de> Cc: <stable@kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | | | Merge branch 'fix/hda' into for-linusTakashi Iwai2009-07-02
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | * fix/hda: ALSA: hda - Add quirk for HP 6930p ALSA: hda - Add missing static to patch_ca0110()
| * | | ALSA: hda - Add quirk for HP 6930pTakashi Iwai2009-07-01
| | | | | | | | | | | | | | | | | | | | | | | | Added a quirk model=laptop for HP 6930p (103c:30dc) with AD1984A codec. Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | | ALSA: hda - Add missing static to patch_ca0110()Takashi Iwai2009-07-01
| | | | | | | | | | | | | | | | Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | | | Merge branch 'fix/caiaq' into for-linusTakashi Iwai2009-07-02
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * fix/caiaq: ALSA: usx2y - reparent sound device ALSA: snd_usb_caiaq: reparent sound device
| * | | | ALSA: usx2y - reparent sound deviceTakashi Iwai2009-07-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the parent device to be the USB interface, not the USB device. A similiar commit like 563c2bf59d392357bcc1d99642933cc88c687964. Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | | | ALSA: snd_usb_caiaq: reparent sound deviceDaniel Mack2009-07-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The sound device instance needs to be a child of the USB interface, not the USB device. Newer udev versions pay attention to that. Signed-off-by: Daniel Mack <daniel@caiaq.de> Reported-by: Lennart Poettering <lennart@poettering.net> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | | | | Merge branch 'fix/asoc' into for-linusTakashi Iwai2009-07-02
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * fix/asoc: ASoC: Only disable pxa2xx-i2s clocks if we enabled them ASoC: OMAP: fix OMAP1510 broken PCM pointer callback ASoC: remove BROKEN from Efika and pcm030 fabric drivers ASoC: Fix typo in MPC5200 PSC AC97 driver Kconfig
| * | | | | ASoC: Only disable pxa2xx-i2s clocks if we enabled themMark Brown2009-07-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The clock API can't cope with unbalanced enables and disables and we only enable in hw_params() but try to disable in shutdown. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * | | | | ASoC: OMAP: fix OMAP1510 broken PCM pointer callbackJanusz Krzysztofik2009-06-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch tries to work around the problem of broken OMAP1510 PCM playback pointer calculation by replacing DMA function call that incorrectly tries to read the value form DMA hardware with a value computed locally from an already maintained variable omap_runtime_data.period_index. Tested on OMAP5910 based Amstrad Delta (E3) using work in progress ASoC driver. Based on linux-2.6-asoc.git v2.6.31-rc1. Signed-off-by: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl> Acked-by: Jarkko Nikula <jhnikula@gmail.com> Acked-by: Peter Ujfalusi <peter.ujfalusi@nokia.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * | | | | ASoC: remove BROKEN from Efika and pcm030 fabric driversGrant Likely2009-06-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The needed spin_event_timeout() macro is now merged in from the powerpc tree, so these drivers are no longer broken. This reverts commit 0c0e09e21a9e7bc6ca54e06ef3d497255ca26383 (ASoC: Mark MPC5200 AC97 as BROKEN until PowerPC merge issues are resolved) Tested against 2.6.31-rc1. Signed-off-by: Grant Likely <grant.likely@secretlab.ca> Acked-by: Jon Smirl <jonsmirl@gmail.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| * | | | | ASoC: Fix typo in MPC5200 PSC AC97 driver KconfigGrant Likely2009-06-30
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ALSA SoC drivers should be specify SND_SOC_AC97_BUS instead, not AC97_BUS. Without SND_SOC_AC97_BUS defined, an AC97 device will not get correctly registered on the AC97 bus, which prevents thinks like the WM9712 touchscreen driver from getting probed. Tested against 2.6.31-rc1. Signed-off-by: Grant Likely <grant.likely@secretlab.ca> Acked-by: Jon Smirl <jonsmirl@gmail.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
* | | | | sound: OSS: mpu401, fix deadlockJiri Slaby2009-06-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mpu401_chk_version is called with a spin lock already held. Don't take it again. Signed-off-by: Jiri Slaby <jirislaby@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | | | | Merge branch 'fix/pci-vdevice' into for-linusTakashi Iwai2009-06-29
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * fix/pci-vdevice: sound: Use PCI_VDEVICE for CREATIVE and ECTIVA sound: Use PCI_VDEVICE
| * | | | | sound: Use PCI_VDEVICE for CREATIVE and ECTIVAJoe Perches2009-06-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Here's a patch on top of the others to use CREATIVE and ECTIVA Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | | | | sound: Use PCI_VDEVICEJoe Perches2009-06-25
| |/ / / / | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | | | | Merge branch 'fix/oxygen' into for-linusTakashi Iwai2009-06-29
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | * fix/oxygen: sound: oxygen: make mic volume control mono
| * | | | sound: oxygen: make mic volume control monoClemens Ladisch2009-06-25
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | The microphone input and its volume register have only one channel, so we have to make the corresponding mixer control a mono control. Signed-off-by: Clemens Ladisch <clemens@ladisch.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | | | Merge branch 'fix/misc' into for-linusTakashi Iwai2009-06-29
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * fix/misc: ALSA: cmi8330: fix MPU-401 PnP init copy&paste bug
| * | | | ALSA: cmi8330: fix MPU-401 PnP init copy&paste bugOndrej Zary2009-06-29
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix copy&paste bug in PnP MPU-401 initialization. Signed-off-by: Ondrej Zary <linux@rainbow-software.org> Cc: <stable@kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | | | Merge branch 'fix/lx6464es' into for-linusTakashi Iwai2009-06-29
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * fix/lx6464es: ALSA: lx6464es - configure ethersound io channels
| * | | | ALSA: lx6464es - configure ethersound io channelsTim Blechmann2009-06-25
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | as long as the io channel number is not set by the driver, the card is not visible from the ethersound network Signed-off-by: Tim Blechmann <tim@klingt.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | | | Merge branch 'fix/hda-samsung-p50' into for-linusTakashi Iwai2009-06-29
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | * fix/hda-samsung-p50: ALSA: hda - Fix support for Samsung P50 with AD1986A codec ALSA: hda - Generalize the pin-detect quirk for Lenovo N100 ALSA: hda - Simplify AD1986A mixer definitions
| * | | ALSA: hda - Fix support for Samsung P50 with AD1986A codecTakashi Iwai2009-06-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Samsung P50 requires the HP auto-muting unlike other Samsung models. Added a new model=samsung-p50 to support this. Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | | ALSA: hda - Generalize the pin-detect quirk for Lenovo N100Takashi Iwai2009-06-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a new flag to ad_spec struct so that the same hack can be used for any other models (if any). This also allows other models to reuse the auto-mute functions. Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | | ALSA: hda - Simplify AD1986A mixer definitionsTakashi Iwai2009-06-24
| |/ / | | | | | | | | | | | | | | | | | | | | | Split mixer element arrays of AD1986A models to several pieces so that each model can share the same mixer arrays. This removes lots of duplicated data. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | | ALSA: hda - Add missing initializations for ALC268 and ALC269Takashi Iwai2009-06-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During the changes to clean up / fix the realtek codec initialization routines in commit 4a79ba34cada6a5a4ee86ed53aa8a73ba1e6fc51, I forgot to add the check for ALC268 and ALC269. This resulted in the missing EAPD and COEF setup for these codecs. This patch adds the missing checks for these codecs. Reference: bko#13633 http://bugzilla.kernel.org/show_bug.cgi?id=13633 Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | | ALSA: hda - Line In for Acer Inspire 6530G modelTony Vroon2009-06-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Line In connector is set up as PIN_IN by default, using VREF_HIZ. It is connected to both ADCs, so add it to both input selectors. Also add the ability to use the input mix (on a SoundBlaster one would call this "What You Hear"). Signed-off-by: Tony Vroon <tony@linx.net> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | | ALSA: hda - Use model=acer-aspire-6530g for Acer Aspire 6930GTakashi Iwai2009-06-25
| | | | | | | | | | | | | | | | | | | | | For Acer Aspire 6930G (1025:015e), acre-aspire-6530g model matches obviously better. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | | ALSA: hda - Fix acer-aspire-6530g model quirkEmilio López2009-06-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the following bugs of acer-aspire-6530g model with ALC888: - HP jack to mute all speaker outputs including LFE - Make digital built-in mic working Signed-off-by: Emilio López <buhitoescolar@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | | ALSA: hda - Add pin-sense trigger when needed for Realtek codecsTakashi Iwai2009-06-25
|/ / | | | | | | | | | | | | | | | | | | | | Realtek codecs require the pin-sense trigger call before actually reading the pin-sense. Without this, the pin-detection might not be done accurately. This patch adds the pin-capability check and issues the trigger call if required. Signed-off-by: Takashi Iwai <tiwai@suse.de>
* | Merge branch 'for-linus' of ↵Linus Torvalds2009-06-23
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 - Make jack-plug notification selectable ALSA: ctxfi - Add PM support sound: seq_midi_event: fix decoding of (N)RPN events ALSA: hda - Add digital-mic support to ALC262 auto model ALSA: hda - Fix check of input source type for realtek codecs ALSA: hda - Add quirk for Sony VAIO Z21MN ALSA: hda - Get back Input Source for ALC262 toshiba-s06 model ALSA: hda - Fix unsigned comparison in patch_sigmatel.c ALSA: via82xx: add option to disable 500ms delay in snd_via82xx_codec_wait sound: fix check for return value in snd_pcm_hw_refine ALSA: ctxfi - Allow unknown PCI SSIDs ASoC: Blackfin: update the bf5xx_i2s_resume parameters ASoC: Blackfin: keep better track of SPORT configuration state
| * \ Merge branch 'topic/seq-midi-fix' into for-linusTakashi Iwai2009-06-22
| |\ \ | | | | | | | | | | | | | | | | * topic/seq-midi-fix: sound: seq_midi_event: fix decoding of (N)RPN events
| | * | sound: seq_midi_event: fix decoding of (N)RPN eventsClemens Ladisch2009-06-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When decoding (N)RPN sequencer events into raw MIDI commands, the extra_decode_xrpn() function had accidentally swapped the MSB and LSB controller values of both the parameter number and the data value. Signed-off-by: Clemens Ladisch <clemens@ladisch.de> Cc: <stable@kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | | Merge branch 'topic/pcm-jiffies-check' into for-linusTakashi Iwai2009-06-22
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * topic/pcm-jiffies-check: sound: fix check for return value in snd_pcm_hw_refine
| | * | | sound: fix check for return value in snd_pcm_hw_refineMariusz Kozlowski2009-06-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'params' is a pointer and looking at the code this probably should be a check for ioctl return value. Signed-off-by: Mariusz Kozlowski <m.kozlowski@tuxland.pl> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | | | Merge branch 'topic/misc' into for-linusTakashi Iwai2009-06-22
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * topic/misc: ALSA: via82xx: add option to disable 500ms delay in snd_via82xx_codec_wait
| | * | | | ALSA: via82xx: add option to disable 500ms delay in snd_via82xx_codec_waitSimon Arlott2009-06-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's a large 500ms delay in snd_via82xx_codec_wait() that, at least on my hardware, appears to be unnecessary. The rest of the init of the card works without logging any warnings or errors and both audio and mixer settings work. This adds an "nodelay" parameter to disable this (undocumented in the code) large delay improving bootup time by 489-500ms. [ 1.034217] initcall alsa_card_via82xx_init+0x0/0x16 returned 0 after 505757 usecs vs. [ 0.533136] initcall alsa_card_via82xx_init+0x0/0x16 returned 0 after 15915 usecs Signed-off-by: Simon Arlott <simon@fire.lp0.eu> Signed-off-by: Takashi Iwai <tiwai@suse.de>
| * | | | | Merge branch 'topic/hda' into for-linusTakashi Iwai2009-06-22
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * topic/hda: ALSA: hda - Make jack-plug notification selectable ALSA: hda - Add digital-mic support to ALC262 auto model ALSA: hda - Fix check of input source type for realtek codecs ALSA: hda - Add quirk for Sony VAIO Z21MN ALSA: hda - Get back Input Source for ALC262 toshiba-s06 model ALSA: hda - Fix unsigned comparison in patch_sigmatel.c
| | * | | | | ALSA: hda - Make jack-plug notification selectableTakashi Iwai2009-06-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the jack-plug notification via input layer selectable via Kconfig. This is often unnecessary, and the similr function will be provided using the ALSA control API in near future anyway. Signed-off-by: Takashi Iwai <tiwai@suse.de>
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-29 13:07:02 -0500