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

[alsa-devel] [PATCH] hda: STAC_HP_M4
by Matthew Ranostay 09 Oct '08

09 Oct '08

Set the third microphone to a default config of a 'Line In' to be added the Input Source Mux's. Signed-off-by: Matthew Ranostay <mranostay(a)embeddedalley.com> --- diff --git a/pci/hda/patch_sigmatel.c b/pci/hda/patch_sigmatel.c index b5c1449..5557116 100644 --- a/pci/hda/patch_sigmatel.c +++ b/pci/hda/patch_sigmatel.c @@ -3605,7 +3605,12 @@ static int stac92xx_init(struct hda_codec *codec) for (i = 0; i < AUTO_PIN_LAST; i++) { hda_nid_t nid = cfg->input_pins[i]; if (nid) { - unsigned int pinctl = AC_PINCTL_IN_EN; + unsigned int pinctl = snd_hda_codec_read(codec, nid, + 0, AC_VERB_GET_PIN_WIDGET_CONTROL, 0); + /* if PINCTL already set then skip */ + if (pinctl & AC_PINCAP_IN) + continue; + pinctl = AC_PINCTL_IN_EN; if (i == AUTO_PIN_MIC || i == AUTO_PIN_FRONT_MIC) pinctl |= stac92xx_get_vref(codec, nid); stac92xx_auto_set_pinctl(codec, nid, pinctl); @@ -4375,12 +4380,13 @@ again: switch (spec->board_config) { case STAC_HP_M4: spec->num_dmics = 0; - spec->num_smuxes = 1; + spec->num_smuxes = 0; spec->num_dmuxes = 0; /* enable internal microphone */ - snd_hda_codec_write_cache(codec, 0x0e, 0, - AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80); + stac92xx_set_config_reg(codec, 0x0e, 0x01813040); + stac92xx_auto_set_pinctl(codec, 0x0e, + AC_PINCTL_IN_EN | AC_PINCTL_VREF_80); break; default: spec->num_dmics = STAC92HD71BXX_NUM_DMICS;

2 1

[PATCH] ARM: OMAP: Hack add some OMAP3 McBSP muxing
by Jarkko Nikula 09 Oct '08

09 Oct '08

