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

Re: [alsa-devel] No headphone with an Intel 82801I sound card
by Aurélien Croc 04 Feb '09

04 Feb '09

Is there no news about that problem? If it is just a mixer problem, it may not be so hard to get the correct mixer channels available no? (in particular when each point of the problem work with a specific code). Thank you in advance, Best regards, Aurélien On Monday 02 February 2009, Takashi Iwai wrote: > At Mon, 2 Feb 2009 16:56:07 +0100, > > Aurélien Croc wrote: > > > Hmm, other people reported basically such Dell laptops do work with > > > the headphone but not with the speaker output... > > > > With google i found a lot of guys who have the same problem...I never > > seen someone who doesn't have its internal speaker working.. > > See the recent post by Laurent Pinchart. Which reminds me that the problem still hasn't been fixed :-) Is there anything else you would like me to try ? > Did you try the latest snapshot? > > ftp://ftp.kernel.org/pub/linux/kernel/people/tiwai/snapshot/alsa-driver-sna >pshot.tar.gz Best regards, Laurent Pinchart _______________________________________________ Alsa-devel mailing list Alsa-devel(a)alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

1 0

[alsa-devel] [PATCH] sscape: drop redundant fields from soundscape struct (3rd rev)
by Krzysztof Helt 04 Feb '09

04 Feb '09

