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

[alsa-devel] [PATCH] ASoC: wm2200: Provide platform data for MICBIAS configuration
by Chris Rattray 04 Feb '13

04 Feb '13

Signed-off-by: Chris Rattray <crattray(a)opensource.wolfsonmicro.com> --- include/sound/wm2200.h | 22 +++++++++++++++++++++- sound/soc/codecs/wm2200.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 1 deletions(-) diff --git a/include/sound/wm2200.h b/include/sound/wm2200.h index 79bf55b..26ea6ae 100644 --- a/include/sound/wm2200.h +++ b/include/sound/wm2200.h @@ -12,6 +12,7 @@ #define __LINUX_SND_WM2200_H #define WM2200_GPIO_SET 0x10000 +#define WM2200_MAX_MICBIAS 2 enum wm2200_in_mode { WM2200_IN_SE = 0, @@ -25,6 +26,24 @@ enum wm2200_dmic_sup { WM2200_DMIC_SUP_MICBIAS2 = 2, }; +enum wm2200_mbias_lvl { + WM2200_MBIAS_LVL_1V5 = 0, + WM2200_MBIAS_LVL_1V8 = 1, + WM2200_MBIAS_LVL_1V9 = 2, + WM2200_MBIAS_LVL_2V0 = 3, + WM2200_MBIAS_LVL_2V2 = 4, + WM2200_MBIAS_LVL_2V4 = 5, + WM2200_MBIAS_LVL_2V5 = 6, + WM2200_MBIAS_LVL_2V6 = 7, +}; + +struct wm2200_micbias { + enum wm2200_mbias_lvl mb_lvl; /** Regulated voltage */ + unsigned int discharge:1; /** Actively discharge */ + unsigned int fast_start:1; /** Enable aggressive startup ramp rate */ + unsigned int bypass:1; /** Use bypass mode */ +}; + struct wm2200_pdata { int reset; /** GPIO controlling /RESET, if any */ int ldo_ena; /** GPIO controlling LODENA, if any */ @@ -35,7 +54,8 @@ struct wm2200_pdata { enum wm2200_in_mode in_mode[3]; enum wm2200_dmic_sup dmic_sup[3]; - int micbias_cfg[2]; /** Register value to configure MICBIAS */ + /** MICBIAS configurations */ + struct wm2200_micbias micbias[WM2200_MAX_MICBIAS]; }; #endif diff --git a/sound/soc/codecs/wm2200.c b/sound/soc/codecs/wm2200.c index bdd3d80..e458252 100644 --- a/sound/soc/codecs/wm2200.c +++ b/sound/soc/codecs/wm2200.c @@ -2192,6 +2192,7 @@ static int wm2200_i2c_probe(struct i2c_client *i2c, struct wm2200_priv *wm2200; unsigned int reg; int ret, i; + int val; wm2200 = devm_kzalloc(&i2c->dev, sizeof(struct wm2200_priv), GFP_KERNEL); @@ -2342,6 +2343,36 @@ static int wm2200_i2c_probe(struct i2c_client *i2c, regmap_write(wm2200->regmap, WM2200_AUDIO_IF_1_16 + i, i); } + for (i = 0; i < WM2200_MAX_MICBIAS; i++) { + if (!wm2200->pdata.micbias[i].mb_lvl && + !wm2200->pdata.micbias[i].bypass) + continue; + + /* Apply default for bypass mode */ + if (!wm2200->pdata.micbias[i].mb_lvl) + wm2200->pdata.micbias[i].mb_lvl + = WM2200_MBIAS_LVL_1V5; + + val = wm2200->pdata.micbias[i].mb_lvl + << WM2200_MICB1_LVL_SHIFT; + + if (wm2200->pdata.micbias[i].discharge) + val |= WM2200_MICB1_DISCH; + + if (wm2200->pdata.micbias[i].fast_start) + val |= WM2200_MICB1_RATE; + + if (wm2200->pdata.micbias[i].bypass) + val |= WM2200_MICB1_MODE; + + regmap_update_bits(wm2200->regmap, + WM2200_MIC_BIAS_CTRL_1 + i, + WM2200_MICB1_LVL_MASK | + WM2200_MICB1_DISCH | + WM2200_MICB1_MODE | + WM2200_MICB1_RATE, val); + } + for (i = 0; i < ARRAY_SIZE(wm2200->pdata.in_mode); i++) { regmap_update_bits(wm2200->regmap, wm2200_mic_ctrl_reg[i], WM2200_IN1_MODE_MASK | -- 1.7.2.5