Signed-off-by: Jarkko Nikula <jarkko.nikula(a)nokia.com> --- arch/arm/mach-omap2/mux.c | 52 +++++++++++++++++++++++++++++++++ arch/arm/plat-omap/include/mach/mux.h | 29 ++++++++++++++++++ 2 files changed, 81 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-omap2/mux.c b/arch/arm/mach-omap2/mux.c index dacb41f..1dff09e 100644 --- a/arch/arm/mach-omap2/mux.c +++ b/arch/arm/mach-omap2/mux.c @@ -261,6 +261,58 @@ static struct pin_config __initdata_or_module omap34xx_pins[] = { * mux-mode | [active-mode | off-mode] */ +/* Primary McBSP multiplexing */ +MUX_CFG_34XX("Y21_3430_MCBSP1_CLKR", 0x18c, + OMAP34XX_MUX_MODE0) +MUX_CFG_34XX("AA21_3430_MCBSP1_FSR", 0x18e, + OMAP34XX_MUX_MODE0) +MUX_CFG_34XX("Y21_3430_MCBSP1_DX", 0x190, + OMAP34XX_MUX_MODE0) +MUX_CFG_34XX("U21_3430_MCBSP1_DR", 0x192, + OMAP34XX_MUX_MODE0) +MUX_CFG_34XX("T21_3430_MCBSP1_CLKS", 0x194, + OMAP34XX_MUX_MODE0) +MUX_CFG_34XX("K26_3430_MCBSP1_FSX", 0x196, + OMAP34XX_MUX_MODE0) +MUX_CFG_34XX("W21_3430_MCBSP1_CLKX", 0x198, + OMAP34XX_MUX_MODE0) + +MUX_CFG_34XX("P21_3430_MCBSP2_FSX", 0x13c, + OMAP34XX_MUX_MODE0) +MUX_CFG_34XX("N21_3430_MCBSP2_CLKX", 0x13e, + OMAP34XX_MUX_MODE0) +MUX_CFG_34XX("R21_3430_MCBSP2_DR", 0x140, + OMAP34XX_MUX_MODE0) +MUX_CFG_34XX("M21_3430_MCBSP2_DX", 0x142, + OMAP34XX_MUX_MODE0) + +MUX_CFG_34XX("AF6_3430_MCBSP3_DX", 0x16c, + OMAP34XX_MUX_MODE0) +MUX_CFG_34XX("AE6_3430_MCBSP3_DR", 0x16e, + OMAP34XX_MUX_MODE0) +MUX_CFG_34XX("AF5_3430_MCBSP3_CLKX", 0x170, + OMAP34XX_MUX_MODE0) +MUX_CFG_34XX("AE5_3430_MCBSP3_FSX", 0x172, + OMAP34XX_MUX_MODE0) + +MUX_CFG_34XX("AE1_3430_MCBSP4_CLKX", 0x184, + OMAP34XX_MUX_MODE0) +MUX_CFG_34XX("AD1_3430_MCBSP4_DR", 0x186, + OMAP34XX_MUX_MODE0) +MUX_CFG_34XX("AD2_3430_MCBSP4_DX", 0x188, + OMAP34XX_MUX_MODE0) +MUX_CFG_34XX("AC1_3430_MCBSP4_FSX", 0x18a, + OMAP34XX_MUX_MODE0) + +MUX_CFG_34XX("AF10_3430_MCBSP5_CLKX", 0x5d8, + OMAP34XX_MUX_MODE1) +MUX_CFG_34XX("AE11_3430_MCBSP5_DR", 0x5e4, + OMAP34XX_MUX_MODE1) +MUX_CFG_34XX("AH9_3430_MCBSP5_FSX", 0x5e6, + OMAP34XX_MUX_MODE1) +MUX_CFG_34XX("AF13_3430_MCBSP5_DX", 0x5e8, + OMAP34XX_MUX_MODE1) + /* 34xx I2C */ MUX_CFG_34XX("K21_34XX_I2C1_SCL", 0x1ba, OMAP34XX_MUX_MODE0 | OMAP34XX_PIN_INPUT_PULLUP) diff --git a/arch/arm/plat-omap/include/mach/mux.h b/arch/arm/plat-omap/include/mach/mux.h index f4362b8..c0cfa73 100644 --- a/arch/arm/plat-omap/include/mach/mux.h +++ b/arch/arm/plat-omap/include/mach/mux.h @@ -677,6 +677,35 @@ enum omap24xx_index { }; enum omap34xx_index { + /* Primary McBSP multiplexing */ + Y21_3430_MCBSP1_CLKR, + AA21_3430_MCBSP1_FSR, + Y21_3430_MCBSP1_DX, + U21_3430_MCBSP1_DR, + T21_3430_MCBSP1_CLKS, + K26_3430_MCBSP1_FSX, + W21_3430_MCBSP1_CLKX, + + P21_3430_MCBSP2_FSX, + N21_3430_MCBSP2_CLKX, + R21_3430_MCBSP2_DR, + M21_3430_MCBSP2_DX, + + AF6_3430_MCBSP3_DX, + AE6_3430_MCBSP3_DR, + AF5_3430_MCBSP3_CLKX, + AE5_3430_MCBSP3_FSX, + + AE1_3430_MCBSP4_CLKX, + AD1_3430_MCBSP4_DR, + AD2_3430_MCBSP4_DX, + AC1_3430_MCBSP4_FSX, + + AF10_3430_MCBSP5_CLKX, + AE11_3430_MCBSP5_DR, + AH9_3430_MCBSP5_FSX, + AF13_3430_MCBSP5_DX, + /* 34xx I2C */ K21_34XX_I2C1_SCL, J21_34XX_I2C1_SDA, -- 1.5.6.5 --Multipart=_Thu__2_Apr_2009_19_56_53_+0300_OCGZiXCSMdXq4.P8--

1 0

[alsa-devel] programming AC'97
by joan vicient 09 Oct '08

09 Oct '08

Hi, I'm an electronic engineering student and I'm having some troubles with my project wich I have to develop to become an engineer. The project itself is based on my laptop (ICH6 with the AC97 soundcard). I'm trying to develop a sound generator with the AC97. I've been working hard but there is something wrong and I'm not sure what is it. I think is the "Buffer Descriptor List Base Addres" or maybe the codec initialization, not sure... I am looking at the "AC'97 program model" and alsa-driver to understand how does the driver configure the soundcard so I can do the same but I don't understand the source code at all... So... somebody out there with some skills can help me? Thank you very much!!

1 0

[alsa-devel] [PATCH 0/9] ASoC Blackfin supporting
by Bryan Wu 09 Oct '08

09 Oct '08

Hi Mark, After your last review, Cliff and me updated this patch series: - fix coding style issue - use latest ASoC API - split the whole patch into this 9 patches in a patchset Thanks a lot -Bryan

6 24

Re: [alsa-devel] Will there ever be emu20k1/x-fi support in Alsa?
by The Source 09 Oct '08

09 Oct '08

So, should anyone start to port OSS driver or should we wait for specs?

1 0

[alsa-devel] dv6627el & audio problems
by yelo_3 09 Oct '08

09 Oct '08

Hello, I want to share my problems with you. I'm running ubuntu intrepid, with these packages versions: linux 2.6.27-6-generic alsa 1.0.17.dfsg-2ubuntu1 I have an hp dv6627el with this audio card model: 00:1b.0 Audio device: Intel Corporation 82801H (ICH8 Family) HD Audio Controller (rev 03) and this is my alsa page: http://www.alsa-project.org/db/?f=457f3992bcf0b34b51772a730071ce18deea75b2 I don't use any additional module option other that the one I will specify. I have 2 problems: 1) mute led does not work. if I use the option power_save (for isntance=3) the mute led lights up (red) after 3 seconds of audio inactivity (and after having closed the audio software), even if the volume is not muted. If I keep the audio software open, the led remains "off" (blue). if instead I don't use the option power_save (so power_save=0) the led never lights up. 2) when using headphones, the speakers are normally muted, but if I hit the mute button twice (or use the volume control applet to mute and unmute), the speakers are activated. Thank you very much for you help. Nicolò

1 0

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

08 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> Mark, I didn't base it on dapm's pop_time directory because that hasn't made it to my testing kernel yet. I cannot test directly from the alsa git tree. Thanks for the feedback. diff --git a/include/sound/soc.h b/include/sound/soc.h index a1e0357..f616b0e 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -516,6 +516,9 @@ struct snd_soc_device { struct delayed_work delayed_work; struct work_struct deferred_resume_work; void *codec_data; +#ifdef CONFIG_DEBUG_FS + struct dentry *debugfs_root; +#endif }; /* runtime channel data */ diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index ad38113..156d11a 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,112 @@ 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_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 ret; + struct snd_soc_device *devdata = file->private_data; + char *buf = kmalloc(PAGE_SIZE, GFP_KERNEL); + if (!buf) + return -ENOMEM; + ret = soc_codec_reg_show(devdata, buf); + if (ret >= 0) + ret = simple_read_from_buffer(user_buf, count, ppos, buf, ret); + kfree(buf); + return ret; +} + +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_codec_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; + return; +exit2: + debugfs_remove(root); +exit1: + dev_err(socdev->dev, "debugfs is not available\n"); +} + +static void soc_cleanup_codec_debugfs(struct snd_soc_device *socdev) +{ + debugfs_remove_recursive(socdev->debugfs_root); + socdev->debugfs_root = NULL; +} + +#else + +static inline void soc_init_codec_debugfs(struct snd_soc_device *socdev) +{ +} + +static inline void soc_cleanup_codec_debugfs(struct snd_soc_device *socdev) +{ +} +#endif + /** * snd_soc_new_ac97_codec - initailise AC97 device * @codec: audio codec @@ -1217,6 +1319,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_codec_debugfs(socdev); mutex_unlock(&codec->mutex); out: @@ -1240,6 +1343,7 @@ void snd_soc_free_pcms(struct snd_soc_device *socdev) #endif mutex_lock(&codec->mutex); + soc_cleanup_codec_debugfs(socdev); #ifdef CONFIG_SND_SOC_AC97_BUS for (i = 0; i < codec->num_dai; i++) { codec_dai = &codec->dai[i]; -- 1.5.4.3

2 1

[alsa-devel] [PATCH] ASoC: Check for machine type in GTA01 machine driver
by Mark Brown 08 Oct '08

08 Oct '08

Since there are now multiple OpenMoko platforms it is more important to check that the machine driver is running on the correct system. This was orgininally generated as part of the initial GTA02 machine port. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/s3c24xx/neo1973_wm8753.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/sound/soc/s3c24xx/neo1973_wm8753.c b/sound/soc/s3c24xx/neo1973_wm8753.c index c602674..87ddfef 100644 --- a/sound/soc/s3c24xx/neo1973_wm8753.c +++ b/sound/soc/s3c24xx/neo1973_wm8753.c @@ -24,6 +24,7 @@ #include <sound/soc-dapm.h> #include <sound/tlv.h> +#include <asm/mach-types.h> #include <asm/hardware/scoop.h> #include <mach/regs-clock.h> #include <mach/regs-gpio.h> @@ -677,6 +678,12 @@ static int __init neo1973_init(void) DBG("Entered %s\n", __func__); + if (!machine_is_neo1973_gta01()) { + printk(KERN_INFO + "Only GTA01 hardware supported by ASoC driver\n"); + return -ENODEV; + } + neo1973_snd_device = platform_device_alloc("soc-audio", -1); if (!neo1973_snd_device) return -ENOMEM; -- 1.5.6.5

2 1

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

08 Oct '08

Not yet. Would please share what you have done to make it work ? Also when I tried to strace aplay , it keeps looking for a </share/alsa/cards/tlv320aic23.conf> file which is not there in the alsa-lib package. Any idea what goes in that file ? Regards Jesslyn On Tue, Oct 7, 2008 at 7:16 PM, Arun KS <arunks(a)mistralsolutions.com> wrote: > Jesslyn Abdul Salam wrote: > >> I got it working. I2C_BOARD_INFO macro was wrongly intialized. Instead of >> tlv320aic23 i had written tlvaic23. Thanks to Arun for pointing this error >> >> > Can you hear audio playing? > Because i had done some hack to make it working in 5912osk. > I want to know you are not facing it or not. > > Arun > > Jesslyn Abdul Salam >> >> >> On Tue, Oct 7, 2008 at 5:36 PM, Jesslyn Abdul Salam < >> jesslyn.abdulsalam(a)gmail.com> wrote: >> >> >> >>> ---------- 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 >>>>> >>>>> >>>>> >>>> >>> >>> >> _______________________________________________ >> Alsa-devel mailing list >> Alsa-devel(a)alsa-project.org >> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel >> >> >> >> > > > Please do not print this email unless it is absolutely necessary. Spread > environmental awareness. > > > -------------------------------------------------------DISCLAIMER------------------------------------------------------ > The information transmitted herewith is confidential and proprietary > information intended only for use by the individual or entity to which it is > addressed. If the reader of this message is not the intended recipient, you > are hereby notified that any review, retransmission, dissemination, > distribution, copying or other use of, or taking of any action in reliance > upon this information is strictly prohibited. If you have received this > communication in error, please contact the sender and delete the material > from your computer. > > -------------------------------------------------------------------------------------------------------------------------------- > > > >

3 3

[alsa-devel] [PATCH 0/8] ASoC updates
by Mark Brown 08 Oct '08

08 Oct '08

The following changes since commit 691ac84a77b1aebb7e09b4924b4b9c07a0f4f66a: Takashi Iwai (1): Merge branch 'asoc-fixes' into topic/asoc are available in the git repository at: git://opensource.wolfsonmicro.com/linux-2.6-asoc for-tiwai This is all 2.6.28ish material. Arun KS (1): ASoC: Add custom SOC_SINGLE_TLV for tlv320aic23 codec Jarkko Nikula (2): ASoC: tlv320aic3x: Use uniform tlv320aic naming ASoC: Remove unused AUDIO_NAME define from codec drivers Mark Brown (4): ASoC: Add WM8753 SPI support ASoC: Add WM8510 SPI support ASoC: Implement WM8510 bias level control ASoC: Make WM8510 microphone input a DAPM mixer Richard Zhao (1): ALSA: ASoC: add new param mux to dapm_mux_update_power sound/soc/codecs/ak4535.c | 1 - sound/soc/codecs/ssm2602.c | 1 - sound/soc/codecs/tlv320aic23.c | 54 ++++++++++++++++++-- sound/soc/codecs/tlv320aic3x.c | 5 +- sound/soc/codecs/uda1380.c | 1 - sound/soc/codecs/wm8510.c | 109 ++++++++++++++++++++++++++++++++++----- sound/soc/codecs/wm8510.h | 1 + sound/soc/codecs/wm8580.c | 1 - sound/soc/codecs/wm8731.c | 1 - sound/soc/codecs/wm8750.c | 1 - sound/soc/codecs/wm8753.c | 72 +++++++++++++++++++++++++- sound/soc/codecs/wm8753.h | 1 + sound/soc/codecs/wm8971.c | 1 - sound/soc/codecs/wm8990.c | 1 - sound/soc/soc-dapm.c | 8 ++-- 15 files changed, 221 insertions(+), 37 deletions(-)

2 9