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

[alsa-devel] [PATCH v6] ASoC: Apply msbits constraint for sample size bigger than the msbits
by Peter Ujfalusi 19 Jan '12

19 Jan '12

In order to avoid confusing the applications with msbits bigger than the selected sample size apply the msbits constraint only to sample size bigger than the requested msbits. Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)ti.com> --- Hi Mark, Let's try this way. I think this implementation is quete clear for the first look to understand what it is doing. Regards, Peter sound/soc/soc-pcm.c | 23 +++++++++++++++-------- 1 files changed, 15 insertions(+), 8 deletions(-) diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 8bb1793..d6fdde2 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -68,7 +68,7 @@ static int soc_pcm_apply_symmetry(struct snd_pcm_substream *substream, * like the DAC/ADC resolution to use but there isn't right now. */ static int sample_sizes[] = { - 8, 16, 24, 32, + 32, 24, 16, 8, }; static void soc_pcm_apply_msb(struct snd_pcm_substream *substream, @@ -85,13 +85,20 @@ static void soc_pcm_apply_msb(struct snd_pcm_substream *substream, return; for (i = 0; i < ARRAY_SIZE(sample_sizes); i++) { - ret = snd_pcm_hw_constraint_msbits(substream->runtime, - 0, sample_sizes[i], - bits); - if (ret != 0) - dev_warn(dai->dev, - "Failed to set MSB %d/%d: %d\n", - bits, sample_sizes[i], ret); + if (sample_sizes[i] > bits) { + ret = snd_pcm_hw_constraint_msbits(substream->runtime, + 0, sample_sizes[i], bits); + if (ret != 0) + dev_warn(dai->dev, + "Failed to set MSB %d/%d: %d\n", + bits, sample_sizes[i], ret); + } else { + /* + * The remaining sample sizes are smaller than the + * requested msbits, we can bail out from the loop. + */ + break; + } } } -- 1.7.8.3

2 2

[alsa-devel] [PATCH] ASoC: Don't tell applications about msbits unless we're ignoring input
by Mark Brown 19 Jan '12

19 Jan '12

On the off chance that an application both pays attention and gets confused. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/soc-pcm.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 77c40ee..9f6e55b 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -85,9 +85,11 @@ static void soc_pcm_apply_msb(struct snd_pcm_substream *substream, return; for (i = 0; i < ARRAY_SIZE(sample_sizes); i++) { - ret = snd_pcm_hw_constraint_msbits(substream->runtime, - 0, sample_sizes[i], - bits); + if (bits >= sample_sizes) + continue; + + ret = snd_pcm_hw_constraint_msbits(substream->runtime, 0, + sample_sizes[i], bits); if (ret != 0) dev_warn(dai->dev, "Failed to set MSB %d/%d: %d\n", -- 1.7.7.3

1 0

[alsa-devel] [PATCH] ASoC: Add external amplifier controls for Visstrim_M10.
by Javier Martin 19 Jan '12

19 Jan '12

Visstrim_M10 has an external class D amplifier. This patch provides support for controlling the 4 possible gain levels and per channel muting. Signed-off-by: Javier Martin <javier.martin(a)vista-silicon.com> --- sound/soc/imx/mx27vis-aic32x4.c | 72 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 72 insertions(+), 0 deletions(-) diff --git a/sound/soc/imx/mx27vis-aic32x4.c b/sound/soc/imx/mx27vis-aic32x4.c index d37e23c..47a7bf9 100644 --- a/sound/soc/imx/mx27vis-aic32x4.c +++ b/sound/soc/imx/mx27vis-aic32x4.c @@ -25,16 +25,36 @@ #include <linux/moduleparam.h> #include <linux/device.h> #include <linux/i2c.h> +#include <linux/gpio.h> #include <sound/core.h> #include <sound/pcm.h> #include <sound/soc.h> #include <sound/soc-dapm.h> #include <asm/mach-types.h> #include <mach/audmux.h> +#include <mach/iomux-mx27.h> #include "../codecs/tlv320aic32x4.h" #include "imx-ssi.h" +#define MX27VIS_AMP_GAIN 0 +#define MX27VIS_AMP_MUTE 1 + +#define MX27VIS_PIN_G0 (GPIO_PORTF + 9) +#define MX27VIS_PIN_G1 (GPIO_PORTF + 8) +#define MX27VIS_PIN_SDL (GPIO_PORTE + 5) +#define MX27VIS_PIN_SDR (GPIO_PORTF + 7) + +static int mx27vis_amp_gain; +static int mx27vis_amp_mute; + +static const int mx27vis_amp_pins[] = { + MX27VIS_PIN_G0 | GPIO_GPIO | GPIO_OUT, + MX27VIS_PIN_G1 | GPIO_GPIO | GPIO_OUT, + MX27VIS_PIN_SDL | GPIO_GPIO | GPIO_OUT, + MX27VIS_PIN_SDR | GPIO_GPIO | GPIO_OUT, +}; + static int mx27vis_aic32x4_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { @@ -74,8 +94,53 @@ static struct snd_soc_ops mx27vis_aic32x4_snd_ops = { .hw_params = mx27vis_aic32x4_hw_params, }; +static int mx27vis_amp_set(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct soc_mixer_control *mc = + (struct soc_mixer_control *)kcontrol->private_value; + int value = ucontrol->value.integer.value[0]; + unsigned int reg = mc->reg; + + switch (reg) { + case MX27VIS_AMP_GAIN: + gpio_set_value(MX27VIS_PIN_G0, value & 1); + gpio_set_value(MX27VIS_PIN_G1, value >> 1); + mx27vis_amp_gain = value; + break; + case MX27VIS_AMP_MUTE: + gpio_set_value(MX27VIS_PIN_SDL, value & 1); + gpio_set_value(MX27VIS_PIN_SDR, value >> 1); + mx27vis_amp_mute = value; + break; + } + return 0; +} + +static int mx27vis_amp_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct soc_mixer_control *mc = + (struct soc_mixer_control *)kcontrol->private_value; + unsigned int reg = mc->reg; + + switch (reg) { + case MX27VIS_AMP_GAIN: + ucontrol->value.integer.value[0] = mx27vis_amp_gain; + break; + case MX27VIS_AMP_MUTE: + ucontrol->value.integer.value[0] = mx27vis_amp_mute; + break; + } + return 0; +} + static const struct snd_kcontrol_new mx27vis_aic32x4_controls[] = { SOC_DAPM_PIN_SWITCH("External Mic"), + SOC_SINGLE_EXT("LO Ext Boost", MX27VIS_AMP_GAIN, 0, 3, 0, + mx27vis_amp_get, mx27vis_amp_set), + SOC_DOUBLE_EXT("LO Ext Mute Switch", MX27VIS_AMP_MUTE, 0, 1, 1, 0, + mx27vis_amp_get, mx27vis_amp_set), }; static const struct snd_soc_dapm_widget aic32x4_dapm_widgets[] = { @@ -146,6 +211,13 @@ static int __init mx27vis_aic32x4_init(void) MXC_AUDMUX_V1_PCR_RXDSEL(MX27_AUDMUX_HPCR1_SSI0) ); + ret = mxc_gpio_setup_multiple_pins(mx27vis_amp_pins, + ARRAY_SIZE(mx27vis_amp_pins), "MX27VIS_AMP"); + if (ret) { + printk(KERN_ERR "ASoC: unable to setup gpios\n"); + platform_device_put(mx27vis_aic32x4_snd_device); + } + return ret; } -- 1.7.0.4

3 4

[alsa-devel] [PATCH] Fix bint check version check
by Ozan Çağlayan 19 Jan '12

19 Jan '12

It seems that the bint stuff is not a part of 3.2 kernel as it's pulled by Linus only a few days ago, so increment version check to 3.3.0: commit 69116f279a9eaf4c540934269342d9149538fc79 Author: Rusty Russell <rusty(a)rustcorp.com.au> Date: Fri Jan 13 09:32:17 2012 +1030 module_param: avoid bool abuse, add bint for special cases. Signed-off-by: Ozan Çağlayan <ozan(a)pardus.org.tr> --- include/adriver.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/adriver.h b/include/adriver.h index a6e6cbc..9bc8ca8 100644 --- a/include/adriver.h +++ b/include/adriver.h @@ -830,7 +830,7 @@ static inline unsigned long msecs_to_jiffies(const unsigned int m) #endif #endif -#if LINUX_VERSION_CODE <= KERNEL_VERSION(3, 2, 0) +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0) #include <linux/moduleparam.h> #ifndef param_get_bint #define bint bool -- 1.7.7.1

2 1

[alsa-devel] [PATCH v5] ASoC: Apply msbits constraint for sample size bigger than the msbits
by Peter Ujfalusi 19 Jan '12

19 Jan '12

In order to avoid confusing the applications with msbits bigger than the selected sample size apply the msbits constraint only to sample seze bigger than the requested msbits. Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)ti.com> --- Hi Mark, Converted to use while loop. We run the loop as long as the sample size is bigger than the requested msbits. Most of the drivers require 24/32 configuration, so not point of looping for smaller sample sizes. Regards, Peter sound/soc/soc-pcm.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 8bb1793..ef41a39 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -68,13 +68,14 @@ static int soc_pcm_apply_symmetry(struct snd_pcm_substream *substream, * like the DAC/ADC resolution to use but there isn't right now. */ static int sample_sizes[] = { - 8, 16, 24, 32, + 32, 24, 16, 8, }; static void soc_pcm_apply_msb(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { - int ret, i, bits; + int ret, bits; + int i = 0; if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) bits = dai->driver->playback.sig_bits; @@ -84,14 +85,14 @@ static void soc_pcm_apply_msb(struct snd_pcm_substream *substream, if (!bits) return; - for (i = 0; i < ARRAY_SIZE(sample_sizes); i++) { - ret = snd_pcm_hw_constraint_msbits(substream->runtime, - 0, sample_sizes[i], - bits); + /* Apply constraint only for sample size bigger than requested msbits */ + while (sample_sizes[i] > bits && i < ARRAY_SIZE(sample_sizes)) { + ret = snd_pcm_hw_constraint_msbits(substream->runtime, 0, + sample_sizes[i], bits); if (ret != 0) - dev_warn(dai->dev, - "Failed to set MSB %d/%d: %d\n", + dev_warn(dai->dev, "Failed to set MSB %d/%d: %d\n", bits, sample_sizes[i], ret); + i++; } } -- 1.7.8.3

3 10

Re: [alsa-devel] [PATCH 01/10] MXS-DMA : move the mxs-dma.h to a more common place
by Shawn Guo 19 Jan '12

19 Jan '12

On Thu, Jan 19, 2012 at 02:15:58PM +0800, Huang Shijie wrote: > Move the header to a more common place. > The DMA engine is not only used in mx23/mx28, but also used > in mx50/mx6q. > It will also be used in the future chips. > > Rename it to mxs-dma.h > > Signed-off-by: Huang Shijie <b32955(a)freescale.com> > --- > arch/arm/mach-mxs/include/mach/dma.h | 28 ---------------------------- > include/linux/mxs-dma.h | 28 ++++++++++++++++++++++++++++ > 2 files changed, 28 insertions(+), 28 deletions(-) > delete mode 100644 arch/arm/mach-mxs/include/mach/dma.h > create mode 100644 include/linux/mxs-dma.h > I'm wondering if it would be better to create folder include/linux/fsl for mxs-dma.h accommodation, so that any headers that need to shared between mxs and imx later can find a place. Considering that Freescale has many IPs shared between MPCxxx (PowerPC) and i.MX (ARM) families, it could also be a good place for any headers that need to be shared between these two product lines from Freescale. -- Regards, Shawn

1 0

[alsa-devel] [PATCH] ASoC: Disable register synchronisation for low frequency WM8996 SYSCLK
by Mark Brown 19 Jan '12

19 Jan '12

With a low frequency SYSCLK and a fast I2C clock register synchronisation may occasionally take too long to take effect, causing I/O issues. Disable synchronisation in order to avoid any issues. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm8996.c | 4 ++++ sound/soc/codecs/wm8996.h | 4 ++++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/sound/soc/codecs/wm8996.c b/sound/soc/codecs/wm8996.c index 691ae4e..8e8f8d1 100644 --- a/sound/soc/codecs/wm8996.c +++ b/sound/soc/codecs/wm8996.c @@ -2007,6 +2007,7 @@ static int wm8996_set_sysclk(struct snd_soc_dai *dai, struct wm8996_priv *wm8996 = snd_soc_codec_get_drvdata(codec); int lfclk = 0; int ratediv = 0; + int sync = WM8996_REG_SYNC; int src; int old; @@ -2051,6 +2052,7 @@ static int wm8996_set_sysclk(struct snd_soc_dai *dai, case 32000: case 32768: lfclk = WM8996_LFCLK_ENA; + sync = 0; break; default: dev_warn(codec->dev, "Unsupported clock rate %dHz\n", @@ -2064,6 +2066,8 @@ static int wm8996_set_sysclk(struct snd_soc_dai *dai, WM8996_SYSCLK_SRC_MASK | WM8996_SYSCLK_DIV_MASK, src << WM8996_SYSCLK_SRC_SHIFT | ratediv); snd_soc_update_bits(codec, WM8996_CLOCKING_1, WM8996_LFCLK_ENA, lfclk); + snd_soc_update_bits(codec, WM8996_CONTROL_INTERFACE_1, + WM8996_REG_SYNC, sync); snd_soc_update_bits(codec, WM8996_AIF_CLOCKING_1, WM8996_SYSCLK_ENA, old); diff --git a/sound/soc/codecs/wm8996.h b/sound/soc/codecs/wm8996.h index 0fde643..de9ac3e 100644 --- a/sound/soc/codecs/wm8996.h +++ b/sound/soc/codecs/wm8996.h @@ -1567,6 +1567,10 @@ int wm8996_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack, /* * R257 (0x101) - Control Interface (1) */ +#define WM8996_REG_SYNC 0x8000 /* REG_SYNC */ +#define WM8996_REG_SYNC_MASK 0x8000 /* REG_SYNC */ +#define WM8996_REG_SYNC_SHIFT 15 /* REG_SYNC */ +#define WM8996_REG_SYNC_WIDTH 1 /* REG_SYNC */ #define WM8996_AUTO_INC 0x0004 /* AUTO_INC */ #define WM8996_AUTO_INC_MASK 0x0004 /* AUTO_INC */ #define WM8996_AUTO_INC_SHIFT 2 /* AUTO_INC */ -- 1.7.7.3

1 0

[alsa-devel] Realtek model parser problem with the new jack detection
by David Henningsson 19 Jan '12

19 Jan '12

Hi Takashi, I'm troubleshooting a problem with the Realtek quirk/model parsers. The problem is basically that add_jack_kctls call snd_hda_jack_detect_enable, which in turn overwrites the current unsol tag. E g, first the model parser sets a pin to AC_USRSP_EN | ALC_HP_EVENT, then comes snd_hda_jack_detect_enable and does AC_USRSP_EN | jack->tag. I'm not sure of the best way to resolve this; either keep the current tag (and mark all jacks as dirty on an unsol event), or read back the current tag and set it as jack->action (and then always use the jack table). What do you think? Example alsa-info for this is in http://www.alsa-project.org/db/?f=5cc88967e9da547975924a06c948ece00f1f0263 -- David Henningsson, Canonical Ltd. http://launchpad.net/~diwic

2 4

[alsa-devel] Suggestion for change in HD-Audio-Models.txt documentation
by Dave Lentz 19 Jan '12

19 Jan '12

See attachment. Conexant model names have been updated.

2 1

Re: [alsa-devel] [PATCH 01/10] MXS-DMA : move the mxs-dma.h to a more common place
by Wolfram Sang 19 Jan '12

19 Jan '12

On Thu, Jan 19, 2012 at 02:15:58PM +0800, Huang Shijie wrote: > Move the header to a more common place. > The DMA engine is not only used in mx23/mx28, but also used > in mx50/mx6q. > It will also be used in the future chips. > > Rename it to mxs-dma.h > > Signed-off-by: Huang Shijie <b32955(a)freescale.com> > --- > arch/arm/mach-mxs/include/mach/dma.h | 28 ---------------------------- > include/linux/mxs-dma.h | 28 ++++++++++++++++++++++++++++ > 2 files changed, 28 insertions(+), 28 deletions(-) > delete mode 100644 arch/arm/mach-mxs/include/mach/dma.h > create mode 100644 include/linux/mxs-dma.h Please use -M with git format-patch, so we can better see that it is a pure rename. I'd also suggest to squash patches up to 05/10 into this one, (collecting all the proper acks from maintainers) since the changes are trivial and it will reduce dependencies and temporary build-failures. Regards, Wolfram -- Pengutronix e.K. | Wolfram Sang | Industrial Linux Solutions | http://www.pengutronix.de/ |

2 1