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

[alsa-devel] [PATCHv2 4/6] OMAP4: MCPDM: Register McPDM platform device
by Candelaria Villareal, Jorge 23 Jan '10

23 Jan '10

Add platform device for McPDM interface in OMAP4 and register its memory and irq resources. Signed-off-by: Jorge Eduardo Candelaria <x0107209(a)ti.com> --- arch/arm/plat-omap/devices.c | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/arch/arm/plat-omap/devices.c b/arch/arm/plat-omap/devices.c index 30b5db7..572265c 100644 --- a/arch/arm/plat-omap/devices.c +++ b/arch/arm/plat-omap/devices.c @@ -28,6 +28,7 @@ #include <plat/menelaus.h> #include <plat/mcbsp.h> #include <plat/dsp_common.h> +#include <plat/omap44xx.h> #if defined(CONFIG_OMAP_DSP) || defined(CONFIG_OMAP_DSP_MODULE) @@ -192,6 +193,41 @@ void omap_mcbsp_register_board_cfg(struct omap_mcbsp_platform_data *config, /*-------------------------------------------------------------------------*/ +#if defined(CONFIG_SND_OMAP_SOC_MCPDM) || \ + defined(CONFIG_SND_OMAP_SOC_MCPDM_MODULE) + +static struct resource mcpdm_resources[] = { + { + .name = "mcpdm_mem", + .start = OMAP44XX_MCPDM_BASE, + .end = OMAP44XX_MCPDM_BASE + SZ_4K, + .flags = IORESOURCE_MEM, + }, + { + .name = "mcpdm_irq", + .start = INT_44XX_MCPDM_IRQ, + .end = INT_44XX_MCPDM_IRQ, + .flags = IORESOURCE_IRQ, + }, +}; + +static struct platform_device omap_mcpdm_device = { + .name = "omap-mcpdm", + .id = -1, + .num_resources = ARRAY_SIZE(mcpdm_resources), + .resource = mcpdm_resources, +}; + +static void omap_init_mcpdm(void) +{ + (void) platform_device_register(&omap_mcpdm_device); +} +#else +static inline void omap_init_mcpdm(void) {} +#endif + +/*-------------------------------------------------------------------------*/ + #if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE) || \ defined(CONFIG_MMC_OMAP_HS) || defined(CONFIG_MMC_OMAP_HS_MODULE) @@ -385,6 +421,7 @@ static int __init omap_init_devices(void) omap_init_dsp(); omap_init_kp(); omap_init_rng(); + omap_init_mcpdm(); omap_init_uwire(); omap_init_wdt(); return 0; -- 1.6.0.4

1 0

[alsa-devel] [PATCHv2 3/6] ARM: OMAP4: Add McPDM base address
by Candelaria Villareal, Jorge 23 Jan '10

23 Jan '10

Define McPDM physical and L3 base address for OMAP4 Signed-off-by: Jorge Eduardo Candelaria <x0107209(a)ti.com> --- arch/arm/plat-omap/include/plat/omap44xx.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/arch/arm/plat-omap/include/plat/omap44xx.h b/arch/arm/plat-omap/include/plat/omap44xx.h index 8e4c581..4c64f20 100644 --- a/arch/arm/plat-omap/include/plat/omap44xx.h +++ b/arch/arm/plat-omap/include/plat/omap44xx.h @@ -43,6 +43,8 @@ #define OMAP44XX_SCU_BASE 0x48240000 #define OMAP44XX_LOCAL_TWD_BASE 0x48240600 #define OMAP44XX_WKUPGEN_BASE 0x48281000 +#define OMAP44XX_MCPDM_BASE 0x40132000 +#define OMAP44XX_MCPDM_L3_BASE 0x49032000 #define OMAP44XX_MAILBOX_BASE (L4_44XX_BASE + 0xF4000) -- 1.6.0.4

1 0

[alsa-devel] [PATCHv2 2/6] OMAP4: IRQ: Add McPDM IRQ definition.
by Candelaria Villareal, Jorge 23 Jan '10

23 Jan '10

Support for McPDM IRQs in OMAP4 Signed-off-by: Jorge Eduardo Candelaria <x0107209(a)ti.com> --- arch/arm/plat-omap/include/plat/irqs.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/arm/plat-omap/include/plat/irqs.h b/arch/arm/plat-omap/include/plat/irqs.h index c0ab7c8..bbb8eb6 100644 --- a/arch/arm/plat-omap/include/plat/irqs.h +++ b/arch/arm/plat-omap/include/plat/irqs.h @@ -432,7 +432,7 @@ #define INT_44XX_PARTHASH_IRQ (79 + IRQ_GIC_START) #define INT_44XX_MMC3_IRQ (94 + IRQ_GIC_START) #define INT_44XX_MMC4_IRQ (96 + IRQ_GIC_START) - +#define INT_44XX_MCPDM_IRQ (112 + IRQ_GIC_START) /* Max. 128 level 2 IRQs (OMAP1610), 192 GPIOs (OMAP730/850) and * 16 MPUIO lines */ -- 1.6.0.4

