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

[alsa-devel] Will there ever be emu20k1/x-fi support in Alsa?
by Sebastian Schneider 08 Oct '08

08 Oct '08

What about we start porting the driver on our own? -- GMX startet ShortView.de. Hier findest Du Leute mit Deinen Interessen! Jetzt dabei sein: http://www.shortview.de/wasistshortview.php?mc=sv_ext_mf@gmx

1 0

[alsa-devel] [PATCH] [ALSA] Allow setting codec register with debugfs filesystem
by Troy Kisky 07 Oct '08

07 Oct '08

i.e. echo 6 59 >/sys/kernel/debug/soc-audio.0/codec_reg will set register 0x06 to a value of 0x59 Signed-off-by: Troy Kisky <troy.kisky(a)boundarydevices.com> diff --git a/include/sound/soc.h b/include/sound/soc.h index a1e0357..f5a6dbb 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -516,6 +516,10 @@ struct snd_soc_device { struct delayed_work delayed_work; struct work_struct deferred_resume_work; void *codec_data; +#ifdef CONFIG_SND_SOC_DEBUG_FS + struct dentry *debugfs_root; + struct dentry *debugfs_codec_reg; +#endif }; /* runtime channel data */ diff --git a/sound/soc/Kconfig b/sound/soc/Kconfig index 4dfda66..aad7e0b 100644 --- a/sound/soc/Kconfig +++ b/sound/soc/Kconfig @@ -22,6 +22,14 @@ if SND_SOC config SND_SOC_AC97_BUS bool +config SND_SOC_DEBUG_FS + boolean "changing codec registers through debugfs (DEVELOPMENT)" + depends on DEBUG_FS + help + The ability to directly write codec registers through + /sys/kernel/debug/xx/codec_reg is useful when developing + a new codec. + # All the supported Soc's source "sound/soc/at32/Kconfig" source "sound/soc/at91/Kconfig" diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index ad38113..46827cb 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -962,10 +962,8 @@ static int soc_new_pcm(struct snd_soc_device *socdev, } /* codec register dump */ -static ssize_t codec_reg_show(struct device *dev, - struct device_attribute *attr, char *buf) +static ssize_t soc_codec_reg_show(struct snd_soc_device *devdata, char *buf) { - struct snd_soc_device *devdata = dev_get_drvdata(dev); struct snd_soc_codec *codec = devdata->codec; int i, step = 1, count = 0; @@ -1002,8 +1000,113 @@ static ssize_t codec_reg_show(struct device *dev, return count; } +static ssize_t codec_reg_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct snd_soc_device *devdata = dev_get_drvdata(dev); + return soc_codec_reg_show(devdata, buf); +} + static DEVICE_ATTR(codec_reg, 0444, codec_reg_show, NULL); +#ifdef CONFIG_SND_SOC_DEBUG_FS +static int code_reg_open_file(struct inode *inode, struct file *file) +{ + file->private_data = inode->i_private; + return 0; +} + +static ssize_t code_reg_read_file(struct file *file, char __user *user_buf, + size_t count, loff_t *ppos) +{ + ssize_t res; + struct snd_soc_device *devdata = file->private_data; + char *buf = kmalloc(PAGE_SIZE, GFP_KERNEL); + + res = soc_codec_reg_show(devdata, buf); + res = simple_read_from_buffer(user_buf, count, ppos, buf, res); + kfree(buf); + return res; +} + +static ssize_t code_reg_write_file(struct file *file, + const char __user *user_buf, size_t count, loff_t *ppos) +{ + char buf[32]; + int buf_size; + char *start = buf; + unsigned long reg, value; + int step = 1; + struct snd_soc_device *devdata = file->private_data; + struct snd_soc_codec *codec = devdata->codec; + + buf_size = min(count, (sizeof(buf)-1)); + if (copy_from_user(buf, user_buf, buf_size)) + return -EFAULT; + buf[buf_size] = 0; + + if (codec->reg_cache_step) + step = codec->reg_cache_step; + + while (*start == ' ') + start++; + reg = simple_strtoul(start, &start, 16); + if ((reg >= codec->reg_cache_size) || (reg % step)) + return -EINVAL; + while (*start == ' ') + start++; + if (strict_strtoul(start, 16, &value)) + return -EINVAL; + codec->write(codec, reg, value); + return buf_size; +} + +static const struct file_operations codec_reg_fops = { + .open = code_reg_open_file, + .read = code_reg_read_file, + .write = code_reg_write_file, +}; + +static void soc_init_debugfs(struct snd_soc_device *socdev) +{ + struct dentry *root, *debugfs_codec_reg; + root = debugfs_create_dir(dev_name(socdev->dev), NULL); + if (IS_ERR(root) || !root) + goto exit1; + + debugfs_codec_reg = debugfs_create_file("codec_reg", 0644, + root, socdev, &codec_reg_fops); + if (!debugfs_codec_reg) + goto exit2; + + socdev->debugfs_root = root; + socdev->debugfs_codec_reg = debugfs_codec_reg; + return; +exit2: + debugfs_remove(root); +exit1: + dev_err(socdev->dev, "debugfs is not available\n"); +} + +static void soc_cleanup_debugfs(struct snd_soc_device *socdev) +{ + debugfs_remove(socdev->debugfs_codec_reg); + debugfs_remove(socdev->debugfs_root); + socdev->debugfs_codec_reg = NULL; + socdev->debugfs_root = NULL; +} + +#else + +static inline void soc_init_debugfs(struct snd_soc_device *socdev) +{ +} + +static inline void soc_cleanup_debugfs(struct snd_soc_device *socdev) +{ +} +#endif + /** * snd_soc_new_ac97_codec - initailise AC97 device * @codec: audio codec @@ -1217,6 +1320,7 @@ int snd_soc_register_card(struct snd_soc_device *socdev) if (err < 0) printk(KERN_WARNING "asoc: failed to add codec sysfs files\n"); + soc_init_debugfs(socdev); mutex_unlock(&codec->mutex); out: @@ -1254,6 +1358,7 @@ free_card: if (codec->card) snd_card_free(codec->card); device_remove_file(socdev->dev, &dev_attr_codec_reg); + soc_cleanup_debugfs(socdev); mutex_unlock(&codec->mutex); } EXPORT_SYMBOL_GPL(snd_soc_free_pcms); -- 1.5.4.3

2 1

[alsa-devel] [PATCH 1/1] ALSA: snd-usb-audio: support for Edirol UA-4FX device
by pedro.lopez.cabanillas＠gmail.com 07 Oct '08

07 Oct '08

From: Pedro Lopez-Cabanillas <pedro.lopez.cabanillas(a)gmail.com> Renamed the old quirk function for ua-700/ua-25 to become more generic. Added a new quirk for the Edirol UA-4FX. Signed-off-by: Pedro Lopez-Cabanillas <pedro.lopez.cabanillas(a)gmail.com> diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c index c5cf682..1077e9d 100644 --- a/sound/usb/usbaudio.c +++ b/sound/usb/usbaudio.c @@ -2996,12 +2996,12 @@ static int create_standard_audio_quirk(struct snd_usb_audio *chip, } /* - * Create a stream for an Edirol UA-700/UA-25 interface. The only way - * to detect the sample rate is by looking at wMaxPacketSize. + * Create a stream for an Edirol UA-700/UA-25/UA-4FX interface. + * The only way to detect the sample rate is by looking at wMaxPacketSize. */ -static int create_ua700_ua25_quirk(struct snd_usb_audio *chip, - struct usb_interface *iface, - const struct snd_usb_audio_quirk *quirk) +static int create_uaxx_quirk(struct snd_usb_audio *chip, + struct usb_interface *iface, + const struct snd_usb_audio_quirk *quirk) { static const struct audioformat ua_format = { .format = SNDRV_PCM_FORMAT_S24_3LE, @@ -3016,8 +3016,8 @@ static int create_ua700_ua25_quirk(struct snd_usb_audio *chip, struct audioformat *fp; int stream, err; - /* both PCM and MIDI interfaces have 2 altsettings */ - if (iface->num_altsetting != 2) + /* both PCM and MIDI interfaces have 2 or more altsettings */ + if (iface->num_altsetting < 2) return -ENXIO; alts = &iface->altsetting[1]; altsd = get_iface_desc(alts); @@ -3031,20 +3031,20 @@ static int create_ua700_ua25_quirk(struct snd_usb_audio *chip, .type = QUIRK_MIDI_FIXED_ENDPOINT, .data = &ua700_ep }; - static const struct snd_usb_midi_endpoint_info ua25_ep = { + static const struct snd_usb_midi_endpoint_info uaxx_ep = { .out_cables = 0x0001, .in_cables = 0x0001 }; - static const struct snd_usb_audio_quirk ua25_quirk = { + static const struct snd_usb_audio_quirk uaxx_quirk = { .type = QUIRK_MIDI_FIXED_ENDPOINT, - .data = &ua25_ep + .data = &uaxx_ep }; if (chip->usb_id == USB_ID(0x0582, 0x002b)) return snd_usb_create_midi_interface(chip, iface, &ua700_quirk); else return snd_usb_create_midi_interface(chip, iface, - &ua25_quirk); + &uaxx_quirk); } if (altsd->bNumEndpoints != 1) @@ -3376,9 +3376,9 @@ static int snd_usb_create_quirk(struct snd_usb_audio *chip, [QUIRK_MIDI_CME] = snd_usb_create_midi_interface, [QUIRK_AUDIO_STANDARD_INTERFACE] = create_standard_audio_quirk, [QUIRK_AUDIO_FIXED_ENDPOINT] = create_fixed_stream_quirk, - [QUIRK_AUDIO_EDIROL_UA700_UA25] = create_ua700_ua25_quirk, [QUIRK_AUDIO_EDIROL_UA1000] = create_ua1000_quirk, [QUIRK_AUDIO_EDIROL_UA101] = create_ua101_quirk, + [QUIRK_AUDIO_EDIROL_UAXX] = create_uaxx_quirk }; if (quirk->type < QUIRK_TYPE_COUNT) { diff --git a/sound/usb/usbaudio.h b/sound/usb/usbaudio.h index f3ca77f..36e4f7a 100644 --- a/sound/usb/usbaudio.h +++ b/sound/usb/usbaudio.h @@ -159,9 +159,9 @@ enum quirk_type { QUIRK_MIDI_US122L, QUIRK_AUDIO_STANDARD_INTERFACE, QUIRK_AUDIO_FIXED_ENDPOINT, - QUIRK_AUDIO_EDIROL_UA700_UA25, QUIRK_AUDIO_EDIROL_UA1000, QUIRK_AUDIO_EDIROL_UA101, + QUIRK_AUDIO_EDIROL_UAXX, QUIRK_TYPE_COUNT }; diff --git a/sound/usb/usbquirks.h b/sound/usb/usbquirks.h index 3f68359..815bf36 100644 --- a/sound/usb/usbquirks.h +++ b/sound/usb/usbquirks.h @@ -855,15 +855,15 @@ YAMAHA_DEVICE(0x7010, "UB99"), .data = (const struct snd_usb_audio_quirk[]) { { .ifnum = 1, - .type = QUIRK_AUDIO_EDIROL_UA700_UA25 + .type = QUIRK_AUDIO_EDIROL_UAXX }, { .ifnum = 2, - .type = QUIRK_AUDIO_EDIROL_UA700_UA25 + .type = QUIRK_AUDIO_EDIROL_UAXX }, { .ifnum = 3, - .type = QUIRK_AUDIO_EDIROL_UA700_UA25 + .type = QUIRK_AUDIO_EDIROL_UAXX }, { .ifnum = -1 @@ -1197,15 +1197,15 @@ YAMAHA_DEVICE(0x7010, "UB99"), .data = (const struct snd_usb_audio_quirk[]) { { .ifnum = 0, - .type = QUIRK_AUDIO_EDIROL_UA700_UA25 + .type = QUIRK_AUDIO_EDIROL_UAXX }, { .ifnum = 1, - .type = QUIRK_AUDIO_EDIROL_UA700_UA25 + .type = QUIRK_AUDIO_EDIROL_UAXX }, { .ifnum = 2, - .type = QUIRK_AUDIO_EDIROL_UA700_UA25 + .type = QUIRK_AUDIO_EDIROL_UAXX }, { .ifnum = -1 @@ -1338,6 +1338,36 @@ YAMAHA_DEVICE(0x7010, "UB99"), } } }, +{ + /* + * This quirk is for the "Advanced Driver" mode. If off, the UA-4FX + * is standard compliant, but has only 16-bit PCM and no MIDI. + */ + USB_DEVICE(0x0582, 0x00a3), + .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) { + .vendor_name = "EDIROL", + .product_name = "UA-4FX", + .ifnum = QUIRK_ANY_INTERFACE, + .type = QUIRK_COMPOSITE, + .data = (const struct snd_usb_audio_quirk[]) { + { + .ifnum = 0, + .type = QUIRK_AUDIO_EDIROL_UAXX + }, + { + .ifnum = 1, + .type = QUIRK_AUDIO_EDIROL_UAXX + }, + { + .ifnum = 2, + .type = QUIRK_AUDIO_EDIROL_UAXX + }, + { + .ifnum = -1 + } + } + } +}, /* TODO: add Edirol MD-P1 support */ { USB_DEVICE(0x582, 0x00a6), -- 1.5.2.4

3 2

Re: [alsa-devel] 2 Au1xxx (Alchemy) AC97 drivers
by Manuel Lauss 07 Oct '08

07 Oct '08

On Tue, Oct 07, 2008 at 08:28:26AM -0500, Kevin Hickey wrote: > There appear to be 2 AC97 drivers for Alchemy in the latest Linux tree. > One is in sound/mips and the other is in sound/soc. Are both going to > be maintained going forward? If not, which one will be? The one in sound/soc is for Au1200/Au1550; I think the sound/mips one only works on Au1000/Au1500. Manuel Lauss -- To unsubscribe from this list: send the line "unsubscribe alsa-devel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

2 1

[alsa-devel] [topic/asoc][PATCH 0/2] minor clean-ups and aic3x naming change
by Jarkko Nikula 07 Oct '08

07 Oct '08

These two patches are generated agains Takashi's topic/asoc branch. First one will remove unused AUDIO_NAME define from codec drivers. IMO it didn't look so readable to use this define so I end up removing it. Second one will use uniform naming like other tlv320aic drivers for tlv320aic3x. -- Jarkko

3 4

[alsa-devel] size of snd_hda_intel
by Jon Smirl 07 Oct '08

07 Oct '08

>ismod snd_hda_intel 435,772 435,772 bytes seems awfully large for an audio driver. The large size seems to be due to having support for multiple codecs in the driver. Could a generic hda driver load the correct codec dynamically instead of building them all in statically? I have a Realtek codec. -- Jon Smirl jonsmirl(a)gmail.com

5 8

[alsa-devel] Fwd: AIC23 SOC Driver on OSK5912
by Jesslyn Abdul Salam 07 Oct '08

07 Oct '08

---------- Forwarded message ---------- From: Jesslyn Abdul Salam <jesslyn.abdulsalam(a)gmail.com> Date: Tue, Oct 7, 2008 at 5:36 PM Subject: Re: [alsa-devel] AIC23 SOC Driver on OSK5912 To: Arun KS <arunks(a)mistralsolutions.com> Yes, it is there. but it shows as "tlv320aic23b" instead of "tlv320aic" Will that be the reason ???? On Tue, Oct 7, 2008 at 5:32 PM, Arun KS <arunks(a)mistralsolutions.com> wrote: > On Tue, Oct 7, 2008 at 5:24 PM, Mark Brown <broonie(a)sirena.org.uk> wrote: > > On Tue, Oct 07, 2008 at 05:18:55PM +0530, Jesslyn Abdul Salam wrote: > > > >> I have been trying to use the AIC23 ALSA SoC driver for OSK5912 for the > past > >> few days. I got the driver patch from the linux-omap/alsa-devel mailing > >> lists. The driver got compiled along just fine. But when the kernel > boots, > >> no sound cards have been listed. > > > > CCing in Arun KS <arunks(a)mistralsolutions.com> who contributed that > > support. > > > >> Advanced Linux Sound Architecture Driver Version 1.0.17. > > > >> ASoC version > >> 0.13.2 > >> AIC23 Audio Codec > >> 0.1 > >> MCLK = 12000000 [12000000], usecount = > >> 0 > >> ALSA device > >> list: > >> No soundcards > >> found. > > > >> Any one have tested this before ? > > Can you check i2c? > > # cat /sys/bus/i2c/devices/1-001b/name > tlv320aic23 > > > _______________________________________________ > > Alsa-devel mailing list > > Alsa-devel(a)alsa-project.org > > http://mailman.alsa-project.org/mailman/listinfo/alsa-devel > > >

2 2

[alsa-devel] AIC23 SOC Driver on OSK5912
by Jesslyn Abdul Salam 07 Oct '08

07 Oct '08

Hi all, I have been trying to use the AIC23 ALSA SoC driver for OSK5912 for the past few days. I got the driver patch from the linux-omap/alsa-devel mailing lists. The driver got compiled along just fine. But when the kernel boots, no sound cards have been listed. Advanced Linux Sound Architecture Driver Version 1.0.17. ASoC version 0.13.2 AIC23 Audio Codec 0.1 MCLK = 12000000 [12000000], usecount = 0 ALSA device list: No soundcards found. Any one have tested this before ? - Jesslyn Abdul Salam

3 2

[alsa-devel] [PATCH 2.6.27?] ASoC: Correct inverted Mic PGA Switch control in wm8510 driver
by Mark Brown 07 Oct '08

07 Oct '08

Mic PGA Switch should be inverted in the WM8510 driver but isn't. Reported-by: ext-jukka.hynninen(a)vaisala.com Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm8510.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sound/soc/codecs/wm8510.c b/sound/soc/codecs/wm8510.c index 75ed041..9a37c8d 100644 --- a/sound/soc/codecs/wm8510.c +++ b/sound/soc/codecs/wm8510.c @@ -199,7 +199,7 @@ SOC_DAPM_SINGLE("PCM Playback Switch", WM8510_MONOMIX, 0, 1, 0), }; static const struct snd_kcontrol_new wm8510_boost_controls[] = { -SOC_DAPM_SINGLE("Mic PGA Switch", WM8510_INPPGA, 6, 1, 0), +SOC_DAPM_SINGLE("Mic PGA Switch", WM8510_INPPGA, 6, 1, 1), SOC_DAPM_SINGLE("Aux Volume", WM8510_ADCBOOST, 0, 7, 0), SOC_DAPM_SINGLE("Mic Volume", WM8510_ADCBOOST, 4, 7, 0), }; -- 1.5.6.5

2 2

[alsa-devel] [PATCH] snd-core: enlarge snd_card.components for up to 4 codecs
by Wu Fengguang 07 Oct '08

07 Oct '08

Enlarge snd_card.components[80] to 128 bytes, with space for 4 codecs. The previous size 80 cannot support HP 2230s which has 3 codecs. Signed-off-by: Wu Fengguang <wfg(a)linux.intel.com> --- diff --git a/include/sound/asound.h b/include/sound/asound.h index ca2f358..b3801b0 100644 --- a/include/sound/asound.h +++ b/include/sound/asound.h @@ -708,7 +708,7 @@ struct snd_ctl_card_info { unsigned char longname[80]; /* name + info text about soundcard */ unsigned char reserved_[16]; /* reserved for future (was ID of mixer) */ unsigned char mixername[80]; /* visual mixer identification */ - unsigned char components[80]; /* card components / fine identification, delimited with one space (AC97 etc..) */ + unsigned char components[128]; /* card components / fine identification, delimited with one space (AC97 etc..) */ unsigned char reserved[48]; /* reserved for future */ }; diff --git a/include/sound/core.h b/include/sound/core.h index f52ab6f..dcbc424 100644 --- a/include/sound/core.h +++ b/include/sound/core.h @@ -116,7 +116,7 @@ struct snd_card { char shortname[32]; /* short name of this soundcard */ char longname[80]; /* name of this soundcard */ char mixername[80]; /* mixer name */ - char components[80]; /* card components delimited with + char components[128]; /* card components delimited with space */ struct module *module; /* top-level module */

3 7