aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2013-11-21Merge tag 'asoc-v3.13-5' of ↵Takashi Iwai5-42/+86
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus ASoC: Fixes for v3.13 A bunch of device specific fixes, nothing with a general impact here.
2013-11-21ALSA: hda - Add headset quirk for Dell Inspiron 3135David Henningsson1-0/+1
Cc: [email protected] (3.10+) BugLink: https://bugs.launchpad.net/bugs/1253636 Signed-off-by: David Henningsson <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2013-11-21ALSA: hda - Fix the headphone jack detection on Sony VAIO TXTakashi Iwai1-0/+1
BIOS sets MISC_NO_PRESENCE bit wrongly to the pin config on NID 0x0f. Cc: <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2013-11-21ALSA: hda - Fix missing bass speaker on ASUS N550Takashi Iwai1-0/+16
The laptop has a built-in speaker on NID 0x1a. It's an LFE only on the right channel, so we need to provide an explicit chmap, too. There might be other surround speakers, but they can fixed in addition at later point, so let's fix the easier bass speaker at first. Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=65091 Signed-off-by: Takashi Iwai <[email protected]>
2013-11-20ALSA: hda - Fix unbalanced runtime PM notification at resumeTakashi Iwai1-0/+4
When a codec is resumed, it keeps the power on while the resuming phase via hda_keep_power_on(), then turns down via snd_hda_power_down(). At that point, snd_hda_power_down() notifies the power down to the controller, and this may confuse the refcount if the codec was already powered up before the resume. In the end result, the controller goes to runtime suspend even before the codec is kicked off to the power save, and the communication stalls happens. The fix is to add the power-up notification together with hda_keep_power_on(), and clears the flag appropriately. Cc: <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2013-11-20Merge remote-tracking branch 'asoc/fix/wm8962' into asoc-linusMark Brown1-0/+2
2013-11-20Merge remote-tracking branch 'asoc/fix/rcar' into asoc-linusMark Brown2-9/+6
2013-11-20Merge remote-tracking branch 'asoc/fix/fsl' into asoc-linusMark Brown20-124/+209
2013-11-20Merge remote-tracking branch 'asoc/fix/dma' into asoc-linusMark Brown1-1/+3
2013-11-20Merge remote-tracking branch 'asoc/fix/cs42l52' into asoc-linusMark Brown1-1/+1
2013-11-20Merge remote-tracking branch 'asoc/fix/blackfin' into asoc-linusMark Brown1-0/+1
2013-11-20Merge remote-tracking branch 'asoc/fix/arizona' into asoc-linusMark Brown2-1/+46
2013-11-20Merge remote-tracking branch 'asoc/fix/ab8500' into asoc-linusMark Brown130-2990/+4164
2013-11-20ASoC: arizona: Set FLL to free-run before disablingRichard Fitzgerald1-0/+4
The FLL must be placed into free-run mode before disabling to allow it to entirely shut down. Signed-off-by: Richard Fitzgerald <[email protected]> Signed-off-by: Mark Brown <[email protected]> Cc: [email protected]
2013-11-20ALSA: hda - A casual Dell Headset quirkDavid Henningsson1-0/+1
You're looking at a casual headset patch, for a specific hardware it will match, and suddenly, the headset jack will work, so please apply this simple quirk! BugLink: https://bugs.launchpad.net/bugs/1253038 Signed-off-by: David Henningsson <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2013-11-19ASoC: rcar: fixup dma_async_issue_pending() timingKuninori Morimoto1-2/+1
DMAEngine will stall without this patch Signed-off-by: Kuninori Morimoto <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2013-11-19ASoC: rcar: off by one in rsnd_scu_set_route()Dan Carpenter1-1/+1
If "id == ARRAY_SIZE(routes)" then we read one space beyond the end of the routes[] array. Signed-off-by: Dan Carpenter <[email protected]> Acked-by: Kuninori Morimoto <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2013-11-19ASoC: wm5110: Add post SYSCLK register patch for rev D chipCharles Keepax1-1/+42
Certain registers require patching after the SYSCLK has been brought up add support for this into the CODEC driver. Signed-off-by: Charles Keepax <[email protected]> Signed-off-by: Mark Brown <[email protected]> Cc: [email protected]
2013-11-19ASoC: ab8500: Revert to using custom I/O functionsLee Jones1-32/+34
It's been reported that these break audio on Snowball so revert them until a Snowball user has time to investigate. Signed-off-by: Lee Jones <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2013-11-19ALSA: hda - Also enable mute/micmute LED control for "Lenovo dock" fixupDavid Henningsson1-0/+2
The docking station is a Thinkpad thing, so it makes sense to check for mute/micmute LEDs for that quirk type too. Signed-off-by: David Henningsson <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2013-11-19ALSA: firewire-lib: include sound/asound.h to refer to snd_pcm_format_tTakashi Sakamoto1-0/+1
'snd_pcm_format_t' is used by amdtp_out_stream_set_pcm_format(). Currently, when just including amdtp.h, compiler cannot find this type because this type is defined in uapi/sound/asound.h and this header is not included by amdtp.h. Signed-off-by: Takashi Sakamoto <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2013-11-18ALSA: hda - Select FW_LOADER from CONFIG_SND_HDA_CODEC_CA0132_DSPTakashi Iwai1-1/+2
Use select FW_LOADER instead of depends on. It's more intuitive and more consistent with other entries. Signed-off-by: Takashi Iwai <[email protected]>
2013-11-18ALSA: hda - Enable mute/mic-mute LEDs for more Thinkpads with Realtek codecDavid Henningsson1-3/+26
We're using the ACPI interface to detect whether we're dealing with a Thinkpad or not. This way we're not loading the thinkpad_acpi module when we're not on a Thinkpad, but at the same time, we give the opportunity to check for, and potentially enable, both present and future Thinkpad with mute/micmute LEDs. At least those running the ALC269 family (269 to 299) of Realtek codecs. Cc: Alex Hung <[email protected]> Tested-by: Hui Wang <[email protected]> Signed-off-by: David Henningsson <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2013-11-18ASoC: rcar: fixup mod access before checkingKuninori Morimoto1-6/+4
rsnd_dai_connect() is using mod before NULL checking. This patch fixes it up Reported-by: Dan Carpenter <[email protected]> Signed-off-by: Kuninori Morimoto <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2013-11-16Merge tag 'asoc-v3.13-4' of ↵Takashi Iwai7-26/+34
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus ASoC: Fixes for v3.13 A few fixes in drivers, the i.MX and wm8962 fixes are for a pretty nasty issues for users of those drivers if they run into them.
2013-11-15ALSA: hda - load EQ params into IDT codec on HP bNB13 systemsVitaliy Kulikov1-1/+531
Adds linear EQ filtering for integrated speaker protection Signed-off-by: Vitaliy Kulikov <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2013-11-15Merge remote-tracking branch 'asoc/fix/wm8962' into asoc-linusMark Brown1-0/+2
2013-11-15Merge remote-tracking branch 'asoc/fix/fsl' into asoc-linusMark Brown20-124/+209
2013-11-15Merge remote-tracking branch 'asoc/fix/dma' into asoc-linusMark Brown1-1/+3
2013-11-15Merge remote-tracking branch 'asoc/fix/cs42l52' into asoc-linusMark Brown1-1/+1
2013-11-15Merge remote-tracking branch 'asoc/fix/blackfin' into asoc-linusMark Brown1-0/+1
2013-11-15Merge remote-tracking branch 'asoc/fix/arizona' into asoc-linusMark Brown133-3037/+4209
2013-11-15ASoC: cs42l52: Correct MIC CTL maskBrian Austin1-1/+1
The mask for CS42L52_MIC_CTL_TYPE_MASK was wrong keeping the mic config from being set correctly. Signed-off-by: Brian Austin <[email protected]> Signed-off-by: Mark Brown <[email protected]> Cc: [email protected]
2013-11-14ASoC: wm8962: Turn on regcache_cache_only before disabling regulatorNicolin Chen1-0/+2
It's safer to turn on regcache_cache_only before disabling regulator since the driver will turn off the regcache_cache_only after enabling regulator. If we remain cache_only false, some command like 'amixer cset' would get failure if being run before wm8962_resume(). Signed-off-by: Nicolin Chen <[email protected]> Signed-off-by: Mark Brown <[email protected]> Cc: [email protected]
2013-11-14ALSA: jack: Unregister input device at disconnectionTakashi Iwai1-3/+16
The recent change in sysfs triggered a kernel WARNING at unloading a sound driver like WARNING: CPU: 3 PID: 2247 at fs/sysfs/group.c:214 sysfs_remove_group+0xe8/0xf0() sysfs group ffffffff81ab7b20 not found for kobject 'event14' for each jack instance. It's because the unregistration of jack input device is done in dev_free callback, which is called after snd_card_disconnect(). Since device_unregister(card->card_dev) is called in snd_card_disconnect(), the whole sysfs entries belonging to card->card_dev have been already removed recursively. Thus this results in a warning as input_unregister_device() yet tries to unregister the already removed sysfs entry. For fixing this mess, we need to unregister the jack input device at dev_disconnect callback so that it's called before unregistering the card->card_dev. Reviwed-by: Mark Brown <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2013-11-14ALSA: pcsp: Fix the order of input device unregistrationTakashi Iwai1-1/+1
The current code may access to the already freed object. The input device must be accessed and unregistered before freeing the top level sound object. Cc: <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2013-11-14ASoC: fsl: imx-pcm-fiq: omit fiq counter to avoid harm in unbalanced situationsOskar Schirmer1-12/+17
Unbalanced calls to snd_imx_pcm_trigger() may result in endless FIQ activity and thus provoke eternal sound. While on the first glance, the switch statement looks pretty symmetric, the SUSPEND/RESUME pair is not: the suspend case comes along snd_pcm_suspend_all(), which for fsl/imx-pcm-fiq is called only at snd_soc_suspend(), but the resume case originates straight from the SNDRV_PCM_IOCTL_RESUME. This way userland may provoke an unbalanced resume, which might cause the fiq_enable counter to increase and never return to zero again, so eventually imx_pcm_fiq is never disabled. Simply removing the fiq_enable will solve the problem, as long as one never goes play and capture game simultaneously, but beware trying both at once, the early TRIGGER_STOP will cut off the other activity prematurely. So now playing and capturing is scrutinized separately, instead of by counting. Signed-off-by: Oskar Schirmer <[email protected]> Signed-off-by: Mark Brown <[email protected]> Cc: [email protected]
2013-11-13ASoC: blackfin: Fix missing breakTakashi Iwai1-0/+1
Fixes: 4b2ffc205cb9 ('ASoC: Blackfin I2S: add 8-bit sample support') Reported-by: David Binderman Signed-off-by: Takashi Iwai <[email protected]> Signed-off-by: Mark Brown <[email protected]> Cc: [email protected]
2013-11-13ALSA: usb-audio: add front jack channel selector for EMU0204Vasily Khoruzhick1-0/+90
Add support for front jack channel selector which is present on EMU0204. It allows to get 4 channels out of this soundcard. Tested-by: Yury Bushmelev <[email protected]> Signed-off-by: Vasily Khoruzhick <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2013-11-13ALSA: hda - Don't clear the power state at snd_hda_codec_reset()Takashi Iwai1-3/+0
snd_hda_codec_reset() is called either in resetting the whole setup at error paths or hwdep clear/reconfig sysfs triggers. But all of these don't assume that the power has to be off, rather they want to keep the power state unchanged (e.g. reconfig_codec() calls the power up/down by itself). Thus, unconditionally clearing the power state in snd_hda_codec_reset() leads to the inconsistency, confuses the further operation. This patch gets rid of the lines doing that bad thing. Cc: <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2013-11-13ASoC: arizona: Fix typo in name of EQ coefficient controlsRichard Fitzgerald3-12/+12
Signed-off-by: Richard Fitzgerald <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2013-11-13ALSA: hda - Control EAPD for Master volume on Lenovo N100Takashi Iwai1-13/+14
Similarly as other laptops with AD1981 & co codecs, we can control EAPD on AD1986A more safely depending on the Master switch, in order to save some power. Signed-off-by: Takashi Iwai <[email protected]>
2013-11-13ALSA: hda - Don't turn off EAPD for headphone on Lenovo N100Takashi Iwai1-1/+5
The only EAPD on AD1986A is on NID 0x1b where usually the speaker. But this doesn't control only the speaker amp but may influence on all outputs, e.g. Lenovo N100 laptop seems to have this issue. Cc: <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2013-11-13ALSA: isa: not allocating enough spaceDan Carpenter1-1/+1
We allocate only 4 bytes here "sizeof(int)" instead of WF_MSAMPLE_BYTES (259) which was intended. Signed-off-by: Dan Carpenter <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2013-11-13ALSA: snd-aoa: two copy and paste bugsDan Carpenter1-2/+2
These functions were cut and paste and the tests for NULL weren't updated properly. Signed-off-by: Dan Carpenter <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2013-11-12ASoC: wm8997: Correct typo in ISRC mux routesCharles Keepax1-1/+1
Signed-off-by: Charles Keepax <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2013-11-12ALSA: hda - Check keep_eapd_on before inv_eapdTakashi Iwai1-2/+2
We don't change the EAPD bit in set_pin_eapd() if keep_eapd_on flag is set by the codec driver and enable is false. But, we also apply the flipping of enable value according to inv_eapd flag in the same function, and this confused the former check, handled as if it's turned ON. The inverted EAPD check must be applied after keep_eapd_on check, instead. Cc: <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2013-11-12ALSA: hda - Fix Line Out automute on Realtek multifunction jacksDavid Henningsson1-1/+3
In case there is both a multifunction headset jack and a Line Out jack, automuting was not working properly from the Line Out jack. This patch fixes that issue. Cc: [email protected] (3.10+) BugLink: https://bugs.launchpad.net/bugs/1250377 Tested-by: Cyrus Lien <[email protected]> Signed-off-by: David Henningsson <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2013-11-12ALSA: msnd: Avoid duplicated driver nameTakashi Iwai1-2/+2
msnd_pinnacle.c is used for both snd-msnd-pinnacle and snd-msnd-classic drivers, and both should have different driver names. Using the same driver name results in the sysfs warning for duplicated entries like kobject: 'msnd-pinnacle.7' (cec33408): kobject_release, parent (null) (delayed) kobject: 'msnd-pinnacle' (cecd4980): kobject_release, parent cf3ad9b0 (delayed) ------------[ cut here ]------------ WARNING: CPU: 0 PID: 1 at fs/sysfs/dir.c:486 sysfs_warn_dup+0x7d/0xa0() sysfs: cannot create duplicate filename '/bus/isa/drivers/msnd-pinnacle' ...... Reported-by: Fengguang Wu <[email protected]> Cc: <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2013-11-12ALSA: compress_core: don't return -EBADFD from poll if pausedRichard Fitzgerald1-2/+1
Pausing audio playback is not an illegal state so it doesn't seem sensible for poll() to return -EBADFD on a paused stream. There's also no reason to assume that we can't write more data to the DSP while playback is paused. Remove the -EBADFD so that a stream in paused state will still report the buffer availability from poll(). It is up to the user process to manage its state so that it knows whether it is paused or not. Signed-off-by: Richard Fitzgerald <[email protected]> Acked-by VInod Koul <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>