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

[alsa-devel] Backported sbxfi driver (UNTESTED!)
by Bjoern Olausson 16 Oct '08

16 Oct '08

>Hi, > >$SUBJECT is now on my sound-unstable git tree: > git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound->unstable-2.6.git >together with other experimental patches. > Just wanted to help out with testing stuff. I compiled your snapshot on my gentoo Linux x86_64 Compilation, installation and loading the drivers went smooth. And, yes, there is sound... Here some infos: blub@freax $ aplay -l **** List of PLAYBACK Hardware Devices **** card 0: ORIG [SB XFi (ORIG)], device 0: SB-XFi [SB-XFi] Subdevices: 1/1 Subdevice #0: subdevice #0 blub@freax $ lspci -v 01:00.0 Multimedia audio controller: Creative Labs SB X-Fi Subsystem: Creative Labs X-Fi Platinum Flags: bus master, medium devsel, latency 64, IRQ 21 I/O ports at 8c00 [size=32] Memory at eb800000 (64-bit, non-prefetchable) [size=2M] Memory at e4000000 (64-bit, non-prefetchable) [size=64M] Capabilities: [40] Power Management version 2 Capabilities: [50] Message Signalled Interrupts: Mask- 64bit+ Queue=0/0 Enable- Kernel driver in use: SB-XFi root@freax $ lsmod | grep snd snd_pcm_oss 40640 0 snd_mixer_oss 17224 1 snd_pcm_oss snd_seq_oss 33168 0 snd_seq_midi_event 9864 1 snd_seq_oss snd_seq 54056 4 snd_seq_oss,snd_seq_midi_event snd_seq_device 10076 2 snd_seq_oss,snd_seq snd_hda_intel 505276 0 snd_hwdep 10320 1 snd_hda_intel snd_sbxfi 23132 1 snd_pcm 81328 3 snd_pcm_oss,snd_hda_intel,snd_sbxfi snd_timer 24160 2 snd_seq,snd_pcm snd 65128 12 snd_pcm_oss,snd_mixer_oss,snd_seq_oss,snd_seq,snd_seq_device,snd_hda_intel,snd_hwdep,snd_sbxfi,snd_pcm,snd_timer soundcore 10208 1 snd snd_page_alloc 11664 3 snd_hda_intel,snd_sbxfi,snd_pcm root@freax $ emerge --info Portage 2.1.4.5 (default-linux/amd64/2007.0/desktop, gcc-4.1.2, glibc-2.6.1-r0, 2.6.27-unpatched x86_64) So now the funny part: I was testing a few samplerates: Used a 1 kHz sine, 0 dBFS, 16 bit mono wave file, 96 kHz sample rate and rsampled it with sox: for i in 88200 50400 50000 48000 47250 44100 44056 32000 22050 11025 8000 ; do sox 0_16_96000.wav -r ${i} 0_16_${i}.wav ; done and played them with aplay: for i in 96000 88200 50400 50000 48000 47250 44100 44056 32000 22050 11025 8000 ; do echo "Now playing 0_16_${i}.wav" ; aplay 0_16_${i}.wav ; echo "DONE" ; done 96000 --> O.K. 88200 --> No Sound 50400 --> No Sound 50000 --> No Sound 48000 --> O.K. 47250 --> No Sound 44100 --> No Sound 44056 --> No Sound 32000 --> No Sound 22050 --> SYSTEM FREEZ Playing WAVE '0_16_22050.wav' : Signed 16 bit Little Endian, Rate 22050 Hz, Mono 11025 --> SYSTEM FREEZ Playing WAVE '0_16_11025.wav' : Signed 16 bit Little Endian, Rate 11025 Hz, Mono 8000 --> No Sound Let me know if I can help out testing some more stuff kind regards Bjoern

2 1

[alsa-devel] [PATCH] kernel docs: fix sound/core/ kernel-doc
by Randy Dunlap 16 Oct '08

16 Oct '08

