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

[alsa-devel] [PATCH v7 1/3] ARM: mxs: add saif clkmux functions
by Dong Aisheng 22 Nov '11

22 Nov '11

Signed-off-by: Dong Aisheng <b29396(a)freescale.com> Acked-by: Marek Vasut <marek.vasut(a)gmail.com> Cc: Sascha Hauer <s.hauer(a)pengutronix.de> Cc: Wolfram Sang <w.sang(a)pengutronix.de> Cc: Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de> Cc: Mark Brown <broonie(a)opensource.wolfsonmicro.com> Cc: Liam Girdwood <lrg(a)ti.com> --- changes since v5: * remove unneeded parenthesis changes since v4: * remove get_master_id function. Instead, we use master_mode and master_id in platform_data to tell saif driver the correct master id for each saifs. changes since v3: * remove the unneeded locking according to Sascha changes since v2: * This patch is separated from the following patch based on suggestions from Uwe. [PATCH 2/3] ARM: mx28evk: add platform data for saif --- arch/arm/mach-mxs/clock-mx28.c | 29 +++++++++++++++++++++++++++++ arch/arm/mach-mxs/include/mach/common.h | 1 + arch/arm/mach-mxs/include/mach/digctl.h | 21 +++++++++++++++++++++ 3 files changed, 51 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-mxs/clock-mx28.c b/arch/arm/mach-mxs/clock-mx28.c index 7954013..c51fe85 100644 --- a/arch/arm/mach-mxs/clock-mx28.c +++ b/arch/arm/mach-mxs/clock-mx28.c @@ -22,6 +22,7 @@ #include <linux/io.h> #include <linux/jiffies.h> #include <linux/clkdev.h> +#include <linux/spinlock.h> #include <asm/clkdev.h> #include <asm/div64.h> @@ -29,6 +30,7 @@ #include <mach/mx28.h> #include <mach/common.h> #include <mach/clock.h> +#include <mach/digctl.h> #include "regs-clkctrl-mx28.h" @@ -43,6 +45,33 @@ static struct clk emi_clk; static struct clk saif0_clk; static struct clk saif1_clk; static struct clk clk32k_clk; +static DEFINE_SPINLOCK(clkmux_lock); + +/* + * HW_SAIF_CLKMUX_SEL: + * DIRECT(0x0): SAIF0 clock pins selected for SAIF0 input clocks, and SAIF1 + * clock pins selected for SAIF1 input clocks. + * CROSSINPUT(0x1): SAIF1 clock inputs selected for SAIF0 input clocks, and + * SAIF0 clock inputs selected for SAIF1 input clocks. + * EXTMSTR0(0x2): SAIF0 clock pin selected for both SAIF0 and SAIF1 input + * clocks. + * EXTMSTR1(0x3): SAIF1 clock pin selected for both SAIF0 and SAIF1 input + * clocks. + */ +int mxs_saif_clkmux_select(unsigned int clkmux) +{ + if (clkmux > 0x3) + return -EINVAL; + + spin_lock(&clkmux_lock); + __raw_writel(BM_DIGCTL_CTRL_SAIF_CLKMUX, + DIGCTRL_BASE_ADDR + HW_DIGCTL_CTRL + MXS_CLR_ADDR); + __raw_writel(clkmux << BP_DIGCTL_CTRL_SAIF_CLKMUX, + DIGCTRL_BASE_ADDR + HW_DIGCTL_CTRL + MXS_SET_ADDR); + spin_unlock(&clkmux_lock); + + return 0; +} static int _raw_clk_enable(struct clk *clk) { diff --git a/arch/arm/mach-mxs/include/mach/common.h b/arch/arm/mach-mxs/include/mach/common.h index 635bb5d..3bbb94f 100644 --- a/arch/arm/mach-mxs/include/mach/common.h +++ b/arch/arm/mach-mxs/include/mach/common.h @@ -16,6 +16,7 @@ struct clk; extern const u32 *mxs_get_ocotp(void); extern int mxs_reset_block(void __iomem *); extern void mxs_timer_init(struct clk *, int); +extern int mxs_saif_clkmux_select(unsigned int clkmux); extern int mx23_register_gpios(void); extern int mx23_clocks_init(void); diff --git a/arch/arm/mach-mxs/include/mach/digctl.h b/arch/arm/mach-mxs/include/mach/digctl.h new file mode 100644 index 0000000..49a888c --- /dev/null +++ b/arch/arm/mach-mxs/include/mach/digctl.h @@ -0,0 +1,21 @@ +/* + * Copyright 2011 Freescale Semiconductor, Inc. All Rights Reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#ifndef __MACH_DIGCTL_H__ +#define __MACH_DIGCTL_H__ + +/* MXS DIGCTL SAIF CLKMUX */ +#define MXS_DIGCTL_SAIF_CLKMUX_DIRECT 0x0 +#define MXS_DIGCTL_SAIF_CLKMUX_CROSSINPUT 0x1 +#define MXS_DIGCTL_SAIF_CLKMUX_EXTMSTR0 0x2 +#define MXS_DIGCTL_SAIF_CLKMUX_EXTMSTR1 0x3 + +#define HW_DIGCTL_CTRL 0x0 +#define BP_DIGCTL_CTRL_SAIF_CLKMUX 10 +#define BM_DIGCTL_CTRL_SAIF_CLKMUX (0x3 << 10) +#endif -- 1.7.0.4