2 1

[alsa-devel] CA0132 DSP loader code merged to for-next branch
by Takashi Iwai 04 Feb '13

04 Feb '13

Hi Ian, FYI, right now I merged the pending CA0132 DSP stuff into for-next branch, targeted for 3.9 kernel. I changed the Kconfig to CONFIG_SND_HDA_CODEC_CA0132_DSP and leave it as default NO, in order to be compatible with the older kernels. Let's see whether the things go well with it. thanks, Takashi

1 0

[alsa-devel] [RESEND PATCH v3 0/5] ARM: OMAP4+: HDMI: Update platform devices for audio
by Ricardo Neri 04 Feb '13

04 Feb '13

Hi Mark, Tomi, Liam, Tony, I am resending this series as Mark and possibly other people missed it. This set aims to be the version 3 of my previous submission[1] and aims to address the comments that Mark and Tomi kindly provided on such submission. The creation of the platform device for the HDMI audio interface from within the OMAPDSS HDMI driver that was previously submitted[2] is resubmitted to be complemented with code to relocate to arch/arm/mach-omap2/display.c the creation of the platform devices for the HDMI ASoC codec and card drivers. This series does not break the HDMI audio functionality in any patch. Also, the names of the platform devices are changed to give them more logical and more descriptive names. As the commit commit 14840b9a83c6a56629db2ba0ec247503e975f143 Author: Ricardo Neri <ricardo.neri(a)ti.com> Date: Tue Nov 6 00:19:17 2012 -0600 OMAPDSS: HDMI: Create platform device for audio support is reverted in Tomi's git://gitorious.org/linux-omap-dss2/linux.git master branch, this series applies cleanly. Changes from v1: *Put in a single series all the patches related to platform device updates. *Now HDMI audio works correctly in every patch. *Remove reference to the TPD12S015 HDMI companion chip as the ASoC drivers are not aware of this and other chips could be used in the future. Changes from v2: *Split in two patches the renaming and the relocation of the platform devices. *Create a separate patch to pass only the address offset of the DMA data port to the audio interface platform device. *Keep the name hdmi-audio-codec to not refer to explicitly to OMAP. The codec can be made generic in a different patch series submitted to alsa-devel. BR, Ricardo [1]. http://www.mail-archive.com/linux-omap@vger.kernel.org/msg80785.html [2]. http://www.mail-archive.com/linux-omap@vger.kernel.org/msg79795.html Ricardo Neri (5): ARM: OMAP4+: HDMI: Rename platform devices for ASoC drivers ARM: OMAP4: Assign IDs to DSS HDMI devices ARM4: OMAP4+: HDMI: Relocate devices for audio codec and card ARM: OMAP4+: HDMI: Relocate the device for audio interface ARM: OMAP4+: HDMI: Refine the DMA port resource for audio arch/arm/mach-omap2/board-4430sdp.c | 9 ++--- arch/arm/mach-omap2/board-omap4panda.c | 9 ++--- arch/arm/mach-omap2/devices.c | 31 ---------------- arch/arm/mach-omap2/display.c | 31 ++++++++++++++++ drivers/video/omap2/dss/hdmi.c | 62 ++++++++++++++++++++++++++++++++ sound/soc/omap/omap-hdmi-card.c | 4 +-- sound/soc/omap/omap-hdmi.c | 5 ++- sound/soc/omap/omap-hdmi.h | 2 -- 8 files changed, 103 insertions(+), 50 deletions(-) -- 1.7.10.4

5 19

[alsa-devel] alsa usb-audio sound corruption caused by cached vmalloc mapping
by Matthieu CASTET 04 Feb '13

04 Feb '13