1 0

[alsa-devel] Conexant 5051 subsystem 0x103c30d6
by Jacopo De Simoi 22 Jan '10

22 Jan '10

Dear all, this is a follow up to my previous posting to the ml about having CX 5051 working on my laptop; I found out that the patch provided in http://mailman.alsa-project.org/pipermail/alsa-devel/2010-January/024284.ht… fits perfectly my model as well. Hence I suggest to add a quirk matching my subsystem id as follows: SND_PCI_QUIRK(0x103c, 0x30d6, "HP DV2700", CXT5051_F700) Thanks __J

1 0

[alsa-devel] Reg: Audio recording with twl4030 codec
by shariff 22 Jan '10

22 Jan '10

Hi all, I am working with OMAP3 based custom board that has twl4030 codec & using linux-2.6.29 kernel from opensource. I have some queries regarding Audio recording. Audio codec is connected to twl4030 as bellow TWL4030 |--------------------| | |------ MAINMIC McBSP2 ------ |i2s/tdm | | ___________| --> One Analog MIC is connected to Main Mic and I am using Audio path not the Voice path. After selecting Main Mic through amixer control. and recording audio using "arecord -c 1 -r 8000 -f S16_LE -t wav -d 20 record-file.wav" --> Here record is successful but with lot of noise. 1) Can we record Mono(1 channel) through I2S from TWL4030 codec? 2) To record stereo(2 channels), do we need two Mic's ? (i.e do I need Sub Mic also). Regards, Shariff

2 1

Re: [alsa-devel] [PATCH 1/4] ASoC: add a WM8978 codec driver
by Guennadi Liakhovetski 22 Jan '10

22 Jan '10

