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

[alsa-devel] ASoC: pxa2xx-i2s
by Brian Rhodes 21 Jan '09

21 Jan '09

i2s replay is not being enabled properly on occasion on my pxa270 board. Current code is touching SACR1 in hw_params which I believe is not correct. That should be configured in trigger before enabling i2s. Record is not disabled for playback mode. Any invalid data in the transmit fifo causes deadlock and replay is being disabled. I have been able to reproduce it in kernel 2.6.26 as well as Linus' git tree using speaker-test. (repeatedly starting and stopping). I've verified that this fix prevents (at least) this condition. Please review this patch and let me know if there is anything I have overlooked. Thanks diff --git a/sound/soc/pxa/pxa2xx-i2s.c b/sound/soc/pxa/pxa2xx-i2s.c index 517991f..6cda7f1 100644 --- a/sound/soc/pxa/pxa2xx-i2s.c +++ b/sound/soc/pxa/pxa2xx-i2s.c @@ -211,12 +211,10 @@ static int pxa2xx_i2s_hw_params(struct snd_pcm_substream *substream, if (!(SACR0 & SACR0_ENB)) { SACR0 = 0; - SACR1 = 0; if (pxa_i2s.master) SACR0 |= SACR0_BCKD; SACR0 |= SACR0_RFTH(14) | SACR0_TFTH(1); - SACR1 |= pxa_i2s.fmt; } if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) SAIMR |= SAIMR_TFS; @@ -257,6 +255,12 @@ static int pxa2xx_i2s_trigger(struct snd_pcm_substream *substream, int cmd, switch (cmd) { case SNDRV_PCM_TRIGGER_START: + SACR1 = pxa_i2s.fmt | SACR1_DRPL | SACR1_DREC; + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { + SACR1 &= ~SACR1_DRPL; + } else { + SACR1 &= ~SACR1_DREC; + } SACR0 |= SACR0_ENB; break; case SNDRV_PCM_TRIGGER_RESUME:

3 4

[alsa-devel] [PATCH] cmi8330: add OPL3 support
by Krzysztof Helt 21 Jan '09

21 Jan '09

From: Krzysztof Helt <krzysztof.h1(a)wp.pl> Add OPL3 handling to the driver and volume control for FM synthesis. Signed-off-by: Krzysztof Helt <krzysztof.h1(a)wp.pl> --- sound/isa/Kconfig | 1 + sound/isa/cmi8330.c | 30 ++++++++++++++++++++++++++++-- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/sound/isa/Kconfig b/sound/isa/Kconfig index 2d6ce32..ae917e1 100644 --- a/sound/isa/Kconfig +++ b/sound/isa/Kconfig @@ -94,6 +94,7 @@ config SND_CMI8330 tristate "C-Media CMI8330" select SND_WSS_LIB select SND_SB16_DSP + select SND_OPL3_LIB help Say Y here to include support for soundcards based on the C-Media CMI8330 chip. diff --git a/sound/isa/cmi8330.c b/sound/isa/cmi8330.c index e49aec7..dec6ea5 100644 --- a/sound/isa/cmi8330.c +++ b/sound/isa/cmi8330.c @@ -51,6 +51,7 @@ #include <linux/moduleparam.h> #include <sound/core.h> #include <sound/wss.h> +#include <sound/opl3.h> #include <sound/sb.h> #include <sound/initval.h> @@ -79,6 +80,7 @@ static int sbdma16[SNDRV_CARDS] = SNDRV_DEFAULT_DMA; static long wssport[SNDRV_CARDS] = SNDRV_DEFAULT_PORT; static int wssirq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ; static int wssdma[SNDRV_CARDS] = SNDRV_DEFAULT_DMA; +static long fmport[SNDRV_CARDS] = SNDRV_DEFAULT_PORT; module_param_array(index, int, NULL, 0444); MODULE_PARM_DESC(index, "Index value for CMI8330 soundcard."); @@ -107,6 +109,8 @@ MODULE_PARM_DESC(wssirq, "IRQ # for CMI8330 WSS driver."); module_param_array(wssdma, int, NULL, 0444); MODULE_PARM_DESC(wssdma, "DMA for CMI8330 WSS driver."); +module_param_array(fmport, long, NULL, 0444); +MODULE_PARM_DESC(fmport, "FM port # for CMI8330 driver."); #ifdef CONFIG_PNP static int isa_registered; static int pnp_registered; @@ -219,8 +223,10 @@ WSS_SINGLE("3D Control - Switch", 0, CMI8330_RMUX3D, 5, 1, 1), WSS_SINGLE("PC Speaker Playback Volume", 0, CMI8330_OUTPUTVOL, 3, 3, 0), -WSS_SINGLE("FM Playback Switch", 0, - CMI8330_RECMUX, 3, 1, 1), +WSS_DOUBLE("FM Playback Switch", 0, + CS4231_AUX2_LEFT_INPUT, CS4231_AUX2_RIGHT_INPUT, 7, 7, 1, 1), +WSS_DOUBLE("FM Playback Volume", 0, + CS4231_AUX2_LEFT_INPUT, CS4231_AUX2_RIGHT_INPUT, 0, 0, 31, 1), WSS_SINGLE(SNDRV_CTL_NAME_IEC958("Input ", CAPTURE, SWITCH), 0, CMI8330_RMUX3D, 7, 1, 1), WSS_SINGLE(SNDRV_CTL_NAME_IEC958("Input ", PLAYBACK, SWITCH), 0, @@ -333,6 +339,7 @@ static int __devinit snd_cmi8330_pnp(int dev, struct snd_cmi8330 *acard, wssport[dev] = pnp_port_start(pdev, 0); wssdma[dev] = pnp_dma(pdev, 0); wssirq[dev] = pnp_irq(pdev, 0); + fmport[dev] = pnp_port_start(pdev, 1); /* allocate SB16 resources */ pdev = acard->play; @@ -487,6 +494,7 @@ static int __devinit snd_cmi8330_probe(struct snd_card *card, int dev) { struct snd_cmi8330 *acard; int i, err; + struct snd_opl3 *opl3; acard = card->private_data; err = snd_wss_create(card, wssport[dev] + 4, -1, @@ -530,6 +538,24 @@ static int __devinit snd_cmi8330_probe(struct snd_card *card, int dev) snd_printk(KERN_ERR PFX "failed to create pcms\n"); return err; } + if (fmport[dev] != SNDRV_AUTO_PORT) { + if (snd_opl3_create(card, + fmport[dev], fmport[dev] + 2, + OPL3_HW_AUTO, 0, &opl3) < 0) { + snd_printk(KERN_ERR PFX + "no OPL device at 0x%lx-0x%lx ?\n", + fmport[dev], fmport[dev] + 2); + } else { + err = snd_opl3_timer_new(opl3, 0, 1); + if (err < 0) + return err; + + err = snd_opl3_hwdep_new(opl3, 0, 1, NULL); + if (err < 0) + return err; + } + } + strcpy(card->driver, "CMI8330/C3D"); strcpy(card->shortname, "C-Media CMI8330/C3D"); -- 1.5.2.2 ---------------------------------------------------------------------- Zobacz gry internetowe dla dzieci! sprawdz >>>http://link.interia.pl/f202c

3 5

[alsa-devel] aplay hang with 1.0.18
by Will Wagner 21 Jan '09

21 Jan '09

Hi All, I am seeing a problem with aplay hanging when trying to play a wav file. The problem is that it is trying to use an mmap function even though mmap was not initialised. The call stack is: #0 snd_pcm_mmap_begin (pcm=0x400764a0, areas=0x400772c4, offset=0x40061e1c, frames=0x40082f78) at pcm.c:6402 #1 0x40081eb4 in snd_pcm_plugin_write_areas (pcm=0x2b0e8, areas=0xbeb20950, offset=0, size=2048) at pcm_plugin.c:278 #2 0x4006ab20 in snd1_pcm_write_areas (pcm=0x2b0e8, areas=0xbeb20950, offset=0, size=2048, func=0x40081e30 <snd_pcm_plugin_write_areas>) at pcm.c:6654 #3 0x40082578 in snd_pcm_plugin_writei (pcm=0x2b0e8, buffer=0x2b6c8, size=2048) at pcm_plugin.c:361 #4 0x4005e384 in _snd_pcm_writei (pcm=0x21db8, buffer=0x2b6c8, size=2048) at pcm_local.h:516 #5 0x4005e2f8 in snd_pcm_writei (pcm=0x21db8, buffer=0x2b6c8, size=2048) at pcm.c:1243 #6 0x0001045c in pcm_write (data=0x2b6c8 "^", count=2048) at aplay.c:1432 #7 0x000135b8 in playback_go (fd=5, loaded=0, count=424600, rtype=2, name=0xbeb20dd5 "/sdcard/test.wav") at aplay.c:2171 #8 0x00013a0c in playback (name=0xbeb20dd5 "/sdcard/test.wav") at aplay.c:2231 #9 0x0000c38c in main (argc=2, argv=0xbeb20cd4) at aplay.c:641 It gets here even though the mmap_flag was not set. This then causes an infinite loop as no mmap areas have been defined. My setup was working with version 1.0.16. What could have changed to break this? Is it something wrong with my config? Thanks, Will. -- ------------------------------------------------------------------------ Will Wagner will_wagner(a)carallon.com Development Manager Office Tel: +44 (0)20 7371 2032 Carallon Ltd, Studio G20, Shepherds Building, Rockley Rd, London W14 0DA ------------------------------------------------------------------------

2 1

[alsa-devel] [PATCH] sscape: use common MPU401 macros
by Krzysztof Helt 21 Jan '09

21 Jan '09

From: Krzysztof Helt <krzysztof.h1(a)wp.pl> Remove local macros which redefines the common ones. Signed-off-by: Krzysztof Helt <krzysztof.h1(a)wp.pl> --- Just cut few lines from the driver. sound/isa/sscape.c | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/sound/isa/sscape.c b/sound/isa/sscape.c index 6a7f842..681e223 100644 --- a/sound/isa/sscape.c +++ b/sound/isa/sscape.c @@ -89,9 +89,6 @@ MODULE_DEVICE_TABLE(pnp_card, sscape_pnpids); #endif -#define MPU401_IO(i) ((i) + 0) -#define MIDI_DATA_IO(i) ((i) + 0) -#define MIDI_CTRL_IO(i) ((i) + 1) #define HOST_CTRL_IO(i) ((i) + 2) #define HOST_DATA_IO(i) ((i) + 3) #define ODIE_ADDR_IO(i) ((i) + 4) @@ -327,7 +324,7 @@ static int host_write_ctrl_unsafe(unsigned io_base, unsigned char data, */ static inline int verify_mpu401(const struct snd_mpu401 * mpu) { - return ((inb(MIDI_CTRL_IO(mpu->port)) & 0xc0) == 0x80); + return ((inb(MPU401C(mpu)) & 0xc0) == 0x80); } /* @@ -335,7 +332,7 @@ static inline int verify_mpu401(const struct snd_mpu401 * mpu) */ static inline void initialise_mpu401(const struct snd_mpu401 * mpu) { - outb(0, MIDI_DATA_IO(mpu->port)); + outb(0, MPU401D(mpu)); } /* @@ -1191,12 +1188,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, - MPU401_IO(xport), mpu_irq[dev]); + err = create_mpu401(card, MIDI_DEVNUM, xport, mpu_irq[dev]); if (err < 0) { printk(KERN_ERR "sscape: Failed to create " "MPU-401 device at 0x%x\n", - MPU401_IO(xport)); + xport); goto _release_dma; } -- 1.5.2.2 ----------------------------------------------------------------------- Promocja w Speak Up. Kwartal angielskiego za darmo. 3 miesiace nauki gratis. Sprawdz teraz! >> http://link.interia.pl/f2019

1 0

[alsa-devel] [PATCH] hda: 83xxx port 0xe DAC selection
by Matthew Ranostay 21 Jan '09

21 Jan '09

On the 92hd8xxx codecs port 0xe needs the connection selected to be the last DAC in the list. Signed-off-by: Matthew Ranostay <mranostay(a)embeddedalley.com> --- diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c index a4d4afe..7badec0 100644 --- a/sound/pci/hda/patch_sigmatel.c +++ b/sound/pci/hda/patch_sigmatel.c @@ -841,10 +841,6 @@ static struct hda_verb stac92hd73xx_10ch_core_init[] = { }; static struct hda_verb stac92hd83xxx_core_init[] = { - /* start of config #1 */ - { 0xe, AC_VERB_SET_CONNECT_SEL, 0x3}, - - /* start of config #2 */ { 0xa, AC_VERB_SET_CONNECT_SEL, 0x0}, { 0xb, AC_VERB_SET_CONNECT_SEL, 0x0}, { 0xd, AC_VERB_SET_CONNECT_SEL, 0x1}, @@ -4754,7 +4750,9 @@ static struct hda_input_mux stac92hd83xxx_dmux = { static int patch_stac92hd83xxx(struct hda_codec *codec) { struct sigmatel_spec *spec; + hda_nid_t conn[STAC92HD83_DAC_COUNT + 1]; int err; + int num_dacs; spec = kzalloc(sizeof(*spec), GFP_KERNEL); if (spec == NULL) @@ -4773,13 +4771,21 @@ static int patch_stac92hd83xxx(struct hda_codec *codec) spec->num_pwrs = ARRAY_SIZE(stac92hd83xxx_pwr_nids); spec->multiout.dac_nids = spec->dac_nids; + + /* set port 0xe to select the last DAC + */ + num_dacs = snd_hda_get_connections(codec, 0x0e, + conn, STAC92HD83_DAC_COUNT + 1) - 1; + + snd_hda_codec_write_cache(codec, 0xe, 0, + AC_VERB_SET_CONNECT_SEL, num_dacs); + spec->init = stac92hd83xxx_core_init; switch (codec->vendor_id) { case 0x111d7605: break; default: spec->num_pwrs--; - spec->init++; /* switch to config #2 */ } spec->mixer = stac92hd83xxx_mixer;

2 1

[alsa-devel] ASoC updates for 2.6.30
by Mark Brown 21 Jan '09

21 Jan '09

The following changes since commit b2a19d02396c92294abcddee5bd9bd49cc4e4d1c: Mark Brown (1): ASoC: Staticise PCM operations tables are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-2.6.30 Ian Molton (1): ASoC: Fix WM9705 capture switch name Mark Brown (1): Merge branch 'for-2.6.29' into for-2.6.30 Timur Tabi (2): ASoC: fix registration of the SoC card in the Freescale MPC8610 drivers ASoC: Allow Freescale MPC8610 audio drivers to be compiled as modules sound/soc/codecs/wm9705.c | 4 ++-- sound/soc/fsl/Kconfig | 16 ++++++++-------- sound/soc/fsl/Makefile | 7 +++++-- sound/soc/fsl/mpc8610_hpcd.c | 18 ++++++------------ 4 files changed, 21 insertions(+), 24 deletions(-)

2 1

[alsa-devel] ASoC update for 2.6.29
by Mark Brown 21 Jan '09

21 Jan '09

The following changes since commit 591046cfc5f1b452db0a4557850ad7f394e38231: Ben Nizette (1): ASoC: atmel_pcm: Remove non-existant header are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-2.6.29 Timur Tabi (1): ASoC: fix registration of the SoC card in the Freescale MPC8610 drivers sound/soc/fsl/mpc8610_hpcd.c | 18 ++++++------------ 1 files changed, 6 insertions(+), 12 deletions(-)

2 1

[alsa-devel] [PATCH - snd-powermac 0/1] Driver tree
by Risto Suominen 21 Jan '09

21 Jan '09

Hi Takashi, I still wonder, what about these: --- a/acinclude.m4.org 2008-11-12 12:04:39.000000000 +0200 +++ b/acinclude.m4 2009-01-13 15:04:03.000000000 +0200 @@ -1828,6 +1828,7 @@ CONFIG_SND_TIMER="m" CONFIG_SND_PCM="m" CONFIG_SND_POWERMAC="m" + CONFIG_SND_VMASTER="y" fi fi if alsa_check_kconfig_option "powermac-auto-drc"; then --- a/configure.org 2008-11-12 12:04:44.000000000 +0200 +++ b/configure 2009-01-13 15:04:31.000000000 +0200 @@ -16071,6 +16071,7 @@ CONFIG_SND_TIMER="m" CONFIG_SND_PCM="m" CONFIG_SND_POWERMAC="m" + CONFIG_SND_VMASTER="y" fi fi if alsa_check_kconfig_option "powermac-auto-drc"; then They were needed in making alsa-driver-1.0.18a for the new vmaster controls, but I couldn't see the files in your driver-tree. Risto

2 1

[alsa-devel] [PATCH - snd-powermac 0/5] Some small fixes
by Risto Suominen 21 Jan '09

21 Jan '09

Hi Takashi, What will follow, is two sets of patches, the first for kernel, the second for driver (old kernels). I've run checkpatch.pl and tried to check their patchability against your trees, no functional testing though, not even making. I'll try to send them with git-send-email (something I haven't tried before...). Risto

2 1

[alsa-devel] [PATCH 2.6.29] ASoC: fix registration of the SOC card in the Freescale MPC8610 drivers
by Timur Tabi 20 Jan '09

20 Jan '09

The Freescale MPC8610 driver was defining two SOC card (snd_soc_card) structures, partially initializing each one, but registering only one of them with ASoC. Signed-off-by: Timur Tabi <timur(a)freescale.com> --- sound/soc/fsl/mpc8610_hpcd.c | 18 ++++++------------ 1 files changed, 6 insertions(+), 12 deletions(-) diff --git a/sound/soc/fsl/mpc8610_hpcd.c b/sound/soc/fsl/mpc8610_hpcd.c index bcec3f6..acf39a6 100644 --- a/sound/soc/fsl/mpc8610_hpcd.c +++ b/sound/soc/fsl/mpc8610_hpcd.c @@ -183,16 +183,6 @@ static struct snd_soc_ops mpc8610_hpcd_ops = { }; /** - * mpc8610_hpcd_machine: ASoC machine data - */ -static struct snd_soc_card mpc8610_hpcd_machine = { - .probe = mpc8610_hpcd_machine_probe, - .remove = mpc8610_hpcd_machine_remove, - .name = "MPC8610 HPCD", - .num_links = 1, -}; - -/** * mpc8610_hpcd_probe: OF probe function for the fabric driver * * This function gets called when an SSI node is found in the device tree. @@ -455,7 +445,11 @@ static int mpc8610_hpcd_probe(struct of_device *ofdev, machine_data->dai.codec_dai = &cs4270_dai; /* The codec_dai we want */ machine_data->dai.ops = &mpc8610_hpcd_ops; - mpc8610_hpcd_machine.dai_link = &machine_data->dai; + machine_data->machine.probe = mpc8610_hpcd_machine_probe; + machine_data->machine.remove = mpc8610_hpcd_machine_remove; + machine_data->machine.name = "MPC8610 HPCD"; + machine_data->machine.num_links = 1; + machine_data->machine.dai_link = &machine_data->dai; /* Allocate a new audio platform device structure */ sound_device = platform_device_alloc("soc-audio", -1); @@ -465,7 +459,7 @@ static int mpc8610_hpcd_probe(struct of_device *ofdev, goto error; } - machine_data->sound_devdata.card = &mpc8610_hpcd_machine; + machine_data->sound_devdata.card = &machine_data->machine; machine_data->sound_devdata.codec_dev = &soc_codec_device_cs4270; machine_data->machine.platform = &fsl_soc_platform; -- 1.5.5

2 1