Hi, on a armv5 soc, we have audio corruption while using a usb-audio sound card. After analysis, it comes from alsa vmalloc mapping. in the current kernel vmalloc mapping used by alsa are cached. This cause coherency problem on armv5 architecture because the cache are VIVT : - alsa kernel driver map a buffer with vmalloc. The memory attribute is cached - userspace map vmalloc buffer. The memory attribute is cached But because the cache are VIVT, these two mapping don't share the same cache line and won't see the same data. This corruption can be hidden by context switch because cache are flushed on context switch. On x86 or armv7, the cache are PIPT and there is no such problem. There was a commit "pcm - Call pgprot_noncached() for vmalloc'ed buffers" (c32d977b8157bf67cdf47729ce7dd054a26eb534), that made the userspace mapping not cached, but this caused issues because the kernel vmalloc mapping was still cached. Instead of revering this commit, we could have made the kernel vmalloc noncached (see attached patch). It fix the issue on armv5. But on some architecture (armv7 for example) you can't have mapping for the same physical memory cached (normal cached) and noncached (device memory). So the vmalloc and userspace mapping will conflict with the kernel direct RAM mapping. A workaround could be to use writecombine protection instead of noncached. This work because writecombine is mapped on armv7 as L_PTE_MT_BUFFERABLE (normal uncached) that is compatible with cached memory (the same trick is used for dmacoherent). But that's architecture specific may not work on others architectures. What's the best way the fix this issue on all architecture ? Matthieu

2 1

[alsa-devel] alsa bt878 driver
by grigore calugar 04 Feb '13

04 Feb '13

Please add support in "snd-bt87x" for this card: 137 -> Conceptronic CTVFMi v2 [036e:109e] Best regards.

2 1

[alsa-devel] [PATCH RFC 0/4] Driver for RME MADI FX
by Adrian Knoth 04 Feb '13

04 Feb '13

Hi! I've been developing an out-of-tree driver for the RME MADI FX. History is available at https://github.com/adiknoth/madifx but doesn't follow any kernel convention regarding commit isolation, it was basically a backup/scratchpad during development. I don't have too much feedback, yet, but I guess it makes sense to mainline it earlier than later, increase the driver's exposure and fix any problems when the card is in more widespread use. Note that this patch series is essentially RFC right now to gather developer feedback. Cheers Adrian Knoth (4): ALSA: madifx - Makefile entries for RME MADI FX ALSA: Add RME MADI FX Kconfig entries ALSA: madifx - Expose preliminary userspace interface ALSA: madifx - Add support for RME MADI FX include/uapi/sound/madifx.h | 173 ++ sound/pci/Kconfig | 21 + sound/pci/rme9652/Makefile | 2 + sound/pci/rme9652/madifx.c | 3986 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 4182 insertions(+) create mode 100644 include/uapi/sound/madifx.h create mode 100644 sound/pci/rme9652/madifx.c -- 1.7.10.4

2 7

[alsa-devel] [PATCH] ALSA: core: don't return uninitialized snd_compr_tstamp
by Mark Brown 04 Feb '13

04 Feb '13