On Tue, 19 Jan 2010, Mark Brown wrote: > On Tue, Jan 19, 2010 at 09:08:57AM +0100, Guennadi Liakhovetski wrote: > > This all looks pretty good - there's a few issues below but they're > largely stylistic rather than anything fundamental. > > > + 0x0000, 0x0000, 0x0000, 0x01ff, /* 0x08...0x0b */ /* 0x0b contains the VU bit */ > > + 0x01ff, 0x0000, 0x0100, 0x01ff, /* 0x0c...0x0f */ /* 0x0c and 0x0f contain the VU bit */ > > + 0x01ff, 0x0000, 0x012c, 0x002c, /* 0x10...0x13 */ /* 0x10 contains the VU bit */ > > What do these comments refer to - do you mean to say that these are not > the actual chip register defaults? The normal way to deal with those is > to have a write (or other update of the cache defaults). This avoids > potential confusion later on if the chip updates the register defaults > or when reviewing against the datasheet. No, I meant, that there's a "Value Update" bit in that register, usually bit 8. So, that bit, of course, is not in default, but it was suggested to me on IRC to set it in cache to force automatic value update. > > +#define ARRAY_SINGLE(xreg, xshift, xtexts) SOC_ENUM_SINGLE(xreg, xshift, \ > > + ARRAY_SIZE(xtexts), xtexts) > > This looks generic - please namespace it and add it to the header file, > other drivers can benefit from it. SOC_ARRAY_SINGLE()? > > +static const struct soc_enum wm8978_enum[] = { > > + /* adc */ > > + ARRAY_SINGLE(WM8978_COMPANDING_CONTROL, 1, wm8978_companding), > > Please define individual variables for this - indexing into the array > gets hard to follow, it's far too easy to have an off by one errors > trying to match things up. > > > +#define MIXER_ARRAY(n, r, s, i, m) SND_SOC_DAPM_MIXER(n, r, s, i, \ > > + m, ARRAY_SIZE(m)) > > > > +/* Mixer #3: Boost (Input) mixer */ > > +static const struct snd_kcontrol_new wm8978_left_boost_mixer[] = { > > +SOC_DAPM_SINGLE("Left PGA Mute", WM8978_LEFT_INP_PGA_CONTROL, 6, 1, 0), > > +}; > > +static const struct snd_kcontrol_new wm8978_right_boost_mixer[] = { > > +SOC_DAPM_SINGLE("Right PGA Mute", WM8978_RIGHT_INP_PGA_CONTROL, 6, 1, 0), > > +}; > > These should have "Switch" at the end of the name. Also, the names are > going be concatenated with the mixer names so you'll end up with things > "Left Boost Mixer Left PGA Switch" - the individual controls should > probably be just "Switch" so you end up with "Left Boost Mixer Switch". > > > +/* Mic Input boost vol */ > > +static const struct snd_kcontrol_new wm8978_mic_boost_controls[] = { > > +SOC_DAPM_SINGLE("Left Mic Volume", WM8978_LEFT_ADC_BOOST_CONTROL, 4, 7, 0), > > +SOC_DAPM_SINGLE("Right Mic Volume", WM8978_RIGHT_ADC_BOOST_CONTROL, 4, 7, 0), > > +}; > > This doesn't seem to be referenced anywhere? > > > +#define MIXER_ARRAY(n, r, s, i, m) SND_SOC_DAPM_MIXER(n, r, s, i, \ > > + m, ARRAY_SIZE(m)) > > Again, this should be done somewhere generic. Probably by going through > and changing the SND_SOC_DAPM_MIXER definition. Well, having discussed this privately and having looked at the heades, I'm not sure, this is a good idea. First, there are SND_SOC_DAPM_PGA() SND_SOC_DAPM_MIXER() SND_SOC_DAPM_MIXER_NAMED_CTL() SND_SOC_DAPM_PGA_E() SND_SOC_DAPM_MIXER_E() SND_SOC_DAPM_MIXER_NAMED_CTL_E() - 6 macros that follow the pattern .kcontrols = wcontrols, .num_kcontrols = wncontrols, and lots of macros like SOC_ENUM_DOUBLE() SOC_ENUM_SINGLE() SOC_ENUM_SINGLE_EXT() ... doing .max = xmax. BTW, many of the users even open-code array sizes instead of using ARRAY_SIZE() like static const char *jack_function[] = {"Headphone", "Mic", "Line", "Headset", "Off"}; static const char *spk_function[] = {"On", "Off"}; static const struct soc_enum tosa_enum[] = { SOC_ENUM_SINGLE_EXT(5, jack_function), SOC_ENUM_SINGLE_EXT(2, spk_function), }; Changing only one of them would make the headers and the API look inconsistent. Changing all of them... I really don't think we want to endeavor this now, at least not me;) Besides, doing this locally is very convenient, and is available to everyone - there's no space science involved with this. One can be even as evil as doing +#define _A(n, r, s, i, m) SND_SOC_DAPM_MIXER(n, r, s, i, \ + m, ARRAY_SIZE(m)) ... +#undef _A +#define _A(xreg, xshift, xtexts) SOC_ENUM_SINGLE(xreg, xshift, \ + ARRAY_SIZE(xtexts), xtexts) ... +#undef _A I think, it's best to leave these things as they are. Otherwise we can give this to kernel janitors as a small exercise;) > > + /* Output PLL to GPIO1 */ > > + snd_soc_write(codec, WM8978_GPIO_CONTROL, > > + snd_soc_read(codec, WM8978_GPIO_CONTROL) | 0x4); > > This should be being done unconditionally. Put a switch in via the > set_dai_clkdiv() call. Ok, I moved it to wm8978_set_dai_clkdiv() under "case WM8978_OPCLKDIV:" > > + /* Mic bias */ > > + snd_soc_write(codec, WM8978_POWER_MANAGEMENT_1, > > + (snd_soc_read(codec, 1) & ~4) | 0x10); > > + > > + /* Out-1 enabled, left/right input channel enabled */ > > + snd_soc_write(codec, WM8978_POWER_MANAGEMENT_2, 0x1bf); > > + > > + /* Out-2 disabled, right/left output channel enabled, dac enabled */ > > + snd_soc_write(codec, WM8978_POWER_MANAGEMENT_3, 0x10f); > > These should all be being managed via DAPM. Yes, I'm having quite a bit of trouble with DAPM, but I'm getting through slowly. Will need some more time for a next version. > > > +static int wm8978_set_bias_level(struct snd_soc_codec *codec, > > + enum snd_soc_bias_level level) > > +{ > > + u16 power1 = snd_soc_read(codec, WM8978_POWER_MANAGEMENT_1) & ~3; > > This bitmask maintains everything except the two LSB... > > > + switch (level) { > > + case SND_SOC_BIAS_ON: > > + case SND_SOC_BIAS_PREPARE: > > + power1 |= 1; /* VMID 75k */ > > + snd_soc_write(codec, WM8978_POWER_MANAGEMENT_1, power1); > > + break; > > + case SND_SOC_BIAS_STANDBY: > > + power1 |= 0xC; > > ...but this is also managing other bits. Right, bits 7-6 are either kept or set, nothing wrong with that. > > + if (codec->bias_level == SND_SOC_BIAS_OFF) { > > + /* Initial cap charge at VMID 5k */ > > + snd_soc_write(codec, WM8978_POWER_MANAGEMENT_1, > > + power1 | 0x3); > > + mdelay(100); > > + } > > > +/* Also supports 12kHz */ > > +#define WM8978_RATES (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_11025 | \ > > + SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_32000 | \ > > + SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000) > > SNDRV_PCM_RATE_8000_48000 > > > +static int wm8978_suspend(struct platform_device *pdev, pm_message_t state) > > +{ > > + struct snd_soc_device *socdev = platform_get_drvdata(pdev); > > + struct snd_soc_codec *codec = socdev->card->codec; > > + > > + /* we only need to suspend if we are a valid card */ > > + if (!codec->card) > > + return 0; > > Don't need to check for the card any more, the core will stop you > getting called without a card. > > > + /* Sync reg_cache with the hardware */ > > + for (i = 0; i < ARRAY_SIZE(wm8978_reg); i++) { > > + if (i == WM8978_RESET) > > + continue; > > You can also skip the write if the register has the default value (this > will speed up resume slightly). > > > + data = cpu_to_be16((i << 9) | (cache[i] & 0x1ff)); > > + codec->hw_write(codec->control_data, (char *)&data, 2); > > + } > > Just use snd_soc_write()? I'll take care about the rest. Thanks Guennadi --- Guennadi Liakhovetski, Ph.D. Freelance Open-Source Software Developer http://www.open-technology.de/