From: Randy Dunlap <randy.dunlap(a)oracle.com> Add kernel-doc function short descriptions to sound/core functions that are missing this short description. Mostly this involves moving some of the function description onto the @funcname line. Also correct a few variable names and fix other kernel-doc notation. Signed-off-by: Randy Dunlap <randy.dunlap(a)oracle.com> cc: Jaroslav Kysela <perex(a)perex.cz> cc: Takashi Iwai <tiwai(a)suse.de> --- sound/core/pcm_lib.c | 48 ++++++++++++++++++++++++------------------------ sound/core/pcm_native.c | 24 ++++++++---------------- 2 files changed, 32 insertions(+), 40 deletions(-) --- lin2627-g5-kdoc.orig/sound/core/pcm_lib.c +++ lin2627-g5-kdoc/sound/core/pcm_lib.c @@ -908,12 +908,12 @@ int snd_pcm_hw_rule_add(struct snd_pcm_r EXPORT_SYMBOL(snd_pcm_hw_rule_add); /** - * snd_pcm_hw_constraint_mask + * snd_pcm_hw_constraint_mask - apply the given bitmap mask constraint * @runtime: PCM runtime instance * @var: hw_params variable to apply the mask * @mask: the bitmap mask * - * Apply the constraint of the given bitmap mask to a mask parameter. + * Apply the constraint of the given bitmap mask to a 32-bit mask parameter. */ int snd_pcm_hw_constraint_mask(struct snd_pcm_runtime *runtime, snd_pcm_hw_param_t var, u_int32_t mask) @@ -928,12 +928,12 @@ int snd_pcm_hw_constraint_mask(struct sn } /** - * snd_pcm_hw_constraint_mask64 + * snd_pcm_hw_constraint_mask64 - apply the given bitmap mask constraint * @runtime: PCM runtime instance * @var: hw_params variable to apply the mask * @mask: the 64bit bitmap mask * - * Apply the constraint of the given bitmap mask to a mask parameter. + * Apply the constraint of the given bitmap mask to a 64-bit mask parameter. */ int snd_pcm_hw_constraint_mask64(struct snd_pcm_runtime *runtime, snd_pcm_hw_param_t var, u_int64_t mask) @@ -949,7 +949,7 @@ int snd_pcm_hw_constraint_mask64(struct } /** - * snd_pcm_hw_constraint_integer + * snd_pcm_hw_constraint_integer - apply an integer constraint to an interval * @runtime: PCM runtime instance * @var: hw_params variable to apply the integer constraint * @@ -964,7 +964,7 @@ int snd_pcm_hw_constraint_integer(struct EXPORT_SYMBOL(snd_pcm_hw_constraint_integer); /** - * snd_pcm_hw_constraint_minmax + * snd_pcm_hw_constraint_minmax - apply a min/max range constraint to an interval * @runtime: PCM runtime instance * @var: hw_params variable to apply the range * @min: the minimal value @@ -995,7 +995,7 @@ static int snd_pcm_hw_rule_list(struct s /** - * snd_pcm_hw_constraint_list + * snd_pcm_hw_constraint_list - apply a list of constraints to a parameter * @runtime: PCM runtime instance * @cond: condition bits * @var: hw_params variable to apply the list constraint @@ -1031,7 +1031,7 @@ static int snd_pcm_hw_rule_ratnums(struc } /** - * snd_pcm_hw_constraint_ratnums + * snd_pcm_hw_constraint_ratnums - apply ratnums constraint to a parameter * @runtime: PCM runtime instance * @cond: condition bits * @var: hw_params variable to apply the ratnums constraint @@ -1064,7 +1064,7 @@ static int snd_pcm_hw_rule_ratdens(struc } /** - * snd_pcm_hw_constraint_ratdens + * snd_pcm_hw_constraint_ratdens - apply ratdens constraint to a parameter * @runtime: PCM runtime instance * @cond: condition bits * @var: hw_params variable to apply the ratdens constraint @@ -1095,7 +1095,7 @@ static int snd_pcm_hw_rule_msbits(struct } /** - * snd_pcm_hw_constraint_msbits + * snd_pcm_hw_constraint_msbits - add a hw constraint msbits rule * @runtime: PCM runtime instance * @cond: condition bits * @width: sample bits width @@ -1123,7 +1123,7 @@ static int snd_pcm_hw_rule_step(struct s } /** - * snd_pcm_hw_constraint_step + * snd_pcm_hw_constraint_step - add a hw constraint step rule * @runtime: PCM runtime instance * @cond: condition bits * @var: hw_params variable to apply the step constraint @@ -1154,7 +1154,7 @@ static int snd_pcm_hw_rule_pow2(struct s } /** - * snd_pcm_hw_constraint_pow2 + * snd_pcm_hw_constraint_pow2 - add a hw constraint power-of-2 rule * @runtime: PCM runtime instance * @cond: condition bits * @var: hw_params variable to apply the power-of-2 constraint @@ -1202,13 +1202,13 @@ void _snd_pcm_hw_params_any(struct snd_p EXPORT_SYMBOL(_snd_pcm_hw_params_any); /** - * snd_pcm_hw_param_value + * snd_pcm_hw_param_value - return @params field @var value * @params: the hw_params instance * @var: parameter to retrieve - * @dir: pointer to the direction (-1,0,1) or NULL + * @dir: pointer to the direction (-1,0,1) or %NULL * - * Return the value for field PAR if it's fixed in configuration space - * defined by PARAMS. Return -EINVAL otherwise + * Return the value for field @var if it's fixed in configuration space + * defined by @params. Return -%EINVAL otherwise. */ int snd_pcm_hw_param_value(const struct snd_pcm_hw_params *params, snd_pcm_hw_param_t var, int *dir) @@ -1271,13 +1271,13 @@ static int _snd_pcm_hw_param_first(struc /** - * snd_pcm_hw_param_first + * snd_pcm_hw_param_first - refine config space and return minimum value * @pcm: PCM instance * @params: the hw_params instance * @var: parameter to retrieve - * @dir: pointer to the direction (-1,0,1) or NULL + * @dir: pointer to the direction (-1,0,1) or %NULL * - * Inside configuration space defined by PARAMS remove from PAR all + * Inside configuration space defined by @params remove from @var all * values > minimum. Reduce configuration space accordingly. * Return the minimum. */ @@ -1317,13 +1317,13 @@ static int _snd_pcm_hw_param_last(struct /** - * snd_pcm_hw_param_last + * snd_pcm_hw_param_last - refine config space and return maximum value * @pcm: PCM instance * @params: the hw_params instance * @var: parameter to retrieve - * @dir: pointer to the direction (-1,0,1) or NULL + * @dir: pointer to the direction (-1,0,1) or %NULL * - * Inside configuration space defined by PARAMS remove from PAR all + * Inside configuration space defined by @params remove from @var all * values < maximum. Reduce configuration space accordingly. * Return the maximum. */ @@ -1345,11 +1345,11 @@ int snd_pcm_hw_param_last(struct snd_pcm EXPORT_SYMBOL(snd_pcm_hw_param_last); /** - * snd_pcm_hw_param_choose + * snd_pcm_hw_param_choose - choose a configuration defined by @params * @pcm: PCM instance * @params: the hw_params instance * - * Choose one configuration from configuration space defined by PARAMS + * Choose one configuration from configuration space defined by @params. * The configuration chosen is that obtained fixing in this order: * first access, first format, first subformat, min channels, * min rate, min period time, max buffer size, min tick time --- lin2627-g5-kdoc.orig/sound/core/pcm_native.c +++ lin2627-g5-kdoc/sound/core/pcm_native.c @@ -875,10 +875,8 @@ static struct action_ops snd_pcm_action_ }; /** - * snd_pcm_start + * snd_pcm_start - start all linked streams * @substream: the PCM substream instance - * - * Start all linked streams. */ int snd_pcm_start(struct snd_pcm_substream *substream) { @@ -926,12 +924,11 @@ static struct action_ops snd_pcm_action_ }; /** - * snd_pcm_stop + * snd_pcm_stop - try to stop all running streams in the substream group * @substream: the PCM substream instance * @state: PCM state after stopping the stream * - * Try to stop all running streams in the substream group. - * The state of each stream is changed to the given value after that unconditionally. + * The state of each stream is then changed to the given state unconditionally. */ int snd_pcm_stop(struct snd_pcm_substream *substream, int state) { @@ -941,11 +938,10 @@ int snd_pcm_stop(struct snd_pcm_substrea EXPORT_SYMBOL(snd_pcm_stop); /** - * snd_pcm_drain_done + * snd_pcm_drain_done - stop the DMA only when the given stream is playback * @substream: the PCM substream * - * Stop the DMA only when the given stream is playback. - * The state is changed to SETUP. + * After stopping, the state is changed to SETUP. * Unlike snd_pcm_stop(), this affects only the given stream. */ int snd_pcm_drain_done(struct snd_pcm_substream *substream) @@ -1065,10 +1061,9 @@ static struct action_ops snd_pcm_action_ }; /** - * snd_pcm_suspend + * snd_pcm_suspend - trigger SUSPEND to all linked streams * @substream: the PCM substream * - * Trigger SUSPEND to all linked streams. * After this call, all streams are changed to SUSPENDED state. */ int snd_pcm_suspend(struct snd_pcm_substream *substream) @@ -1088,10 +1083,9 @@ int snd_pcm_suspend(struct snd_pcm_subst EXPORT_SYMBOL(snd_pcm_suspend); /** - * snd_pcm_suspend_all + * snd_pcm_suspend_all - trigger SUSPEND to all substreams in the given pcm * @pcm: the PCM instance * - * Trigger SUSPEND to all substreams in the given pcm. * After this call, all streams are changed to SUSPENDED state. */ int snd_pcm_suspend_all(struct snd_pcm *pcm) @@ -1313,11 +1307,9 @@ static struct action_ops snd_pcm_action_ }; /** - * snd_pcm_prepare + * snd_pcm_prepare - prepare the PCM substream to be triggerable * @substream: the PCM substream instance * @file: file to refer f_flags - * - * Prepare the PCM substream to be triggerable. */ static int snd_pcm_prepare(struct snd_pcm_substream *substream, struct file *file)

2 1

[alsa-devel] [PATCH] hda: add support for jack detection on IDT/Sigmatel
by Matthew Ranostay 16 Oct '08

16 Oct '08

Added support for jack detection reporting to userspace for IDT/Sigmatel codecs. Signed-off-by: Matthew Ranostay <mranostay(a)embeddedalley.com> --- diff --git a/pci/Kconfig b/pci/Kconfig index 7003711..7e40890 100644 --- a/pci/Kconfig +++ b/pci/Kconfig @@ -501,6 +501,7 @@ config SND_HDA_INTEL tristate "Intel HD Audio" select SND_PCM select SND_VMASTER + select SND_JACK if INPUT=y || INPUT=SND help Say Y here to include support for Intel "High Definition Audio" (Azalia) motherboard devices. diff --git a/pci/hda/patch_sigmatel.c b/pci/hda/patch_sigmatel.c index a2ac720..f6c0b1d 100644 --- a/pci/hda/patch_sigmatel.c +++ b/pci/hda/patch_sigmatel.c @@ -30,6 +30,7 @@ #include <linux/pci.h> #include <sound/core.h> #include <sound/asoundef.h> +#include <sound/jack.h> #include "hda_codec.h" #include "hda_local.h" #include "hda_patch.h" @@ -216,6 +217,9 @@ struct sigmatel_spec { struct hda_pcm pcm_rec[2]; /* PCM information */ + /* jack detection */ + struct snd_jack *jack; + /* dynamic controls and input_mux */ struct auto_pin_cfg autocfg; unsigned int num_kctl_alloc, num_kctl_used; @@ -3617,7 +3621,7 @@ static int stac92xx_init(struct hda_codec *codec) { struct sigmatel_spec *spec = codec->spec; struct auto_pin_cfg *cfg = &spec->autocfg; - int i; + int i, err; snd_hda_sequence_write(codec, spec->init); @@ -3639,6 +3643,12 @@ static int stac92xx_init(struct hda_codec *codec) stac92xx_auto_set_pinctl(codec, spec->autocfg.line_out_pins[0], AC_PINCTL_OUT_EN); stac92xx_auto_init_hp_out(codec); + /* jack detection */ + err = snd_jack_new(codec->bus->card, + "Headphone Jack", + SND_JACK_HEADPHONE, &spec->jack); + if (err < 0) + return err; /* fake event to set up pins */ codec->patch_ops.unsol_event(codec, STAC_HP_EVENT << 26); } else { @@ -3796,6 +3806,8 @@ static void stac92xx_hp_detect(struct hda_codec *codec, unsigned int res) break; presence = get_hp_pin_presence(codec, cfg->hp_pins[i]); } + snd_jack_report(spec->jack, + presence ? SND_JACK_HEADPHONE : 0); if (presence) { /* disable lineouts, enable hp */

2 1

[alsa-devel] [PATCH] ASoC: Convert wm8580 to a new-style i2c driver
by Jean Delvare 16 Oct '08

16 Oct '08

Convert the wm8580 codec driver to the new (standard) device driver binding model. Signed-off-by: Jean Delvare <khali(a)linux-fr.org> Cc: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- Untested, no hardware. sound/soc/codecs/wm8580.c | 108 ++++++++++++++++++++++----------------------- sound/soc/codecs/wm8580.h | 1 2 files changed, 54 insertions(+), 55 deletions(-) --- linux-2.6.28-rc0.orig/sound/soc/codecs/wm8580.c 2008-10-15 15:14:34.000000000 +0200 +++ linux-2.6.28-rc0/sound/soc/codecs/wm8580.c 2008-10-15 17:26:13.000000000 +0200 @@ -900,85 +900,85 @@ static struct snd_soc_device *wm8580_soc * low = 0x1a * high = 0x1b */ -static unsigned short normal_i2c[] = { 0, I2C_CLIENT_END }; -/* Magic definition of all other variables and things */ -I2C_CLIENT_INSMOD; - -static struct i2c_driver wm8580_i2c_driver; -static struct i2c_client client_template; - -static int wm8580_codec_probe(struct i2c_adapter *adap, int addr, int kind) +static int wm8580_i2c_probe(struct i2c_client *i2c, + const struct i2c_device_id *id) { struct snd_soc_device *socdev = wm8580_socdev; - struct wm8580_setup_data *setup = socdev->codec_data; struct snd_soc_codec *codec = socdev->codec; - struct i2c_client *i2c; int ret; - if (addr != setup->i2c_address) - return -ENODEV; - - client_template.adapter = adap; - client_template.addr = addr; - - i2c = kmemdup(&client_template, sizeof(client_template), GFP_KERNEL); - if (i2c == NULL) { - kfree(codec); - return -ENOMEM; - } i2c_set_clientdata(i2c, codec); codec->control_data = i2c; - ret = i2c_attach_client(i2c); - if (ret < 0) { - dev_err(&i2c->dev, "failed to attach codec at addr %x\n", addr); - goto err; - } - ret = wm8580_init(socdev); - if (ret < 0) { + if (ret < 0) dev_err(&i2c->dev, "failed to initialise WM8580\n"); - goto err; - } - - return ret; - -err: - kfree(codec); - kfree(i2c); return ret; } -static int wm8580_i2c_detach(struct i2c_client *client) +static int wm8580_i2c_remove(struct i2c_client *client) { struct snd_soc_codec *codec = i2c_get_clientdata(client); - i2c_detach_client(client); kfree(codec->reg_cache); - kfree(client); return 0; } -static int wm8580_i2c_attach(struct i2c_adapter *adap) -{ - return i2c_probe(adap, &addr_data, wm8580_codec_probe); -} +static const struct i2c_device_id wm8580_i2c_id[] = { + { "wm8580", 0 }, + { } +}; +MODULE_DEVICE_TABLE(i2c, wm8580_i2c_id); -/* corgi i2c codec control layer */ static struct i2c_driver wm8580_i2c_driver = { .driver = { .name = "WM8580 I2C Codec", .owner = THIS_MODULE, }, - .attach_adapter = wm8580_i2c_attach, - .detach_client = wm8580_i2c_detach, - .command = NULL, + .probe = wm8580_i2c_probe, + .remove = wm8580_i2c_remove, + .id_table = wm8580_i2c_id, }; -static struct i2c_client client_template = { - .name = "WM8580", - .driver = &wm8580_i2c_driver, -}; +static int wm8580_add_i2c_device(struct platform_device *pdev, + const struct wm8580_setup_data *setup) +{ + struct i2c_board_info info; + struct i2c_adapter *adapter; + struct i2c_client *client; + int ret; + + ret = i2c_add_driver(&wm8580_i2c_driver); + if (ret != 0) { + dev_err(&pdev->dev, "can't add i2c driver\n"); + return ret; + } + + memset(&info, 0, sizeof(struct i2c_board_info)); + info.addr = setup->i2c_address; + strlcpy(info.type, "wm8580", I2C_NAME_SIZE); + + adapter = i2c_get_adapter(setup->i2c_bus); + if (!adapter) { + dev_err(&pdev->dev, "can't get i2c adapter %d\n", + setup->i2c_bus); + goto err_driver; + } + + client = i2c_new_device(adapter, &info); + i2c_put_adapter(adapter); + if (!client) { + dev_err(&pdev->dev, "can't add i2c device at 0x%x\n", + (unsigned int)info.addr); + goto err_driver; + } + + return 0; + +err_driver: + i2c_del_driver(&wm8580_i2c_driver); + return -ENODEV; +} #endif static int wm8580_probe(struct platform_device *pdev) @@ -1011,11 +1011,8 @@ static int wm8580_probe(struct platform_ #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) if (setup->i2c_address) { - normal_i2c[0] = setup->i2c_address; codec->hw_write = (hw_write_t)i2c_master_send; - ret = i2c_add_driver(&wm8580_i2c_driver); - if (ret != 0) - printk(KERN_ERR "can't add i2c driver"); + ret = wm8580_add_i2c_device(pdev, setup); } #else /* Add other interfaces here */ @@ -1034,6 +1031,7 @@ static int wm8580_remove(struct platform snd_soc_free_pcms(socdev); snd_soc_dapm_free(socdev); #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) + i2c_unregister_device(codec->control_data); i2c_del_driver(&wm8580_i2c_driver); #endif kfree(codec->private_data); --- linux-2.6.28-rc0.orig/sound/soc/codecs/wm8580.h 2008-10-15 15:14:34.000000000 +0200 +++ linux-2.6.28-rc0/sound/soc/codecs/wm8580.h 2008-10-15 17:51:18.000000000 +0200 @@ -29,6 +29,7 @@ #define WM8580_CLKSRC_NONE 5 struct wm8580_setup_data { + int i2c_bus; unsigned short i2c_address; }; -- Jean Delvare

3 2

[alsa-devel] [PATCH] ALSA: Handle NULL jacks in snd_jack_report()
by Mark Brown 16 Oct '08

16 Oct '08

Facilitate drivers that wish to carry on if they can't create a jack input device by handling attempts to report the state of a NULL jack, removing the need to check for initialisation before use. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/core/jack.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/sound/core/jack.c b/sound/core/jack.c index 8133a2b..bd2d9e6 100644 --- a/sound/core/jack.c +++ b/sound/core/jack.c @@ -147,6 +147,9 @@ EXPORT_SYMBOL(snd_jack_set_parent); */ void snd_jack_report(struct snd_jack *jack, int status) { + if (!jack) + return; + if (jack->type & SND_JACK_HEADPHONE) input_report_switch(jack->input_dev, SW_HEADPHONE_INSERT, status & SND_JACK_HEADPHONE); -- 1.5.6.5

2 1

[alsa-devel] [PATCH] port pcxhr driver do devres
by Rolf Eike Beer 16 Oct '08

16 Oct '08

Signed-off-by: Rolf Eike Beer <eike-kernel(a)sf-tec.de> --- I was a bit bored and ported the pcxhr driver to use devres to manage it's IRQ and PCI resources. This is completely untested as I don't have such a card but you might find it useful nevertheless. commit e7df0303a1517bdd0d2f0af5fbdf91acc0b7f426 tree 45fbf9c75c8ea51ae89f0409ed02138380b71624 parent 9824b8f11373b0df806c135a342da9319ef1d893 author Rolf Eike Beer <eike-kernel(a)sf-tec.de> Sun, 21 Sep 2008 17:26:28 +0200 committer Rolf Eike Beer <eike-kernel(a)sf-tec.de> Sun, 21 Sep 2008 17:26:28 +0200 sound/pci/pcxhr/pcxhr.c | 14 ++------------ 1 files changed, 2 insertions(+), 12 deletions(-) diff --git a/sound/pci/pcxhr/pcxhr.c b/sound/pci/pcxhr/pcxhr.c index 2c7e253..676389e 100644 --- a/sound/pci/pcxhr/pcxhr.c +++ b/sound/pci/pcxhr/pcxhr.c @@ -1171,12 +1171,6 @@ static int pcxhr_free(struct pcxhr_mgr *mgr) snd_printdd("reset pcxhr !\n"); } - /* release irq */ - if (mgr->irq >= 0) - free_irq(mgr->irq, mgr); - - pci_release_regions(mgr->pci); - /* free hostport purgebuffer */ if (mgr->hostport.area) { snd_dma_free_pages(&mgr->hostport); @@ -1185,7 +1179,6 @@ static int pcxhr_free(struct pcxhr_mgr *mgr) kfree(mgr->prmh); - pci_disable_device(mgr->pci); kfree(mgr); return 0; } @@ -1210,21 +1203,19 @@ static int __devinit pcxhr_probe(struct pci_dev *pci, const struct pci_device_id } /* enable PCI device */ - if ((err = pci_enable_device(pci)) < 0) + if ((err = pcim_enable_device(pci)) < 0) return err; pci_set_master(pci); /* check if we can restrict PCI DMA transfers to 32 bits */ if (pci_set_dma_mask(pci, DMA_32BIT_MASK) < 0) { snd_printk(KERN_ERR "architecture does not support 32bit PCI busmaster DMA\n"); - pci_disable_device(pci); return -ENXIO; } /* alloc card manager */ mgr = kzalloc(sizeof(*mgr), GFP_KERNEL); if (! mgr) { - pci_disable_device(pci); return -ENOMEM; } @@ -1238,7 +1229,6 @@ static int __devinit pcxhr_probe(struct pci_dev *pci, const struct pci_device_id /* resource assignment */ if ((err = pci_request_regions(pci, card_name)) < 0) { kfree(mgr); - pci_disable_device(pci); return err; } for (i = 0; i < 3; i++) @@ -1247,7 +1237,7 @@ static int __devinit pcxhr_probe(struct pci_dev *pci, const struct pci_device_id mgr->pci = pci; mgr->irq = -1; - if (request_irq(pci->irq, pcxhr_interrupt, IRQF_SHARED, + if (devm_request_irq(&pci->dev, pci->irq, pcxhr_interrupt, IRQF_SHARED, card_name, mgr)) { snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq); pcxhr_free(mgr);

2 2

[alsa-devel] [PATCH] ASoC: Convert wm8900 to a new-style i2c driver
by Jean Delvare 15 Oct '08

15 Oct '08

Convert the wm8900 codec driver to the new (standard) device driver binding model. Signed-off-by: Jean Delvare <khali(a)linux-fr.org> Cc: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- Untested, no hardware. sound/soc/codecs/wm8900.c | 113 +++++++++++++++++++++------------------------ sound/soc/codecs/wm8900.h | 1 2 files changed, 55 insertions(+), 59 deletions(-) --- linux-2.6.28-rc0.orig/sound/soc/codecs/wm8900.c 2008-10-15 15:14:34.000000000 +0200 +++ linux-2.6.28-rc0/sound/soc/codecs/wm8900.c 2008-10-15 19:03:42.000000000 +0200 @@ -1387,89 +1387,86 @@ static struct snd_soc_device *wm8900_soc #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) -static unsigned short normal_i2c[] = { 0, I2C_CLIENT_END }; - -/* Magic definition of all other variables and things */ -I2C_CLIENT_INSMOD; - -static struct i2c_driver wm8900_i2c_driver; -static struct i2c_client client_template; - /* If the i2c layer weren't so broken, we could pass this kind of data around */ -static int wm8900_codec_probe(struct i2c_adapter *adap, int addr, int kind) +static int wm8900_i2c_probe(struct i2c_client *i2c, + const struct i2c_device_id *id) { struct snd_soc_device *socdev = wm8900_socdev; - struct wm8900_setup_data *setup = socdev->codec_data; struct snd_soc_codec *codec = socdev->codec; - struct i2c_client *i2c; int ret; - if (addr != setup->i2c_address) - return -ENODEV; - - dev_err(&adap->dev, "Probe on %x\n", addr); - - client_template.adapter = adap; - client_template.addr = addr; - - i2c = kmemdup(&client_template, sizeof(client_template), GFP_KERNEL); - if (i2c == NULL) { - kfree(codec); - return -ENOMEM; - } i2c_set_clientdata(i2c, codec); codec->control_data = i2c; - ret = i2c_attach_client(i2c); - if (ret < 0) { - dev_err(&adap->dev, - "failed to attach codec at addr %x\n", addr); - goto err; - } - ret = wm8900_init(socdev); - if (ret < 0) { - dev_err(&adap->dev, "failed to initialise WM8900\n"); - goto err; - } - return ret; - -err: - kfree(codec); - kfree(i2c); + if (ret < 0) + dev_err(&i2c->dev, "failed to initialise WM8900\n"); return ret; } -static int wm8900_i2c_detach(struct i2c_client *client) +static int wm8900_i2c_remove(struct i2c_client *client) { struct snd_soc_codec *codec = i2c_get_clientdata(client); - i2c_detach_client(client); kfree(codec->reg_cache); - kfree(client); return 0; } -static int wm8900_i2c_attach(struct i2c_adapter *adap) -{ - return i2c_probe(adap, &addr_data, wm8900_codec_probe); -} +static const struct i2c_device_id wm8900_i2c_id[] = { + { "wm8900", 0 }, + { } +}; +MODULE_DEVICE_TABLE(i2c, wm8900_i2c_id); -/* corgi i2c codec control layer */ static struct i2c_driver wm8900_i2c_driver = { .driver = { .name = "WM8900 I2C codec", .owner = THIS_MODULE, }, - .attach_adapter = wm8900_i2c_attach, - .detach_client = wm8900_i2c_detach, - .command = NULL, + .probe = wm8900_i2c_probe, + .remove = wm8900_i2c_remove, + .id_table = wm8900_i2c_id, }; -static struct i2c_client client_template = { - .name = "WM8900", - .driver = &wm8900_i2c_driver, -}; +static int wm8900_add_i2c_device(struct platform_device *pdev, + const struct wm8900_setup_data *setup) +{ + struct i2c_board_info info; + struct i2c_adapter *adapter; + struct i2c_client *client; + int ret; + + ret = i2c_add_driver(&wm8900_i2c_driver); + if (ret != 0) { + dev_err(&pdev->dev, "can't add i2c driver\n"); + return ret; + } + + memset(&info, 0, sizeof(struct i2c_board_info)); + info.addr = setup->i2c_address; + strlcpy(info.type, "wm8900", I2C_NAME_SIZE); + + adapter = i2c_get_adapter(setup->i2c_bus); + if (!adapter) { + dev_err(&pdev->dev, "can't get i2c adapter %d\n", + setup->i2c_bus); + goto err_driver; + } + + client = i2c_new_device(adapter, &info); + i2c_put_adapter(adapter); + if (!client) { + dev_err(&pdev->dev, "can't add i2c device at 0x%x\n", + (unsigned int)info.addr); + goto err_driver; + } + + return 0; + +err_driver: + i2c_del_driver(&wm8900_i2c_driver); + return -ENODEV; +} #endif static int wm8900_probe(struct platform_device *pdev) @@ -1497,11 +1494,8 @@ static int wm8900_probe(struct platform_ wm8900_socdev = socdev; #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) if (setup->i2c_address) { - normal_i2c[0] = setup->i2c_address; codec->hw_write = (hw_write_t)i2c_master_send; - ret = i2c_add_driver(&wm8900_i2c_driver); - if (ret != 0) - printk(KERN_ERR "can't add i2c driver"); + ret = wm8900_add_i2c_device(pdev, setup); } #else #error Non-I2C interfaces not yet supported @@ -1521,6 +1515,7 @@ static int wm8900_remove(struct platform snd_soc_free_pcms(socdev); snd_soc_dapm_free(socdev); #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) + i2c_unregister_device(codec->control_data); i2c_del_driver(&wm8900_i2c_driver); #endif kfree(codec); --- linux-2.6.28-rc0.orig/sound/soc/codecs/wm8900.h 2008-10-15 15:14:34.000000000 +0200 +++ linux-2.6.28-rc0/sound/soc/codecs/wm8900.h 2008-10-15 18:33:26.000000000 +0200 @@ -55,6 +55,7 @@ #define WM8900_ struct wm8900_setup_data { + int i2c_bus; unsigned short i2c_address; }; -- Jean Delvare

2 1

[alsa-devel] [PATCH] hda: add support for jack detection on IDT/Sigmatel
by Matthew Ranostay 15 Oct '08

15 Oct '08

Added support for jack detection reporting to userspace for IDT/Sigmatel codecs. Signed-off-by: Matthew Ranostay <mranostay(a)embeddedalley.com> --- diff --git a/core/jack.c b/core/jack.c index 8133a2b..7a5b07b 100644 --- a/core/jack.c +++ b/core/jack.c @@ -95,7 +95,7 @@ int snd_jack_new(struct snd_card *card, const char *id, int type, goto fail_input; } - jack->input_dev->phys = "ALSA"; + jack->input_dev->phys = "ALSA Jack Detection"; jack->type = type; diff --git a/pci/Kconfig b/pci/Kconfig index 7003711..7e40890 100644 --- a/pci/Kconfig +++ b/pci/Kconfig @@ -501,6 +501,7 @@ config SND_HDA_INTEL tristate "Intel HD Audio" select SND_PCM select SND_VMASTER + select SND_JACK if INPUT=y || INPUT=SND help Say Y here to include support for Intel "High Definition Audio" (Azalia) motherboard devices. diff --git a/pci/hda/hda_codec.h b/pci/hda/hda_codec.h index 60468f5..93dc961 100644 --- a/pci/hda/hda_codec.h +++ b/pci/hda/hda_codec.h @@ -729,6 +729,9 @@ struct hda_codec { struct snd_hwdep *hwdep; /* assigned hwdep device */ + /* jack detection */ + struct snd_jack *jack; + /* misc flags */ unsigned int spdif_status_reset :1; /* needs to toggle SPDIF for each * status change diff --git a/pci/hda/hda_proc.c b/pci/hda/hda_proc.c index 743d779..e07652a 100644 --- a/pci/hda/hda_proc.c +++ b/pci/hda/hda_proc.c @@ -425,6 +425,22 @@ static void print_unsol_cap(struct snd_info_buffer *buffer, (unsol & AC_UNSOL_ENABLED) ? 1 : 0); } +static void print_presence_cap(struct snd_info_buffer *buffer, + struct hda_codec *codec, hda_nid_t nid) +{ + int presence = snd_hda_codec_read(codec, nid, 0, + AC_VERB_GET_PIN_SENSE, 0); + int def_conf = snd_hda_codec_read(codec, nid, 0, + AC_VERB_GET_CONFIG_DEFAULT, 0x00); + def_conf = get_defcfg_connect(def_conf); + if (def_conf && def_conf != AC_JACK_PORT_FIXED) + return; + snd_iprintf(buffer, + " Jack Presence: %s\n", + (presence & AC_PINSENSE_PRESENCE) + ? "Plugged in" : "Unplugged"); +} + static void print_proc_caps(struct snd_info_buffer *buffer, struct hda_codec *codec, hda_nid_t nid) { @@ -552,6 +568,9 @@ static void print_codec_info(struct snd_info_entry *entry, AC_PAR_AUDIO_WIDGET_CAP); unsigned int wid_type = (wid_caps & AC_WCAP_TYPE) >> AC_WCAP_TYPE_SHIFT; + unsigned int pincap = snd_hda_param_read(codec, nid, + AC_PAR_PIN_CAP); + hda_nid_t conn[HDA_MAX_CONNECTIONS]; int conn_len = 0; @@ -632,6 +651,9 @@ static void print_codec_info(struct snd_info_entry *entry, if (wid_caps & AC_WCAP_UNSOL_CAP) print_unsol_cap(buffer, codec, nid); + if (pincap & AC_PINCAP_PRES_DETECT) + print_presence_cap(buffer, codec, nid); + if (wid_caps & AC_WCAP_POWER) print_power_state(buffer, codec, nid); diff --git a/pci/hda/patch_sigmatel.c b/pci/hda/patch_sigmatel.c index a2ac720..a406fa7 100644 --- a/pci/hda/patch_sigmatel.c +++ b/pci/hda/patch_sigmatel.c @@ -30,6 +30,7 @@ #include <linux/pci.h> #include <sound/core.h> #include <sound/asoundef.h> +#include <sound/jack.h> #include "hda_codec.h" #include "hda_local.h" #include "hda_patch.h" @@ -3617,7 +3618,7 @@ static int stac92xx_init(struct hda_codec *codec) { struct sigmatel_spec *spec = codec->spec; struct auto_pin_cfg *cfg = &spec->autocfg; - int i; + int i, err; snd_hda_sequence_write(codec, spec->init); @@ -3639,6 +3640,12 @@ static int stac92xx_init(struct hda_codec *codec) stac92xx_auto_set_pinctl(codec, spec->autocfg.line_out_pins[0], AC_PINCTL_OUT_EN); stac92xx_auto_init_hp_out(codec); + /* jack detection */ + err = snd_jack_new(codec->bus->card, + "Headphone Jack Detection", + SND_JACK_HEADPHONE, &codec->jack); + if (err < 0) + return err; /* fake event to set up pins */ codec->patch_ops.unsol_event(codec, STAC_HP_EVENT << 26); } else { @@ -3797,6 +3804,10 @@ static void stac92xx_hp_detect(struct hda_codec *codec, unsigned int res) presence = get_hp_pin_presence(codec, cfg->hp_pins[i]); } + if (codec->jack) + snd_jack_report(codec->jack, + presence ? SND_JACK_HEADPHONE : 0); + if (presence) { /* disable lineouts, enable hp */ if (spec->hp_switch)

3 7

[alsa-devel] Possible regression on Sigmatel 9205
by Manuel Naranjo 15 Oct '08

15 Oct '08

Hello everyone, Sorry to interrupt you all, but I had been trying to get the digital mic of my Dell Inspiron 1521 for the last 5 days without any sucess. I'm running kernel 2.6.27 with included ALSA, I also tried GIT alsa, and the result is the same, the mic works, but the volume is so damn low that there's no way to hear it. I checked dell's windows drivers and my board belongs to the M4_8 line and not to the M4_2 as suggested in alsa source. I also did a diff between M4_2 and M4_8 and there are some differences, specially in GPIO. I don't know what else to do now, I had tried everything. Last working alsa was 1.15 if I'm not wrong, but I'm not able to backport 1.15 to the new kernel, for some reason it fails to compile. Any help would be appreciate. Thanks, Manuel

3 9

Re: [alsa-devel] Backported sbxfi driver (UNTESTED!)
by Takashi Iwai 15 Oct '08

15 Oct '08

At Wed, 15 Oct 2008 11:47:00 +0400, The Source wrote: > > Takashi Iwai пишет: > > At Wed, 15 Oct 2008 11:16:32 +0400, > > The Source wrote: > > > >> Takashi Iwai пишет: > >> > >>> At Tue, 14 Oct 2008 15:24:22 +0400, > >>> The Source wrote: > >>> > >>> > >>>> By the way, note, that not rate may cause oops but number of channles > >>>> for example (wav that causes oops has mono mode and the one that just > >>>> plays silently - stereo. Also the oops sample is 16bit, silent one is > >>>> 24bit). > >>>> > >>>> > >>> This is an important information. The driver basically supports only > >>> 16bit stereo samples natively. The others are covered by alsa-lib, > >>> and this involves with the mmap mode. > >>> > >>> But I still wonder why 16bit mode. > >>> > >>> OK, the below is *THE* test I'd like ask you guys to try first. > >>> > >>> - Build the driver with --with-debug=detect option > >>> - Load the driver with debug=2 module option > >>> - Prepare a WAV file with 96kHz 16bit stereo, e.g. converted via sox > >>> - Raise the Master volume to the max > >>> - Run "aplay this.wav" > >>> > >>> At *each* run, check your kernel message. If you get Oops, copy the > >>> whole log immediately. > >>> > >>> - If you get a DMA error or so in the kernel message, try to define > >>> XXX_SYSTEM_TIMER in sbxfi.c, rebuild and reinstall the driver. > >>> Run the same test. > >>> > >>> - If still any serious problem, load the module with debug=3 option, > >>> and get the whole kernel message with full register accesses. > >>> > >>> > >>> thanks, > >>> > >>> Takashi > >>> > >>> > >>> > >> I've done what you have asked. I've got no oopses or other things like > >> that. But again not sound. I've tried with debug=2 and debug=3. > >> Attaching the whole dmesg output. > >> > > > > Thanks. Judging from your logs, it seems that the timer IRQ isn't > > generated as expected, or the pointer (SRCCA register read) doesn't > > work, or all broken. > > > > Could you try with XXX_SYSTEM_TIMER? This eliminates, at least, the > > timer issue. > > > > > > Takashi > > > > > I can't use system timer. changing #undef XXX_SYSTEM_TIMER to #define > XXX_SYSTEM_TIMER causes this: > In file included from /mnt/e/temp/alsa-driver-unstable/pci/sbxfi/sbxfi.c:2: > /mnt/e/temp/alsa-driver-unstable/include/../alsa-kernel/pci/sbxfi/sbxfi.c: > In function ‘sbxfi_timer_handle’: > /mnt/e/temp/alsa-driver-unstable/include/../alsa-kernel/pci/sbxfi/sbxfi.c:252: > error: ‘status’ undeclared (first use in this function) > /mnt/e/temp/alsa-driver-unstable/include/../alsa-kernel/pci/sbxfi/sbxfi.c:252: > error: (Each undeclared identifier is reported only once > /mnt/e/temp/alsa-driver-unstable/include/../alsa-kernel/pci/sbxfi/sbxfi.c:252: > error: for each function it appears in.) > /mnt/e/temp/alsa-driver-unstable/include/../alsa-kernel/pci/sbxfi/sbxfi.c:252: > warning: too many arguments for format Try the patch below. In case you're using snapshot tarball, apply it with -p2 on alsa-kernel directory. Takashi diff --git a/sound/pci/sbxfi/sbxfi.c b/sound/pci/sbxfi/sbxfi.c index 9ff5fc4..d6b5b34 100644 --- a/sound/pci/sbxfi/sbxfi.c +++ b/sound/pci/sbxfi/sbxfi.c @@ -249,7 +249,7 @@ static void sbxfi_handle_timer_callback(struct sbxfi *chip); static void sbxfi_timer_handle(unsigned long data) { - LOG(2, "TIMER ISR\n", status); + LOG(2, "TIMER ISR\n"); sbxfi_handle_timer_callback((struct sbxfi *)data); }

3 3