1 0

[alsa-devel] ASoC: max9877: Update register if either val or val2 is changed
by Axel Lin 22 Nov '11

22 Nov '11

In the case of ((max9877_regs[reg] >> shift) & mask) != val but ((max9877_regs[reg2] >> shift) & mask) == val2, current code does not update the registers. Fix the logic to update registers if either val or val2 is changed. Signed-off-by: Axel Lin <axel.lin(a)gmail.com> --- sound/soc/codecs/max9877.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sound/soc/codecs/max9877.c b/sound/soc/codecs/max9877.c index 9e7e964..dcf6f2a 100644 --- a/sound/soc/codecs/max9877.c +++ b/sound/soc/codecs/max9877.c @@ -106,13 +106,13 @@ static int max9877_set_2reg(struct snd_kcontrol *kcontrol, unsigned int mask = mc->max; unsigned int val = (ucontrol->value.integer.value[0] & mask); unsigned int val2 = (ucontrol->value.integer.value[1] & mask); - unsigned int change = 1; + unsigned int change = 0; - if (((max9877_regs[reg] >> shift) & mask) == val) - change = 0; + if (((max9877_regs[reg] >> shift) & mask) != val) + change = 1; - if (((max9877_regs[reg2] >> shift) & mask) == val2) - change = 0; + if (((max9877_regs[reg2] >> shift) & mask) != val2) + change = 1; if (change) { max9877_regs[reg] &= ~(mask << shift); -- 1.7.5.4

2 1

[alsa-devel] [PATCH] ASoC: cs42l73: Make inv and format to be unsigned int
by Axel Lin 22 Nov '11

22 Nov '11

Fix below smatch warning: sound/soc/codecs/cs42l73.c +1030 cs42l73_set_dai_fmt(53) error: inv is never equal to 1024 (wrong type 0 - 255). sound/soc/codecs/cs42l73.c +1032 cs42l73_set_dai_fmt(55) error: inv is never equal to 768 (wrong type 0 - 255). sound/soc/codecs/cs42l73.c +1036 cs42l73_set_dai_fmt(59) error: inv is never equal to 1024 (wrong type 0 - 255). Reported-by: Dan Carpenter <dan.carpenter(a)oracle.com> Signed-off-by: Axel Lin <axel.lin(a)gmail.com> --- sound/soc/codecs/cs42l73.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sound/soc/codecs/cs42l73.c b/sound/soc/codecs/cs42l73.c index a2af595..aadfd6b 100644 --- a/sound/soc/codecs/cs42l73.c +++ b/sound/soc/codecs/cs42l73.c @@ -979,7 +979,7 @@ static int cs42l73_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt) struct snd_soc_codec *codec = codec_dai->codec; struct cs42l73_private *priv = snd_soc_codec_get_drvdata(codec); u8 id = codec_dai->id; - u8 inv, format; + unsigned int inv, format; u8 spc, mmcc; spc = snd_soc_read(codec, CS42L73_SPC(id)); -- 1.7.5.4

3 2

[alsa-devel] [PATCH 1/2] ASoC: cs42l73: Unify the way to define bits of register
by Axel Lin 22 Nov '11

22 Nov '11

Current code defines some bits with left shift to the proper bit defined in datasheet, but some don't. Unify the definition with proper left shift and adjust the code accordingly. Signed-off-by: Axel Lin <axel.lin(a)gmail.com> --- Hi, I don't have this hardware handy. I'd appreciate if someone can test this serial of patches. Thanks Axel sound/soc/codecs/cs42l73.c | 6 +++--- sound/soc/codecs/cs42l73.h | 18 +++++++++--------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/sound/soc/codecs/cs42l73.c b/sound/soc/codecs/cs42l73.c index 6fe259a..0306e72 100644 --- a/sound/soc/codecs/cs42l73.c +++ b/sound/soc/codecs/cs42l73.c @@ -1028,13 +1028,13 @@ static int cs42l73_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt) switch (format) { case SND_SOC_DAIFMT_DSP_B: if (inv == SND_SOC_DAIFMT_IB_IF) - spc |= (PCM_MODE0 << 4); + spc |= PCM_MODE0; if (inv == SND_SOC_DAIFMT_IB_NF) - spc |= (PCM_MODE1 << 4); + spc |= PCM_MODE1; break; case SND_SOC_DAIFMT_DSP_A: if (inv == SND_SOC_DAIFMT_IB_IF) - spc |= (PCM_MODE1 << 4); + spc |= PCM_MODE1; break; default: return -EINVAL; diff --git a/sound/soc/codecs/cs42l73.h b/sound/soc/codecs/cs42l73.h index 7c3bf7f..f30a4c4 100644 --- a/sound/soc/codecs/cs42l73.h +++ b/sound/soc/codecs/cs42l73.h @@ -162,16 +162,16 @@ /* CS42L73_ASPC, CS42L73_XSPC, CS42L73_VSPC */ #define SP_3ST (1 << 7) -#define SPDIF_I2S 0 +#define SPDIF_I2S (0 << 6) #define SPDIF_PCM (1 << 6) -#define PCM_MODE0 0 -#define PCM_MODE1 1 -#define PCM_MODE2 2 -#define PCM_BO_MSBLSB 0 -#define PCM_BO_LSBMSB 1 -#define MCK_SCLK_64FS 0 -#define MCK_SCLK_MCLK 2 -#define MCK_SCLK_PREMCLK 3 +#define PCM_MODE0 (0 << 4) +#define PCM_MODE1 (1 << 4) +#define PCM_MODE2 (2 << 4) +#define PCM_MODE_MASK (3 << 4) +#define PCM_BIT_ORDER (1 << 3) +#define MCK_SCLK_64FS (0 << 0) +#define MCK_SCLK_MCLK (2 << 0) +#define MCK_SCLK_PREMCLK (3 << 0) /* CS42L73_xSPMMCC */ #define MS_MASTER (1 << 7) -- 1.7.5.4

3 4

[alsa-devel] [PATCH] ASoC: Fix wrong define for AD1836_ADC_WORD_OFFSET
by Axel Lin 22 Nov '11

22 Nov '11

According to the datasheet: The BIT[5:4] of ADC Control Register 2 is to control the word width. 00 = 25 Bits 01 = 20 Bits 10 = 16 Bits 11 = Invalid Thus, the AD1836_ADC_WORD_OFFSET should be defined as 4. Signed-off-by: Axel Lin <axel.lin(a)gmail.com> --- sound/soc/codecs/ad1836.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sound/soc/codecs/ad1836.h b/sound/soc/codecs/ad1836.h index 444747f..dd7be0d 100644 --- a/sound/soc/codecs/ad1836.h +++ b/sound/soc/codecs/ad1836.h @@ -34,7 +34,7 @@ #define AD1836_ADC_CTRL2 13 #define AD1836_ADC_WORD_LEN_MASK 0x30 -#define AD1836_ADC_WORD_OFFSET 5 +#define AD1836_ADC_WORD_OFFSET 4 #define AD1836_ADC_SERFMT_MASK (7 << 6) #define AD1836_ADC_SERFMT_PCK256 (0x4 << 6) #define AD1836_ADC_SERFMT_PCK128 (0x5 << 6) -- 1.7.5.4

3 2

[alsa-devel] 'unresolved symbol lock_kernel' on 2.4 kernel
by Alan Horstmann 22 Nov '11

22 Nov '11

Hi, As part of recent testing I attempted to build current 1.0.24 alsa-driver on an older machine with 2.4.21-99 kernel . 'configure' and 'make' proceeded uneventfully, but 'rcalsasound start' gave following error:- "Starting sound driver: snd-ice1712 /lib/modules/2.4.21-99-athlon/kernel/ sound/acore/snd.o: unresolved symbol lock_kernel /lib/modules/2.4.21-99-athlon/kernel/sound/acore/snd.o: unresolved symbol unlock_kernel /lib/modules/2.4.21-99-athlon/kernel/sound/acore/snd.o: insmod /lib/ modules/2.4.21-99-athlon/kernel/sound/acore/snd.o failed /lib/modules/2.4.21-99-athlon/kernel/sound/acore/snd.o: insmod snd-ice1712 failed" This does not occur on 1.0.23 (or previous builds that I have tested). I am aware that there was discussion about ditching 2.2/2.4 support, but my understanding was that 1.0.24 should build and work, but may be the last to do so - is that correct? Is there a simple fix for this problem? regards Alan

2 2

[alsa-devel] [PATCH] hda - fail ELD reading early
by Wu Fengguang 22 Nov '11

22 Nov '11

With the ELD repoll mechanism, we can (and should) fail the ELD reading immediately when find something obviously wrong and let the caller retry after some delay. Signed-off-by: Wu Fengguang <fengguang.wu(a)intel.com> --- sound/pci/hda/hda_eld.c | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) --- linux.orig/sound/pci/hda/hda_eld.c 2011-11-22 16:02:58.000000000 +0800 +++ linux/sound/pci/hda/hda_eld.c 2011-11-22 16:36:10.000000000 +0800 @@ -347,18 +347,28 @@ int snd_hdmi_get_eld(struct hdmi_eld *el for (i = 0; i < size; i++) { unsigned int val = hdmi_get_eld_data(codec, nid, i); + /* + * Graphics driver might be writing to ELD buffer right now. + * Just abort. The caller will repoll after a while. + */ if (!(val & AC_ELDD_ELD_VALID)) { - if (!i) { - snd_printd(KERN_INFO - "HDMI: invalid ELD data\n"); - ret = -EINVAL; - goto error; - } snd_printd(KERN_INFO "HDMI: invalid ELD data byte %d\n", i); - val = 0; - } else - val &= AC_ELDD_ELD_DATA; + ret = -EINVAL; + goto error; + } + val &= AC_ELDD_ELD_DATA; + /* + * The first byte cannot be zero. This can happen on some DVI + * connections. Some Intel chips may also need some 250ms delay + * to return non-zero ELD data, even when the graphics driver + * correctly writes ELD content before setting ELD_valid bit. + */ + if (!val && !i) { + snd_printdd(KERN_INFO "HDMI: 0 ELD data\n"); + ret = -EINVAL; + goto error; + } buf[i] = val; }