From: Richard Fitzgerald <rf(a)opensource.wolfsonmicro.com> The snd_compr_update_tstamp() can only fill in the snd_compr_tstamp if the codec implements the pointer() function. If that happened the code was previously returning uninitialized garbage in the tstamp because it wasn't initialized anywhere. This change zero-fills the tstamp in the two places it is used before calling snd_compr_update_tstamp(), and also has snd_compr_update_tstamp() return an error indication if it can't provide a tstamp. For the case of snd_compr_calc_avail() it ignores this error because we still need to return info on the available buffer space even if we can't provide tstamp info - when the tstamp is not valid all fields are now guaranteed to be zero. Signed-off-by: Richard Fitzgerald <rf(a)opensource.wolfsonmicro.com> Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/core/compress_offload.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/sound/core/compress_offload.c b/sound/core/compress_offload.c index ad11dc9..2d62068 100644 --- a/sound/core/compress_offload.c +++ b/sound/core/compress_offload.c @@ -144,16 +144,17 @@ static int snd_compr_free(struct inode *inode, struct file *f) return 0; } -static void snd_compr_update_tstamp(struct snd_compr_stream *stream, +static int snd_compr_update_tstamp(struct snd_compr_stream *stream, struct snd_compr_tstamp *tstamp) { if (!stream->ops->pointer) - return; + return -ENOTSUPP; stream->ops->pointer(stream, tstamp); pr_debug("dsp consumed till %d total %d bytes\n", tstamp->byte_offset, tstamp->copied_total); stream->runtime->hw_pointer = tstamp->byte_offset; stream->runtime->total_bytes_transferred = tstamp->copied_total; + return 0; } static size_t snd_compr_calc_avail(struct snd_compr_stream *stream, @@ -161,7 +162,9 @@ static size_t snd_compr_calc_avail(struct snd_compr_stream *stream, { long avail_calc; /*this needs to be signed variable */ + memset(avail, 0, sizeof(*avail)); snd_compr_update_tstamp(stream, &avail->tstamp); + /* Still need to return avail even if tstamp can't be filled in */ /* FIXME: This needs to be different for capture stream, available is # of compressed data, for playback it's @@ -517,11 +520,14 @@ out: static inline int snd_compr_tstamp(struct snd_compr_stream *stream, unsigned long arg) { - struct snd_compr_tstamp tstamp; + struct snd_compr_tstamp tstamp = {0}; + int ret; - snd_compr_update_tstamp(stream, &tstamp); - return copy_to_user((struct snd_compr_tstamp __user *)arg, - &tstamp, sizeof(tstamp)) ? -EFAULT : 0; + ret = snd_compr_update_tstamp(stream, &tstamp); + if (ret == 0) + ret = copy_to_user((struct snd_compr_tstamp __user *)arg, + &tstamp, sizeof(tstamp)) ? -EFAULT : 0; + return ret; } static int snd_compr_pause(struct snd_compr_stream *stream) -- 1.7.10.4

4 3

[alsa-devel] [PATCH] ASOC: imx: audmux: add a integrated configuration function
by Gary Zhang 04 Feb '13

04 Feb '13

based on imx_audmux_v2_configure_port(), add a integrated interface to configure audmux port conveniently Signed-off-by: Gary Zhang <b13634(a)freescale.com> --- sound/soc/fsl/imx-audmux.c | 43 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 42 insertions(+), 1 deletions(-) diff --git a/sound/soc/fsl/imx-audmux.c b/sound/soc/fsl/imx-audmux.c index 251f4d9..ebd38a0 100644 --- a/sound/soc/fsl/imx-audmux.c +++ b/sound/soc/fsl/imx-audmux.c @@ -1,5 +1,5 @@ /* - * Copyright 2012 Freescale Semiconductor, Inc. + * Copyright 2012-2013 Freescale Semiconductor, Inc. * Copyright 2012 Linaro Ltd. * Copyright 2009 Pengutronix, Sascha Hauer <s.hauer(a)pengutronix.de> * @@ -244,6 +244,47 @@ int imx_audmux_v2_configure_port(unsigned int port, unsigned int ptcr, } EXPORT_SYMBOL_GPL(imx_audmux_v2_configure_port); +int imx_audmux_configure_port(unsigned int int_port, unsigned int ext_port) +{ + int ret; + + if ((int_port > 7) || (ext_port > 7)) + return -EINVAL; + + if (audmux_type != IMX31_AUDMUX) + return -EINVAL; + + if (!audmux_base) + return -ENOSYS; + + if (audmux_clk) + clk_prepare_enable(audmux_clk); + + int_port--; + ext_port--; + ret = imx_audmux_v2_configure_port(int_port, + IMX_AUDMUX_V2_PTCR_SYN | + IMX_AUDMUX_V2_PTCR_TFSEL(ext_port) | + IMX_AUDMUX_V2_PTCR_TCSEL(ext_port) | + IMX_AUDMUX_V2_PTCR_TFSDIR | + IMX_AUDMUX_V2_PTCR_TCLKDIR, + IMX_AUDMUX_V2_PDCR_RXDSEL(ext_port)); + if (ret) { + pr_err("audmux internal port setup failed\n"); + return ret; + } + imx_audmux_v2_configure_port(ext_port, + IMX_AUDMUX_V2_PTCR_SYN, + IMX_AUDMUX_V2_PDCR_RXDSEL(int_port)); + if (ret) { + pr_err("audmux external port setup failed\n"); + return ret; + } + + return 0; +} +EXPORT_SYMBOL_GPL(imx_audmux_configure_port); + static int imx_audmux_probe(struct platform_device *pdev) { struct resource *res; -- 1.7.0.4

3 5

[alsa-devel] [PATCH] ASoC: wm2200: Add Rx ANC input select control
by Chris Rattray 04 Feb '13

04 Feb '13

Signed-off-by: Chris Rattray <crattray(a)opensource.wolfsonmicro.com> Change-Id: Iee28d1898327633a3166dd340410a37796959c0c --- sound/soc/codecs/wm2200.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/sound/soc/codecs/wm2200.c b/sound/soc/codecs/wm2200.c index bdd3d80..a915c76 100644 --- a/sound/soc/codecs/wm2200.c +++ b/sound/soc/codecs/wm2200.c @@ -1109,6 +1109,16 @@ static int wm2200_mixer_values[] = { static WM2200_MUX_CTL_DECL(name##_aux5); \ static WM2200_MUX_CTL_DECL(name##_aux6); +static const char *wm2200_rxanc_input_sel_texts[] = { + "None", "IN1", "IN2", "IN3", +}; + +static const struct soc_enum wm2200_rxanc_input_sel = + SOC_ENUM_SINGLE(WM2200_RXANC_SRC, + WM2200_IN_RXANC_SEL_SHIFT, + ARRAY_SIZE(wm2200_rxanc_input_sel_texts), + wm2200_rxanc_input_sel_texts); + static const struct snd_kcontrol_new wm2200_snd_controls[] = { SOC_SINGLE("IN1 High Performance Switch", WM2200_IN1L_CONTROL, WM2200_IN1_OSR_SHIFT, 1, 0), @@ -1168,6 +1178,7 @@ SOC_DOUBLE_R_TLV("OUT2 Digital Volume", WM2200_DAC_DIGITAL_VOLUME_2L, digital_tlv), SOC_DOUBLE("OUT2 Switch", WM2200_PDM_1, WM2200_SPK1L_MUTE_SHIFT, WM2200_SPK1R_MUTE_SHIFT, 1, 1), +SOC_ENUM("RxANC Src", wm2200_rxanc_input_sel), }; WM2200_MIXER_ENUMS(OUT1L, WM2200_OUT1LMIX_INPUT_1_SOURCE); -- 1.7.2.5

2 1

[alsa-devel] [PATCH] ASoC: wm2200: correct IN2L and IN3L digital mute
by Chris Rattray 04 Feb '13

04 Feb '13

Signed-off-by: Chris Rattray <crattray(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm2200.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/wm2200.c b/sound/soc/codecs/wm2200.c index a915c76..f5410ec 100644 --- a/sound/soc/codecs/wm2200.c +++ b/sound/soc/codecs/wm2200.c @@ -1136,9 +1136,9 @@ SOC_DOUBLE_R_TLV("IN3 Volume", WM2200_IN3L_CONTROL, WM2200_IN3R_CONTROL, SOC_DOUBLE_R("IN1 Digital Switch", WM2200_ADC_DIGITAL_VOLUME_1L, WM2200_ADC_DIGITAL_VOLUME_1R, WM2200_IN1L_MUTE_SHIFT, 1, 1), -SOC_DOUBLE_R("IN2 Digital Switch", WM2200_ADC_DIGITAL_VOLUME_1L, +SOC_DOUBLE_R("IN2 Digital Switch", WM2200_ADC_DIGITAL_VOLUME_2L, WM2200_ADC_DIGITAL_VOLUME_2R, WM2200_IN2L_MUTE_SHIFT, 1, 1), -SOC_DOUBLE_R("IN3 Digital Switch", WM2200_ADC_DIGITAL_VOLUME_1L, +SOC_DOUBLE_R("IN3 Digital Switch", WM2200_ADC_DIGITAL_VOLUME_3L, WM2200_ADC_DIGITAL_VOLUME_3R, WM2200_IN3L_MUTE_SHIFT, 1, 1), SOC_DOUBLE_R_TLV("IN1 Digital Volume", WM2200_ADC_DIGITAL_VOLUME_1L, -- 1.7.2.5

2 1