From: Krzysztof Helt <krzysztof.h1(a)wp.pl> The wss_base is disuised parameter for one function. It is converted to function parameter. The code_type is only set but never read. It is removed. The midi_vol is set only to 0 so it does not work as detection of change in midi volume. It is fixed. The xport variable is alias to the port[dev]. Use the port[dev] directly to increase readability. Signed-off-by: Krzysztof Helt <krzysztof.h1(a)wp.pl> --- The sscape_midi_get() now returns the s->midi_vol value. sound/isa/sscape.c | 44 ++++++++++++++++---------------------------- 1 files changed, 16 insertions(+), 28 deletions(-) diff --git a/sound/isa/sscape.c b/sound/isa/sscape.c index 681e223..33c1258 100644 --- a/sound/isa/sscape.c +++ b/sound/isa/sscape.c @@ -135,8 +135,6 @@ enum card_type { struct soundscape { spinlock_t lock; unsigned io_base; - unsigned wss_base; - int codec_type; int ic_type; enum card_type type; struct resource *io_res; @@ -726,13 +724,7 @@ static int sscape_midi_get(struct snd_kcontrol *kctl, unsigned long flags; spin_lock_irqsave(&s->lock, flags); - set_host_mode_unsafe(s->io_base); - - if (host_write_ctrl_unsafe(s->io_base, CMD_GET_MIDI_VOL, 100)) { - uctl->value.integer.value[0] = host_read_ctrl_unsafe(s->io_base, 100); - } - - set_midi_mode_unsafe(s->io_base); + uctl->value.integer.value[0] = s->midi_vol; spin_unlock_irqrestore(&s->lock, flags); return 0; } @@ -767,6 +759,7 @@ static int sscape_midi_put(struct snd_kcontrol *kctl, change = (host_write_ctrl_unsafe(s->io_base, CMD_SET_MIDI_VOL, 100) && host_write_ctrl_unsafe(s->io_base, ((unsigned char) uctl->value.integer. value[0]) & 127, 100) && host_write_ctrl_unsafe(s->io_base, CMD_XXX_MIDI_VOL, 100)); + s->midi_vol = (unsigned char) uctl->value.integer.value[0] & 127; __skip_change: /* @@ -809,12 +802,11 @@ static unsigned __devinit get_irq_config(int irq) * Perform certain arcane port-checks to see whether there * is a SoundScape board lurking behind the given ports. */ -static int __devinit detect_sscape(struct soundscape *s) +static int __devinit detect_sscape(struct soundscape *s, long wss_io) { unsigned long flags; unsigned d; int retval = 0; - int codec = s->wss_base; spin_lock_irqsave(&s->lock, flags); @@ -830,13 +822,11 @@ static int __devinit detect_sscape(struct soundscape *s) if ((d & 0x80) != 0) goto _done; - if (d == 0) { - s->codec_type = 1; + if (d == 0) s->ic_type = IC_ODIE; - } else if ((d & 0x60) != 0) { - s->codec_type = 2; + else if ((d & 0x60) != 0) s->ic_type = IC_OPUS; - } else + else goto _done; outb(0xfa, ODIE_ADDR_IO(s->io_base)); @@ -856,10 +846,10 @@ static int __devinit detect_sscape(struct soundscape *s) sscape_write_unsafe(s->io_base, GA_HMCTL_REG, d | 0xc0); if (s->type == SSCAPE_VIVO) - codec += 4; + wss_io += 4; /* wait for WSS codec */ for (d = 0; d < 500; d++) { - if ((inb(codec) & 0x80) == 0) + if ((inb(wss_io) & 0x80) == 0) break; spin_unlock_irqrestore(&s->lock, flags); msleep(1); @@ -1057,7 +1047,6 @@ static int __devinit create_sscape(int dev, struct snd_card *card) unsigned dma_cfg; unsigned irq_cfg; unsigned mpu_irq_cfg; - unsigned xport; struct resource *io_res; struct resource *wss_res; unsigned long flags; @@ -1077,15 +1066,15 @@ static int __devinit create_sscape(int dev, struct snd_card *card) printk(KERN_ERR "sscape: Invalid IRQ %d\n", mpu_irq[dev]); return -ENXIO; } - xport = port[dev]; /* * Grab IO ports that we will need to probe so that we * can detect and control this hardware ... */ - io_res = request_region(xport, 8, "SoundScape"); + io_res = request_region(port[dev], 8, "SoundScape"); if (!io_res) { - snd_printk(KERN_ERR "sscape: can't grab port 0x%x\n", xport); + snd_printk(KERN_ERR + "sscape: can't grab port 0x%lx\n", port[dev]); return -EBUSY; } wss_res = NULL; @@ -1112,10 +1101,9 @@ static int __devinit create_sscape(int dev, struct snd_card *card) spin_lock_init(&sscape->fwlock); sscape->io_res = io_res; sscape->wss_res = wss_res; - sscape->io_base = xport; - sscape->wss_base = wss_port[dev]; + sscape->io_base = port[dev]; - if (!detect_sscape(sscape)) { + if (!detect_sscape(sscape, wss_port[dev])) { printk(KERN_ERR "sscape: hardware not detected at 0x%x\n", sscape->io_base); err = -ENODEV; goto _release_dma; @@ -1188,11 +1176,11 @@ static int __devinit create_sscape(int dev, struct snd_card *card) } #define MIDI_DEVNUM 0 if (sscape->type != SSCAPE_VIVO) { - err = create_mpu401(card, MIDI_DEVNUM, xport, mpu_irq[dev]); + err = create_mpu401(card, MIDI_DEVNUM, port[dev], mpu_irq[dev]); if (err < 0) { printk(KERN_ERR "sscape: Failed to create " - "MPU-401 device at 0x%x\n", - xport); + "MPU-401 device at 0x%lx\n", + port[dev]); goto _release_dma; } -- 1.5.2.2 ---------------------------------------------------------------------- Obdaruj swoja Walentynke ... lub siebie! Wygraj nagrody! Sprawdz >> http://link.interia.pl/f203a

2 1

[alsa-devel] [PATCH] hda: Add digital beep generator support for Realtek codecs.
by Kusanagi Kouichi 04 Feb '09

04 Feb '09

A digital beep generator can be used via input layer. Signed-off-by: Kusanagi Kouichi <slash(a)ma.neweb.ne.jp> --- sound/pci/hda/hda_beep.h | 2 +- sound/pci/hda/patch_realtek.c | 62 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 1 deletions(-) diff --git a/sound/pci/hda/hda_beep.h b/sound/pci/hda/hda_beep.h index b9679f0..51bf6a5 100644 --- a/sound/pci/hda/hda_beep.h +++ b/sound/pci/hda/hda_beep.h @@ -39,7 +39,7 @@ struct hda_beep { int snd_hda_attach_beep_device(struct hda_codec *codec, int nid); void snd_hda_detach_beep_device(struct hda_codec *codec); #else -#define snd_hda_attach_beep_device(...) +#define snd_hda_attach_beep_device(...) 0 #define snd_hda_detach_beep_device(...) #endif #endif diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 7884a4e..956b327 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -30,6 +30,7 @@ #include <sound/core.h> #include "hda_codec.h" #include "hda_local.h" +#include "hda_beep.h" #define ALC880_FRONT_EVENT 0x01 #define ALC880_DCVOL_EVENT 0x02 @@ -3160,6 +3161,7 @@ static void alc_free(struct hda_codec *codec) alc_free_kctls(codec); kfree(spec); + snd_hda_detach_beep_device(codec); codec->spec = NULL; /* to be sure */ } @@ -4328,6 +4330,12 @@ static int patch_alc880(struct hda_codec *codec) } } + err = snd_hda_attach_beep_device(codec, 0x1); + if (err < 0) { + alc_free(codec); + return err; + } + if (board_config != ALC880_AUTO) setup_preset(spec, &alc880_presets[board_config]); @@ -5855,6 +5863,12 @@ static int patch_alc260(struct hda_codec *codec) } } + err = snd_hda_attach_beep_device(codec, 0x1); + if (err < 0) { + alc_free(codec); + return err; + } + if (board_config != ALC260_AUTO) setup_preset(spec, &alc260_presets[board_config]); @@ -7050,6 +7064,12 @@ static int patch_alc882(struct hda_codec *codec) } } + err = snd_hda_attach_beep_device(codec, 0x1); + if (err < 0) { + alc_free(codec); + return err; + } + if (board_config != ALC882_AUTO) setup_preset(spec, &alc882_presets[board_config]); @@ -9024,6 +9044,12 @@ static int patch_alc883(struct hda_codec *codec) } } + err = snd_hda_attach_beep_device(codec, 0x1); + if (err < 0) { + alc_free(codec); + return err; + } + if (board_config != ALC883_AUTO) setup_preset(spec, &alc883_presets[board_config]); @@ -10844,6 +10870,12 @@ static int patch_alc262(struct hda_codec *codec) } } + err = snd_hda_attach_beep_device(codec, 0x1); + if (err < 0) { + alc_free(codec); + return err; + } + if (board_config != ALC262_AUTO) setup_preset(spec, &alc262_presets[board_config]); @@ -11896,6 +11928,12 @@ static int patch_alc268(struct hda_codec *codec) } } + err = snd_hda_attach_beep_device(codec, 0x1); + if (err < 0) { + alc_free(codec); + return err; + } + if (board_config != ALC268_AUTO) setup_preset(spec, &alc268_presets[board_config]); @@ -12730,6 +12768,12 @@ static int patch_alc269(struct hda_codec *codec) } } + err = snd_hda_attach_beep_device(codec, 0x1); + if (err < 0) { + alc_free(codec); + return err; + } + if (board_config != ALC269_AUTO) setup_preset(spec, &alc269_presets[board_config]); @@ -13823,6 +13867,12 @@ static int patch_alc861(struct hda_codec *codec) } } + err = snd_hda_attach_beep_device(codec, 0x23); + if (err < 0) { + alc_free(codec); + return err; + } + if (board_config != ALC861_AUTO) setup_preset(spec, &alc861_presets[board_config]); @@ -14769,6 +14819,12 @@ static int patch_alc861vd(struct hda_codec *codec) } } + err = snd_hda_attach_beep_device(codec, 0x23); + if (err < 0) { + alc_free(codec); + return err; + } + if (board_config != ALC861VD_AUTO) setup_preset(spec, &alc861vd_presets[board_config]); @@ -16578,6 +16634,12 @@ static int patch_alc662(struct hda_codec *codec) } } + err = snd_hda_attach_beep_device(codec, 0x1); + if (err < 0) { + alc_free(codec); + return err; + } + if (board_config != ALC662_AUTO) setup_preset(spec, &alc662_presets[board_config]); -- 1.5.6.5

2 1

[alsa-devel] [PATCH 2.6.30] ASoC: add additional controls to the CS4270 codec driver
by Timur Tabi 04 Feb '09

04 Feb '09

Update the CS4270 codec driver to allow applications to use the mixer to control Digital Loopback, Soft Ramp, Zero Cross, Popguard, and Auto-Mute. Soft Ramp, Zero Cross, and Auto-Mute are disabled by the driver when it first initializes the hardware, but these features either don't work or interfere with normal ALSA behavior. However, they can now be re-enabled by an application if desired. Remove CONFIG_SND_SOC_CS4270_HWMUTE and always allow ASoC to control the mute bits. The driver previously and erroneously assumed that these bits control only external muting circuitry, but they also control internal muting circuitry, so they should always be used. Signed-off-by: Timur Tabi <timur(a)freescale.com> --- sound/soc/codecs/Kconfig | 6 --- sound/soc/codecs/cs4270.c | 93 +++++++++++++++++++------------------------- 2 files changed, 40 insertions(+), 59 deletions(-) diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index a195303..628a591 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -67,12 +67,6 @@ config SND_SOC_AK4535 config SND_SOC_CS4270 tristate -# Cirrus Logic CS4270 Codec Hardware Mute Support -# Select if you have external muting circuitry attached to your CS4270. -config SND_SOC_CS4270_HWMUTE - bool - depends on SND_SOC_CS4270 - # Cirrus Logic CS4270 Codec VD = 3.3V Errata # Select if you are affected by the errata where the part will not function # if MCLK divide-by-1.5 is selected and VD is set to 3.3V. The driver will diff --git a/sound/soc/codecs/cs4270.c b/sound/soc/codecs/cs4270.c index 2c79a24..cd4a9ee 100644 --- a/sound/soc/codecs/cs4270.c +++ b/sound/soc/codecs/cs4270.c @@ -395,17 +395,7 @@ static int cs4270_hw_params(struct snd_pcm_substream *substream, return -EINVAL; } - /* Freeze and power-down the codec */ - - ret = snd_soc_write(codec, CS4270_PWRCTL, CS4270_PWRCTL_FREEZE | - CS4270_PWRCTL_PDN_ADC | CS4270_PWRCTL_PDN_DAC | - CS4270_PWRCTL_PDN); - if (ret < 0) { - dev_err(codec->dev, "i2c write failed\n"); - return ret; - } - - /* Program the mode control register */ + /* Set the sample rate */ reg = snd_soc_read(codec, CS4270_MODE); reg &= ~(CS4270_MODE_SPEED_MASK | CS4270_MODE_DIV_MASK); @@ -417,7 +407,7 @@ static int cs4270_hw_params(struct snd_pcm_substream *substream, return ret; } - /* Program the format register */ + /* Set the DAI format */ reg = snd_soc_read(codec, CS4270_FORMAT); reg &= ~(CS4270_FORMAT_DAC_MASK | CS4270_FORMAT_ADC_MASK); @@ -440,42 +430,9 @@ static int cs4270_hw_params(struct snd_pcm_substream *substream, return ret; } - /* Disable auto-mute. This feature appears to be buggy, because in - some situations, auto-mute will not deactivate when it should. */ - - reg = snd_soc_read(codec, CS4270_MUTE); - reg &= ~CS4270_MUTE_AUTO; - ret = snd_soc_write(codec, CS4270_MUTE, reg); - if (ret < 0) { - dev_err(codec->dev, "i2c write failed\n"); - return ret; - } - - /* Disable automatic volume control. It's enabled by default, and - * it causes volume change commands to be delayed, sometimes until - * after playback has started. - */ - - reg = cs4270_read_reg_cache(codec, CS4270_TRANS); - reg &= ~(CS4270_TRANS_SOFT | CS4270_TRANS_ZERO); - ret = cs4270_i2c_write(codec, CS4270_TRANS, reg); - if (ret < 0) { - dev_err(codec->dev, "i2c write failed\n"); - return ret; - } - - /* Thaw and power-up the codec */ - - ret = snd_soc_write(codec, CS4270_PWRCTL, 0); - if (ret < 0) { - dev_err(codec->dev, "i2c write failed\n"); - return ret; - } - return ret; } -#ifdef CONFIG_SND_SOC_CS4270_HWMUTE /** * cs4270_mute - enable/disable the CS4270 external mute * @dai: the SOC DAI @@ -494,22 +451,23 @@ static int cs4270_mute(struct snd_soc_dai *dai, int mute) reg6 = snd_soc_read(codec, CS4270_MUTE); if (mute) - reg6 |= CS4270_MUTE_ADC_A | CS4270_MUTE_ADC_B | - CS4270_MUTE_DAC_A | CS4270_MUTE_DAC_B; + reg6 |= CS4270_MUTE_DAC_A | CS4270_MUTE_DAC_B; else - reg6 &= ~(CS4270_MUTE_ADC_A | CS4270_MUTE_ADC_B | - CS4270_MUTE_DAC_A | CS4270_MUTE_DAC_B); + reg6 &= ~(CS4270_MUTE_DAC_A | CS4270_MUTE_DAC_B); return snd_soc_write(codec, CS4270_MUTE, reg6); } -#else -#define cs4270_mute NULL -#endif /* A list of non-DAPM controls that the CS4270 supports */ static const struct snd_kcontrol_new cs4270_snd_controls[] = { SOC_DOUBLE_R("Master Playback Volume", - CS4270_VOLA, CS4270_VOLB, 0, 0xFF, 1) + CS4270_VOLA, CS4270_VOLB, 0, 0xFF, 1), + SOC_SINGLE("Digital Sidetone Switch", CS4270_FORMAT, 5, 1, 0), + SOC_SINGLE("Soft Ramp Switch", CS4270_TRANS, 6, 1, 0), + SOC_SINGLE("Zero Cross Switch", CS4270_TRANS, 5, 1, 0), + SOC_SINGLE("Popguard Switch", CS4270_MODE, 0, 1, 1), + SOC_SINGLE("Auto-Mute Switch", CS4270_MUTE, 5, 1, 0), + SOC_DOUBLE("Master Capture Switch", CS4270_MUTE, 3, 4, 1, 0) }; /* @@ -637,6 +595,7 @@ static int cs4270_i2c_probe(struct i2c_client *i2c_client, { struct snd_soc_codec *codec; struct cs4270_private *cs4270; + unsigned int reg; int ret; /* For now, we only support one cs4270 device in the system. See the @@ -702,6 +661,34 @@ static int cs4270_i2c_probe(struct i2c_client *i2c_client, goto error_free_codec; } + /* Disable auto-mute. This feature appears to be buggy. In some + * situations, auto-mute will not deactivate when it should, so we want + * this feature disabled by default. An application (e.g. alsactl) can + * re-enabled it by using the controls. + */ + + reg = cs4270_read_reg_cache(codec, CS4270_MUTE); + reg &= ~CS4270_MUTE_AUTO; + ret = cs4270_i2c_write(codec, CS4270_MUTE, reg); + if (ret < 0) { + dev_err(&i2c_client->dev, "i2c write failed\n"); + return ret; + } + + /* Disable automatic volume control. The hardware enables, and it + * causes volume change commands to be delayed, sometimes until after + * playback has started. An application (e.g. alsactl) can + * re-enabled it by using the controls. + */ + + reg = cs4270_read_reg_cache(codec, CS4270_TRANS); + reg &= ~(CS4270_TRANS_SOFT | CS4270_TRANS_ZERO); + ret = cs4270_i2c_write(codec, CS4270_TRANS, reg); + if (ret < 0) { + dev_err(&i2c_client->dev, "i2c write failed\n"); + return ret; + } + /* Initialize the DAI. Normally, we'd prefer to have a kmalloc'd DAI * structure for each CS4270 device, but the machine driver needs to * have a pointer to the DAI structure, so for now it must be a global -- 1.5.5

2 1

[alsa-devel] [PATCH] ASoC: pxa-ssp: fix SSP port request
by Philipp Zabel 04 Feb '09

04 Feb '09

PXA2xx/3xx SSP ports start from 1, not 0. Thus, the probe function requested the wrong SSP port. Correcting this unveiled another bug where ssp_init tries to request the already-requested SSP port again. So this patch replaces the ssp_init/exit calls with their internals from mach-pxa/ssp.c, leaving out the redundant ssp_request and the unneeded IRQ request. Effectively, that leaves us with not much more than enabling/disabling the SSP clock. Signed-off-by: Philipp Zabel <philipp.zabel(a)gmail.com> --- sound/soc/pxa/pxa-ssp.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/sound/soc/pxa/pxa-ssp.c b/sound/soc/pxa/pxa-ssp.c index 73cb6b4..f9c6de5 100644 --- a/sound/soc/pxa/pxa-ssp.c +++ b/sound/soc/pxa/pxa-ssp.c @@ -21,6 +21,8 @@ #include <linux/clk.h> #include <linux/io.h> +#include <asm/irq.h> + #include <sound/core.h> #include <sound/pcm.h> #include <sound/initval.h> @@ -221,9 +223,9 @@ static int pxa_ssp_startup(struct snd_pcm_substream *substream, int ret = 0; if (!cpu_dai->active) { - ret = ssp_init(&priv->dev, cpu_dai->id + 1, SSP_NO_IRQ); - if (ret < 0) - return ret; + priv->dev.port = cpu_dai->id + 1; + priv->dev.irq = NO_IRQ; + clk_enable(priv->dev.ssp->clk); ssp_disable(&priv->dev); } return ret; @@ -238,7 +240,7 @@ static void pxa_ssp_shutdown(struct snd_pcm_substream *substream, if (!cpu_dai->active) { ssp_disable(&priv->dev); - ssp_exit(&priv->dev); + clk_disable(priv->dev.ssp->clk); } } @@ -751,7 +753,7 @@ static int pxa_ssp_probe(struct platform_device *pdev, if (!priv) return -ENOMEM; - priv->dev.ssp = ssp_request(dai->id, "SoC audio"); + priv->dev.ssp = ssp_request(dai->id + 1, "SoC audio"); if (priv->dev.ssp == NULL) { ret = -ENODEV; goto err_priv; -- 1.5.6.5

2 1

[alsa-devel] ASoC: UDA1380/I2S/SSP patches
by Philipp Zabel 04 Feb '09

04 Feb '09

Right now the snd-soc-magician driver in ASoC dev is severely bitrotted. I can make it compile and load again, but until now it only outputs silence (or pops and hisses as I fiddle with the uda1380 registers). For now, I'd like feedback on these patches in preparation for the magician update and switch from pxa2xx-ssp to pxa-ssp. regards Philipp

3 18

[alsa-devel] alsa license question
by Tim Blechmann 04 Feb '09

04 Feb '09

hi all, i am currently working on an alsa driver for the digigram lx6464es interface, based on the sources of the windows driver. since i would like to include some parts of the windows source code, (mainly the header files with register declarations) to the alsa driver, i have a few question: - is it ok, if these files don't match the coding style of the linux kernel? - digigram assured, that i am allowed to include source code to the linux driver. most of the files have the copyright notice: COPYRIGHT (some year) DIGIGRAM. ALL RIGHTS RESERVED. is this statement ok, or do i need to replace the `ALL RIGHTS RESERVED' with a gpl-compatible license note? - is there any repository for alsa driver documentation, provided by the manufacturer? digigram provided the windows driver for the lx6464es, mentioning that this source is `freely accessible to the GNU / ALSA community', so if there is a repository like that, the source package should probably be archived there. thanks, tim -- tim(a)klingt.org http://tim.klingt.org Avoid the world, it's just a lot of dust and drag and means nothing in the end. Jack Kerouac

3 3

[alsa-devel] Creative X-Fi USB 5.1 Driver
by Mandar Joshi 04 Feb '09

04 Feb '09

Hello, I was reading the USB Audio Specs from http://www.usb.org/developers/devclass_docs The document talks about Effect Unit Descriptors and few other descriptors.There is no mention of such descriptors in the 'lsusb -v' output for the USB X-Fi 5.1 Does this mean thet the X-Fi,Crystalizer features of the USB X-Fi are implemented purely in software? Here is a link to the lsusb output http://mndar.phpnet.us/usbxfi/files/creative.txt The document "Audio20 final.pdf" also mentions that bDeviceClass, bDeviceSubClass and bDeviceProtocol should have values 0xEF, 0x02, and 0x01 respectively but in the 'lsusb -v' output all three values are 0. Any idea why it is so? Regards Mandar Joshi

1 0

[alsa-devel] [PATCH 1/2] [EXPERIMENTAL] Add support for the latest IndigoIOx and IndigoDJx cards
by Giuliano Pochini 04 Feb '09

04 Feb '09

The following is a very beta patch and is not meant to be merged yet. It has been compile-tested only because I haven't the those cards. Hopefully I'll be able to test it myself soon. As you can see, I reused the existing IndigoIO and IndigoDJ driver because they are the same cards with a different interface. The firmware is different, though. The driver registers the card as a plain -IO or -DJ without the trailing "x" (I will fix it later if someone thinks it's important). diff -dup alsa-driver__orig/alsa-kernel/pci/echoaudio/echoaudio.h alsa-driver/alsa-kernel/pci/echoaudio/echoaudio.h --- alsa-driver__orig/alsa-kernel/pci/echoaudio/echoaudio.h 2009-02-01 15:37:54.000000000 +0100 +++ alsa-driver/alsa-kernel/pci/echoaudio/echoaudio.h 2009-02-01 21:59:38.000000000 +0100 @@ -189,6 +189,9 @@ #define INDIGO 0x0090 #define INDIGO_IO 0x00a0 #define INDIGO_DJ 0x00b0 +#define DC8 0x00c0 +#define INDIGO_IOX 0x00d0 +#define INDIGO_DJX 0x00e0 #define ECHO3G 0x0100 diff -dup alsa-driver__orig/alsa-kernel/pci/echoaudio/indigodj.c alsa-driver/alsa-kernel/pci/echoaudio/indigodj.c --- alsa-driver__orig/alsa-kernel/pci/echoaudio/indigodj.c 2009-02-01 15:37:54.000000000 +0100 +++ alsa-driver/alsa-kernel/pci/echoaudio/indigodj.c 2009-02-01 22:26:02.000000000 +0100 @@ -59,17 +59,21 @@ MODULE_FIRMWARE("ea/loader_dsp.fw"); MODULE_FIRMWARE("ea/indigo_dj_dsp.fw"); +MODULE_FIRMWARE("ea/indigo_djx_dsp.fw"); #define FW_361_LOADER 0 #define FW_INDIGO_DJ_DSP 1 +#define FW_INDIGO_DJX_DSP 2 static const struct firmware card_fw[] = { {0, "loader_dsp.fw"}, - {0, "indigo_dj_dsp.fw"} + {0, "indigo_dj_dsp.fw"}, + {0, "indigo_djx_dsp.fw"} }; static struct pci_device_id snd_echo_ids[] = { - {0x1057, 0x3410, 0xECC0, 0x00B0, 0, 0, 0}, /* Indigo DJ*/ + {0x1057, 0x3410, 0xECC0, 0x00B0, 0, 0, 0}, /* Indigo DJ */ + {0x1057, 0x3410, 0xECC0, 0x00E0, 0, 0, 0}, /* Indigo DJx */ {0,} }; diff -dup alsa-driver__orig/alsa-kernel/pci/echoaudio/indigodj_dsp.c alsa-driver/alsa-kernel/pci/echoaudio/indigodj_dsp.c --- alsa-driver__orig/alsa-kernel/pci/echoaudio/indigodj_dsp.c 2009-02-01 15:37:54.000000000 +0100 +++ alsa-driver/alsa-kernel/pci/echoaudio/indigodj_dsp.c 2009-02-01 21:53:55.000000000 +0100 @@ -37,9 +37,11 @@ static int update_vmixer_level(struct ec static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id) { int err; + u16 subdev; DE_INIT(("init_hw() - Indigo DJ\n")); - if (snd_BUG_ON((subdevice_id & 0xfff0) != INDIGO_DJ)) + subdev = subdevice_id & 0xfff0; + if (snd_BUG_ON(subdev != INDIGO_DJ && subdev != INDIGO_DJX)) return -ENODEV; if ((err = init_dsp_comm_page(chip))) { @@ -50,7 +52,10 @@ static int init_hw(struct echoaudio *chi chip->device_id = device_id; chip->subdevice_id = subdevice_id; chip->bad_board = TRUE; - chip->dsp_code_to_load = &card_fw[FW_INDIGO_DJ_DSP]; + if (subdev == INDIGO_DJ) + chip->dsp_code_to_load = &card_fw[FW_INDIGO_DJ_DSP]; + else + chip->dsp_code_to_load = &card_fw[FW_INDIGO_DJX_DSP]; /* Since this card has no ASIC, mark it as loaded so everything works OK */ chip->asic_loaded = TRUE; diff -dup alsa-driver__orig/alsa-kernel/pci/echoaudio/indigoio.c alsa-driver/alsa-kernel/pci/echoaudio/indigoio.c --- alsa-driver__orig/alsa-kernel/pci/echoaudio/indigoio.c 2009-02-01 15:37:54.000000000 +0100 +++ alsa-driver/alsa-kernel/pci/echoaudio/indigoio.c 2009-02-01 22:26:11.000000000 +0100 @@ -60,17 +60,21 @@ MODULE_FIRMWARE("ea/loader_dsp.fw"); MODULE_FIRMWARE("ea/indigo_io_dsp.fw"); +MODULE_FIRMWARE("ea/indigo_iox_dsp.fw"); #define FW_361_LOADER 0 #define FW_INDIGO_IO_DSP 1 +#define FW_INDIGO_IOX_DSP 2 static const struct firmware card_fw[] = { {0, "loader_dsp.fw"}, - {0, "indigo_io_dsp.fw"} + {0, "indigo_io_dsp.fw"}, + {0, "indigo_iox_dsp.fw"} }; static struct pci_device_id snd_echo_ids[] = { - {0x1057, 0x3410, 0xECC0, 0x00A0, 0, 0, 0}, /* Indigo IO*/ + {0x1057, 0x3410, 0xECC0, 0x00A0, 0, 0, 0}, /* Indigo IO */ + {0x1057, 0x3410, 0xECC0, 0x00D0, 0, 0, 0}, /* Indigo IOx */ {0,} }; diff -dup alsa-driver__orig/alsa-kernel/pci/echoaudio/indigoio_dsp.c alsa-driver/alsa-kernel/pci/echoaudio/indigoio_dsp.c --- alsa-driver__orig/alsa-kernel/pci/echoaudio/indigoio_dsp.c 2009-02-01 15:37:54.000000000 +0100 +++ alsa-driver/alsa-kernel/pci/echoaudio/indigoio_dsp.c 2009-02-01 21:59:05.000000000 +0100 @@ -37,9 +37,11 @@ static int update_vmixer_level(struct ec static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id) { int err; + u16 subdev; DE_INIT(("init_hw() - Indigo IO\n")); - if (snd_BUG_ON((subdevice_id & 0xfff0) != INDIGO_IO)) + subdev = subdevice_id & 0xfff0; + if (snd_BUG_ON(subdev != INDIGO_IO && subdev != INDIGO_IOX)) return -ENODEV; if ((err = init_dsp_comm_page(chip))) { @@ -50,7 +52,10 @@ static int init_hw(struct echoaudio *chi chip->device_id = device_id; chip->subdevice_id = subdevice_id; chip->bad_board = TRUE; - chip->dsp_code_to_load = &card_fw[FW_INDIGO_IO_DSP]; + if (subdev == INDIGO_IO) + chip->dsp_code_to_load = &card_fw[FW_INDIGO_IO_DSP]; + else + chip->dsp_code_to_load = &card_fw[FW_INDIGO_IOX_DSP]; /* Since this card has no ASIC, mark it as loaded so everything works OK */ chip->asic_loaded = TRUE; -- Giuliano.

2 2

[alsa-devel] asoc: s3c24xx+uda1380 - some questions
by Vasily Khoruzhick 03 Feb '09

03 Feb '09

Hi, I'm trying to develop asoc driver for hp ipaq rx1950 (s3c24xx + uda1380). 1st question: where I can enable/disable uda1380 codec power? I need to control codec power for powersave reasons. I tried to add custom power function call to uda1380_set_bias_level in uda1380.c (pointer to power function is stored in codec->private_data), as it done for uda134x codec, but after enable-disable-enable cycle (for example, after resuming from suspend) driver cannot communicate with codec anymore (i2c bus is always busy), only reloading i2c driver helps. I suspect, power(0) is called in inappropriate moment, when i2c-transfer still is not finished. 2nd question: for some reason, driver does not produce any sound during first aplay invocation, only second and later aplay invocation driver produces sound. What can be the reason of this problem? Regards Vasily

3 18