2 4

Re: [alsa-devel] [PATCH 1/3] sound/soc/codecs: add LAPIS Semiconductor ML26124
by Mark Brown 22 Nov '11

22 Nov '11

On Tue, Nov 22, 2011 at 07:47:10PM +0900, Tomoya MORINAGA wrote: > 2011/11/21 Mark Brown <broonie(a)opensource.wolfsonmicro.com> wrote: > BTW, What's TLV ? Let me know the full spell of this "TLV". Tag/Length/Value. > >> +static const struct snd_kcontrol_new ml26124_dsp_controls[] = { > >> + SOC_SINGLE("Play Limitter ON/OFF", ML26124_FILTER_EN, 0, 1, 0), > Do you mean SOC_SINGLE("Play Limitter Switch", ML26124_FILTER_EN, 0, 1, 0) ? Yes. > >> + SOC_SINGLE("Set ALC position", ML26124_FILTER_EN, 5, 1, 0), > > What does this actually do? From the name it *really* doesn't look like > > a mixer input. > The above means where connects the ALC. > So, this doesn't relate to mixer input. If this control is not a mixer input it should not be a mixer input in the driver. Though with your explanation I still don't understand what it does so presumably the naming also needs to be improved. > However I couldn't understand the meaning of the widgets. So I didn't > write anything. See Documentation/sound/alsa/soc/dapm.txt. > >> +static int snd_card_codec_reg_read(struct ml26124_priv *priv, > >> + unsigned char reg, unsigned char *val) > >> +{ > >> + unsigned char data; > >> + struct i2c_client *i2c; > > Use the standard register access code, don't open code things in your > > driver unless there's a good reason to. Current best practice for most > > I2C or SPI devices is to use regmap, see any recently added driver for > > examples. > What's "regmap" mean ? or do you mean drivers/mfd/* ? > Could you tell me this ? drivers/base/regmap and also grep in sound/soc/codecs/*.c > > Use snd_soc_update_bits() and the other standard register access > > functions. > Using snd_soc_update_bits(), need to register ".read" method. Or use a cache. > Is the same as the above snd_card_codec_reg_read ? I don't understand this question.

1 0

[alsa-devel] [PATCH 1/2] alsa: lx6464es - command buffer API cleanup
by Tim Blechmann 22 Nov '11

22 Nov '11

the command buffer is only accessed from one file, so we can declare the specific functions as static in that file Signed-off-by: Tim Blechmann <tim(a)klingt.org> --- sound/pci/lx6464es/lx_core.c | 7 ++++--- sound/pci/lx6464es/lx_core.h | 3 --- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/sound/pci/lx6464es/lx_core.c b/sound/pci/lx6464es/lx_core.c index 5c8717e..ad52f41 100644 --- a/sound/pci/lx6464es/lx_core.c +++ b/sound/pci/lx6464es/lx_core.c @@ -78,7 +78,8 @@ unsigned long lx_dsp_reg_read(struct lx6464es *chip, int port) return ioread32(address); } -void lx_dsp_reg_readbuf(struct lx6464es *chip, int port, u32 *data, u32 len) +static void lx_dsp_reg_readbuf(struct lx6464es *chip, int port, u32 *data, + u32 len) { void __iomem *address = lx_dsp_register(chip, port); memcpy_fromio(data, address, len*sizeof(u32)); @@ -91,8 +92,8 @@ void lx_dsp_reg_write(struct lx6464es *chip, int port, unsigned data) iowrite32(data, address); } -void lx_dsp_reg_writebuf(struct lx6464es *chip, int port, const u32 *data, - u32 len) +static void lx_dsp_reg_writebuf(struct lx6464es *chip, int port, + const u32 *data, u32 len) { void __iomem *address = lx_dsp_register(chip, port); memcpy_toio(address, data, len*sizeof(u32)); diff --git a/sound/pci/lx6464es/lx_core.h b/sound/pci/lx6464es/lx_core.h index 1dd5629..4d7ff79 100644 --- a/sound/pci/lx6464es/lx_core.h +++ b/sound/pci/lx6464es/lx_core.h @@ -72,10 +72,7 @@ enum { }; unsigned long lx_dsp_reg_read(struct lx6464es *chip, int port); -void lx_dsp_reg_readbuf(struct lx6464es *chip, int port, u32 *data, u32 len); void lx_dsp_reg_write(struct lx6464es *chip, int port, unsigned data); -void lx_dsp_reg_writebuf(struct lx6464es *chip, int port, const u32 *data, - u32 len); /* plx register access */ enum { -- 1.7.5.4

2 3

[alsa-devel] [bisected] lx6464es fails to open a second time
by Tim Blechmann 22 Nov '11

22 Nov '11

hi all, especially brian and takashi, some time ago, i've been developing the driver for the lx6464es ethersound sound card, which has been included into the kernel for some time. however i haven't been able to use it in kernels after 2.6.33. today, i was able to bisect the issue and the first bad commit is: commit 6175ddf06b6172046a329e3abfd9c901a43efd2e Author: Brian Gerst <brgerst(a)gmail.com> Date: Fri Feb 5 09:37:07 2010 -0500 x86: Clean up mem*io functions. Iomem has no special significance on x86. Use the standard mem* functions instead of trying to call other versions. Some fixups are needed to match the function prototypes. Signed-off-by: Brian Gerst <brgerst(a)gmail.com> LKML-Reference: <1265380629-3212-6-git-send-email-brgerst(a)gmail.com> Signed-off-by: H. Peter Anvin <hpa(a)zytor.com> the problem was: the sound card could only be started once, but i haven't been able to start it a second time, probably because the driver doesn't shut down the device correctly. the communication with the device is done by passing simple commands via memcpy_fromio and memcpy_toio (compare sound/pci/lx6464es/lx_core.c, lines 75 to 99). any idea, what is going wrong there? thanks, tim

3 3