2 3

[alsa-devel] [PATCH - hda 1/1] ALSA: hda - Add PCI quirk for 17" MacBook Pro 5, 2 model (July 2009) to use existing mb5 model
by murray.alex＠gmail.com 22 Jan '10

22 Jan '10

From: Alex Murray <murray.alex(a)gmail.com> Signed-off-by: Alex Murray <murray.alex(a)gmail.com> --- pci/hda/patch_realtek.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/pci/hda/patch_realtek.c b/pci/hda/patch_realtek.c index 7e0ea37..d044db9 100644 --- a/pci/hda/patch_realtek.c +++ b/pci/hda/patch_realtek.c @@ -9223,6 +9223,7 @@ static struct snd_pci_quirk alc882_ssid_cfg_tbl[] = { */ SND_PCI_QUIRK(0x106b, 0x4000, "MacbookPro 5,1", ALC885_MB5), SND_PCI_QUIRK(0x106b, 0x4600, "MacbookPro 5,2", ALC885_MB5), + SND_PCI_QUIRK(0x10ec, 0x0885, "MacbookPro 5,2", ALC885_MB5), {} /* terminator */ }; -- 1.6.3.3

3 3

[alsa-devel] Update information: HD-Audio-models list
by Mark Brown 22 Jan '10

22 Jan '10

Sir/Madam, I have an update for the HD-Audio-Models.txt file. Under ALC262, the toshiba-s06 model setting is applicable to the Sony Vaio VGN-CS60B laptop, and may also be applicable to similar models. It also needs configuring in alsamixer to enable the internal microphone afterwards. Best regards, Mark Brown.

2 1

Re: [alsa-devel] Reforming s3c2443 ac97 driver
by SeungHyun Choi 22 Jan '10

22 Jan '10

3 2

[alsa-devel] [PATCH] ASoC: add helper macros to declare struct soc_enum instances
by Guennadi Liakhovetski 21 Jan '10

21 Jan '10

Several shortcuts for popular uses of some of SOC_ENUM_* and SOC_VALUE_ENUM_* macros. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski(a)gmx.de> --- diff --git a/include/sound/soc.h b/include/sound/soc.h index 08909cc..9537144 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -169,6 +169,23 @@ .private_value = (unsigned long)&xenum } /* + * Simplified versions of above macros, declaring a struct and calculating + * ARRAY_SIZE internally + */ +#define SOC_ENUM_DOUBLE_DECL(name, xreg, xshift_l, xshift_r, xtexts) \ + struct soc_enum name = SOC_ENUM_DOUBLE(xreg, xshift_l, xshift_r, \ + ARRAY_SIZE(xtexts), xtexts) +#define SOC_ENUM_SINGLE_DECL(name, xreg, xshift, xtexts) \ + SOC_ENUM_DOUBLE_DECL(name, xreg, xshift, xshift, xtexts) +#define SOC_ENUM_SINGLE_EXT_DECL(name, xtexts) \ + struct soc_enum name = SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(xtexts), xtexts) +#define SOC_VALUE_ENUM_DOUBLE_DECL(name, xreg, xshift_l, xshift_r, xmask, xtexts, xvalues) \ + struct soc_enum name = SOC_VALUE_ENUM_DOUBLE(xreg, xshift_l, xshift_r, xmask, \ + ARRAY_SIZE(xtexts), xtexts, xvalues) +#define SOC_VALUE_ENUM_SINGLE_DECL(name, xreg, xshift, xmask, xtexts, xvalues) \ + SOC_VALUE_ENUM_DOUBLE_DECL(name, xreg, xshift, xshift, xmask, xtexts, xvalues) + +/* * Bias levels * * @ON: Bias is fully on for audio playback and capture operations.

1 0