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

[alsa-devel] [PATCH 00/20] ASoC: add imx-sgtl5000 machine driver working with fsl_ssi
by Shawn Guo 06 Mar '12

06 Mar '12

It's the full series adding imx-sgtl5000 machine driver which works with fsl_ssi driver on DT based imx platforms. - Patches 1 ~ 5: Convert audmux driver to a platform driver and move it into ASoC folder. - Patches 6 ~ 12: Merge ASoC imx and fsl folders. - Patches 13 ~17: Make fsl_ssi work for imx. - Patches 18 ~ 20: Add imx-sgtl5000 machine driver which supports DT only. It's based on sound/for-next and tested on imx51-babbage board with necessary platform/dts changes, which will be posted separately after the ASoC changes get merged. Regards, Shawn Richard Zhao (2): ARM: imx: convert audmux to a platform driver ASoC: fsl: add dt support for imx-audmux Shawn Guo (18): ASoC: imx: move eukrea audmux call into ASoC machine driver ASoC: imx: move phycore audmux call into ASoC machine driver ARM: imx: merge audmux-v1 and audmux-v2 ASoC: imx: move audmux driver into sound/soc/imx ASoC: imx: rename audmux prefix mxc to imx ASoC: imx: move SND_SOC_AC97_BUS selection down to machine driver ASoC: imx: initialize dma_params burstsize just in imx-ssi ASoC: imx: separate imx-pcm bits from imx-ssi driver ASoC: imx: add an explicit Kconfig option for imx-ssi driver ASoC: fsl: separate SSI and DMA Kconfig options ASoC: imx: merge sound/soc/imx into sound/soc/fsl ASoC: fsl: create fsl_utils to accommodate the common functions ASoC: fsl: check property 'compatible' for the machine name ASoC: fsl: make fsl_ssi driver compilable on ARM/IMX ASoC: fsl: remove the fatal error checking on codec-handle ASoC: fsl: let fsl_ssi work with imx pcm and machine drivers ASoC: rename sgtl5000 device tree binding document ASoC: fsl: add imx-sgtl5000 machine driver .../bindings/sound/imx-audio-sgtl5000.txt | 24 +++ .../devicetree/bindings/sound/imx-audmux.txt | 13 ++ .../{soc/codecs/fsl-sgtl5000.txt => sgtl5000.txt} | 0 arch/arm/mach-imx/Kconfig | 6 - arch/arm/mach-imx/eukrea_mbimx27-baseboard.c | 27 +-- arch/arm/mach-imx/eukrea_mbimxsd-baseboard.c | 1 - arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c | 24 +-- arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c | 24 +-- arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 7 + arch/arm/mach-imx/mach-mx31ads.c | 6 + arch/arm/mach-imx/mach-pca100.c | 20 +-- arch/arm/mach-imx/mach-pcm043.c | 20 +-- arch/arm/plat-mxc/Kconfig | 6 - arch/arm/plat-mxc/Makefile | 2 - arch/arm/plat-mxc/audmux-v1.c | 64 ------ arch/arm/plat-mxc/include/mach/audmux.h | 60 ------ sound/soc/Kconfig | 1 - sound/soc/Makefile | 1 - sound/soc/fsl/Kconfig | 124 +++++++++++- sound/soc/fsl/Makefile | 29 +++- sound/soc/{imx => fsl}/eukrea-tlv320.c | 42 ++++- sound/soc/fsl/fsl_ssi.c | 146 ++++++++++---- sound/soc/fsl/fsl_utils.c | 135 +++++++++++++ sound/soc/fsl/fsl_utils.h | 27 +++ .../audmux-v2.c => sound/soc/fsl/imx-audmux.c | 185 +++++++++++++----- sound/soc/fsl/imx-audmux.h | 60 ++++++ sound/soc/{imx => fsl}/imx-pcm-dma-mx2.c | 7 +- sound/soc/{imx => fsl}/imx-pcm-fiq.c | 0 sound/soc/fsl/imx-pcm.c | 105 ++++++++++ sound/soc/fsl/imx-pcm.h | 32 +++ sound/soc/fsl/imx-sgtl5000.c | 210 ++++++++++++++++++++ sound/soc/{imx => fsl}/imx-ssi.c | 92 +--------- sound/soc/{imx => fsl}/imx-ssi.h | 16 +-- sound/soc/fsl/mpc8610_hpcd.c | 159 ++-------------- sound/soc/{imx => fsl}/mx27vis-aic32x4.c | 20 +- sound/soc/fsl/p1022_ds.c | 181 ++---------------- sound/soc/{imx => fsl}/phycore-ac97.c | 27 +++- sound/soc/{imx => fsl}/wm1133-ev1.c | 25 ++-- sound/soc/imx/Kconfig | 60 ------ sound/soc/imx/Makefile | 19 -- 40 files changed, 1163 insertions(+), 844 deletions(-)

9 64

[alsa-devel] [PATCH] ASoC: tegra: Remove unused variable
by Stephen Warren 06 Mar '12

06 Mar '12

From: Stephen Warren <swarren(a)wwwdotorg.org> Fixes the following warning: sound/soc/tegra/tegra_alc5632.c: In function 'tegra_alc5632_asoc_init': sound/soc/tegra/tegra_alc5632.c:118:6: warning: unused variable 'ret' [-Wunused-variable] Signed-off-by: Stephen Warren <swarren(a)wwwdotorg.org> --- sound/soc/tegra/tegra_alc5632.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/sound/soc/tegra/tegra_alc5632.c b/sound/soc/tegra/tegra_alc5632.c index 2a27725..e45ccd8 100644 --- a/sound/soc/tegra/tegra_alc5632.c +++ b/sound/soc/tegra/tegra_alc5632.c @@ -115,7 +115,6 @@ static int tegra_alc5632_asoc_init(struct snd_soc_pcm_runtime *rtd) struct snd_soc_dapm_context *dapm = &codec->dapm; struct device_node *np = codec->card->dev->of_node; struct tegra_alc5632 *machine = snd_soc_card_get_drvdata(codec->card); - int ret; snd_soc_jack_new(codec, "Headset Jack", SND_JACK_HEADSET, &tegra_alc5632_hs_jack); -- 1.7.0.4

2 1

[alsa-devel] Drivers from tiwai/sound.git - module snd_seq_midi not compiled?
by Pavel Hofman 06 Mar '12

06 Mar '12

Hi, My midi keyboard is not listed in aconnect -i -l upon installing drivers from Takashi's git using gitcompile/make install. However, when I reinstall the whole kernel package 3.1.5 (from some ubuntu ppa), the midi works ok again. I compared loaded modules and found out for my hand-compiled drivers from git the module snd_seq_midi is missing. I re-run the compilation. Here is what I get at the beginning: utils/mod-deps --basedir /home/pavel/projects/alsa-tiwai/alsa-driver-build/alsa-kernel --hiddendir /home/pavel/projects/alsa-tiwai/alsa-driver-build --versiondep /home/pavel/projects/alsa-tiwai/alsa-driver-build/kconfig-vers --makeconf > toplevel.config.in can't handle 'default SND_SEQUENCER && SND_RAWMIDI', translating as depends on can't handle 'default SND_SEQUENCER && SND_OPL3_LIB', translating as depends on can't handle 'default SND_SEQUENCER && SND_OPL4_LIB', translating as depends on can't handle 'default SND_SEQUENCER && SND_SBAWE', translating as depends on can't handle 'default SND_SEQUENCER && SND_EMU10K1', translating as depends on can't handle 'default SND_FM801 || SND_ES1968 || RADIO_SF16FMR2', translating as depends on can't handle word INPUT=y properly, supposing it's OK can't handle word INPUT=SND_ES1968 properly, supposing it's OK can't handle word VIDEO_V4L2=y properly, supposing it's OK can't handle word VIDEO_V4L2=SND_ES1968 properly, supposing it's OK can't handle word VIDEO_V4L2=y properly, supposing it's OK can't handle word VIDEO_V4L2=SND_FM801 properly, supposing it's OK can't handle word INPUT=y properly, supposing it's OK can't handle word INPUT=SND_HDA_INTEL properly, supposing it's OK can't handle word SND_HDA_INPUT_BEEP=y properly, supposing it's OK can't handle word INPUT=y properly, supposing it's OK can't handle word INPUT=SND properly, supposing it's OK can't handle word INPUT=y properly, supposing it's OK can't handle word INPUT=SND_MAESTRO3 properly, supposing it's OK can't handle word INPUT=y properly, supposing it's OK can't handle word INPUT=SND_USB_CAIAQ properly, supposing it's OK can't handle word I2C=y properly, supposing it's OK can't handle word I2C=y properly, supposing it's OK can't handle word I2C=y properly, supposing it's OK utils/mod-deps --basedir /home/pavel/projects/alsa-tiwai/alsa-driver-build/alsa-kernel --hiddendir /home/pavel/projects/alsa-tiwai/alsa-driver-build --versiondep /home/pavel/projects/alsa-tiwai/alsa-driver-build/kconfig-vers --acinclude > acinclude.m4 can't handle 'default SND_SEQUENCER && SND_RAWMIDI', translating as depends on can't handle 'default SND_SEQUENCER && SND_OPL3_LIB', translating as depends on can't handle 'default SND_SEQUENCER && SND_OPL4_LIB', translating as depends on can't handle 'default SND_SEQUENCER && SND_SBAWE', translating as depends on can't handle 'default SND_SEQUENCER && SND_EMU10K1', translating as depends on can't handle 'default SND_FM801 || SND_ES1968 || RADIO_SF16FMR2', translating as depends on can't handle word INPUT=y properly, supposing it's OK can't handle word INPUT=SND_ES1968 properly, supposing it's OK can't handle word VIDEO_V4L2=y properly, supposing it's OK can't handle word VIDEO_V4L2=SND_ES1968 properly, supposing it's OK can't handle word VIDEO_V4L2=y properly, supposing it's OK can't handle word VIDEO_V4L2=SND_FM801 properly, supposing it's OK can't handle word INPUT=y properly, supposing it's OK can't handle word INPUT=SND_HDA_INTEL properly, supposing it's OK can't handle word SND_HDA_INPUT_BEEP=y properly, supposing it's OK can't handle word INPUT=y properly, supposing it's OK can't handle word INPUT=SND properly, supposing it's OK can't handle word INPUT=y properly, supposing it's OK can't handle word INPUT=SND_MAESTRO3 properly, supposing it's OK can't handle word INPUT=y properly, supposing it's OK can't handle word INPUT=SND_USB_CAIAQ properly, supposing it's OK can't handle word I2C=y properly, supposing it's OK can't handle word I2C=y properly, supposing it's OK can't handle word I2C=y properly, supposing it's OK utils/mod-deps --basedir /home/pavel/projects/alsa-tiwai/alsa-driver-build/alsa-kernel --hiddendir /home/pavel/projects/alsa-tiwai/alsa-driver-build --versiondep /home/pavel/projects/alsa-tiwai/alsa-driver-build/kconfig-vers --include > include/config1.h.in can't handle 'default SND_SEQUENCER && SND_RAWMIDI', translating as depends on can't handle 'default SND_SEQUENCER && SND_OPL3_LIB', translating as depends on can't handle 'default SND_SEQUENCER && SND_OPL4_LIB', translating as depends on can't handle 'default SND_SEQUENCER && SND_SBAWE', translating as depends on can't handle 'default SND_SEQUENCER && SND_EMU10K1', translating as depends on can't handle 'default SND_FM801 || SND_ES1968 || RADIO_SF16FMR2', translating as depends on can't handle word INPUT=y properly, supposing it's OK can't handle word INPUT=SND_ES1968 properly, supposing it's OK In config.status there is S["CONFIG_SND_RAWMIDI_SEQ"]="" I assume there should be "m" instead. And there is no D["CONFIG_SND_RAWMIDI_SEQ_MODULE"]=" 1" in config.status, only: D["CONFIG_SND_RAWMIDI_MODULE"]=" 1" D["CONFIG_SND_SEQUENCER_MODULE"]=" 1" ... As a result, the source acore/seq/seq_midi.c does not get compiled at all. pavel@nahore:~/projects/alsa-tiwai/alsa-driver-build$ ls -l acore/seq/ .... -rw-r--r-- 1 pavel pavel 13124 2012-03-04 21:53 seq_memory.c -rw-r--r-- 1 pavel pavel 12745 2012-03-04 21:53 seq_memory.c.orig -rw-r--r-- 1 pavel pavel 126440 2012-03-04 21:54 seq_memory.o -rw-r--r-- 1 pavel pavel 1112 2012-03-04 21:41 seq_memory.patch -rw-r--r-- 1 pavel pavel 89 2012-03-04 21:41 seq_midi.c <=== -rw-r--r-- 1 pavel pavel 75 2012-03-04 21:41 seq_midi_emul.c -rw-r--r-- 1 pavel pavel 93676 2012-03-04 21:54 seq_midi_emul.o -rw-r--r-- 1 pavel pavel 76 2012-03-04 21:41 seq_midi_event.c -rw-r--r-- 1 pavel pavel 95992 2012-03-04 21:54 seq_midi_event.o -rw-r--r-- 1 pavel pavel 101100 2012-03-04 21:54 seq.o -rw-r--r-- 1 pavel pavel 762 2012-03-04 21:41 seq.patch -rw-r--r-- 1 pavel pavel 94 2012-03-04 21:41 seq_ports.c -rw-r--r-- 1 pavel pavel 125464 2012-03-04 21:54 seq_ports.o .... Thanks a lot for any suggestion or help. Best regards, Pavel.

3 4

Re: [alsa-devel] Query about regmap SPI
by Ashish Chavan 06 Mar '12

06 Mar '12

On Tue, 2012-03-06 at 20:15 +0530, Ashish Chavan wrote: > On Tue, Mar 06, 2012 at 12:53:51PM +0500, Ashish Chavan wrote: > > Please always CC the relevant mailing lists on postings. I shouldn't > need to remind you about this stuff. Yes, I agree :-( It's my mistake that I missed linux-kernel(a)vger.kernel.org > No, implementing stuff like this in individual device drivers rather > defeats the point of having frameworks. It sounds like it should be > trivial to add support for this to regmap. I also think that there should be a way to handle this kind of stuff by the framework. May I know if you have any plan to add this to regmap? or should I come up with a patch to extend regmap to support this and propose you?

2 3

[alsa-devel] [PATCH] ASoC: DAPM - Use dev_err for debugfs error message.
by Liam Girdwood 06 Mar '12

06 Mar '12

Remove printk(KERN_ERR) and use dev_err() instead. Signed-off-by: Liam Girdwood <lrg(a)ti.com> --- sound/soc/soc-dapm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index a4d4aa1..8ad63b3 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -1667,7 +1667,7 @@ void snd_soc_dapm_debugfs_init(struct snd_soc_dapm_context *dapm, dapm->debugfs_dapm = debugfs_create_dir("dapm", parent); if (!dapm->debugfs_dapm) { - printk(KERN_WARNING + dev_err(dapm->dev, "Failed to create DAPM debugfs directory\n"); return; } -- 1.7.5.4

2 1

[alsa-devel] [PATCH][RFC] intel-hda: proper support for Asus N55SF/N75SF laptops with external subwoofer
by Andrew 06 Mar '12

06 Mar '12

Hello all, The following patch adds full support for Asus Laptops N55SF/N75SF (Possibly more models) with external subwoofer. It adds a new model (asus-nx5) and proper PCIID detection. Example asoundrc for upmixing and dmix is attached as well. (Thanks to K900 from AgiliaLinux dev. conference for it as well as testing on N55SF) Currently everything is supported except Subwoofer pin autosensing. It is somehow implemented in windows drivers, but I couldn't get it neither via codec's gpio or regular 0x16 unsol event. In 2ch mode the subwoofer is off, so should save a little bit of battery. I couldn't test automic feature and spdif, because I don't have the hardware around. Since alc662_quirks.c looks a little bit overbloated, I moved my quirks to a separate file. If that's not OK, I'll resubmit the patch. (This is my first patch to alsa-devel, so I might be missing something) Regards, Andrew

2 1

[alsa-devel] ASoC updates for 3.4
by Mark Brown 06 Mar '12

06 Mar '12

The following changes since commit ad20ff920c1fd217578e2c637dd50c1878a21c06: ASoC: wm8753: fix initialization (2012-03-04 14:34:44 +0000) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-3.4 for you to fetch changes up to 9d5ef2663fe220a88412a7190942b7d933da0333: ASoC: fsl: add dt support for imx-audmux (2012-03-06 12:44:21 +0000) ---------------------------------------------------------------- A few more ASoC updates, the main one is the move of the audmux driver from arch/arm into sound/soc. There's also some general driver specific tweaks and fixes. ---------------------------------------------------------------- Axel Lin (1): ASoC: Add missing regmap_init_i2c in wm8804_i2c_probe Mark Brown (4): ASoC: dapm: Show if widgets are forced in debugfs ASoC: wm8994: Use audio mode for jack detection when system is active ASoC: wm8962: Remove unneeded pm_runtime_set_active() ASoC: wm8962: Remove defaults for volatile registers Richard Zhao (2): ARM: imx: convert audmux to a platform driver ASoC: fsl: add dt support for imx-audmux Shawn Guo (7): ASoC: imx: move eukrea audmux call into ASoC machine driver ASoC: imx: move phycore audmux call into ASoC machine driver ARM: imx: merge audmux-v1 and audmux-v2 ASoC: imx: move audmux driver into sound/soc/imx ASoC: imx: rename audmux prefix mxc to imx ASoC: imx: separate imx-pcm bits from imx-ssi driver ASoC: imx: add an explicit Kconfig option for imx-ssi driver .../devicetree/bindings/sound/imx-audmux.txt | 13 ++ arch/arm/mach-imx/Kconfig | 6 - arch/arm/mach-imx/eukrea_mbimx27-baseboard.c | 20 -- arch/arm/mach-imx/eukrea_mbimxsd-baseboard.c | 1 - arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c | 17 -- arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c | 17 -- arch/arm/mach-imx/mach-pca100.c | 13 -- arch/arm/mach-imx/mach-pcm043.c | 13 -- arch/arm/mach-imx/mm-imx21.c | 6 + arch/arm/mach-imx/mm-imx25.c | 7 + arch/arm/mach-imx/mm-imx27.c | 7 + arch/arm/mach-imx/mm-imx3.c | 13 ++ arch/arm/mach-imx/mm-imx5.c | 22 +++ arch/arm/plat-mxc/Kconfig | 6 - arch/arm/plat-mxc/Makefile | 2 - arch/arm/plat-mxc/audmux-v1.c | 64 ------- arch/arm/plat-mxc/include/mach/audmux.h | 60 ------- sound/soc/codecs/wm8804.c | 6 + sound/soc/codecs/wm8962.c | 18 +-- sound/soc/codecs/wm8994.c | 77 +++++--- sound/soc/codecs/wm8994.h | 1 + sound/soc/imx/Kconfig | 21 ++- sound/soc/imx/Makefile | 15 +- sound/soc/imx/eukrea-tlv320.c | 40 ++++- .../audmux-v2.c => sound/soc/imx/imx-audmux.c | 185 +++++++++++++++----- sound/soc/imx/imx-audmux.h | 60 +++++++ sound/soc/imx/imx-pcm-dma-mx2.c | 2 +- sound/soc/imx/imx-pcm.c | 105 +++++++++++ sound/soc/imx/imx-pcm.h | 32 ++++ sound/soc/imx/imx-ssi.c | 88 --------- sound/soc/imx/imx-ssi.h | 16 +-- sound/soc/imx/mx27vis-aic32x4.c | 20 +- sound/soc/imx/phycore-ac97.c | 27 +++- sound/soc/imx/wm1133-ev1.c | 25 ++-- sound/soc/soc-dapm.c | 5 +- 35 files changed, 581 insertions(+), 449 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/imx-audmux.txt delete mode 100644 arch/arm/plat-mxc/audmux-v1.c delete mode 100644 arch/arm/plat-mxc/include/mach/audmux.h rename arch/arm/plat-mxc/audmux-v2.c => sound/soc/imx/imx-audmux.c (52%) create mode 100644 sound/soc/imx/imx-audmux.h create mode 100644 sound/soc/imx/imx-pcm.c create mode 100644 sound/soc/imx/imx-pcm.h

2 1

[alsa-devel] [PATCH] ASoC: Add missing regmap_init_i2c in wm8804_i2c_probe
by Axel Lin 06 Mar '12

06 Mar '12

commit 891271c "ASoC: Convert wm8804 to direct regmap API usage" only converts wm8804_spi_probe to use regmap_init_spi. This patch adds missing regmap_init_i2c in wm8804_i2c_probe. Signed-off-by: Axel Lin <axel.lin(a)gmail.com> --- sound/soc/codecs/wm8804.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/sound/soc/codecs/wm8804.c b/sound/soc/codecs/wm8804.c index 7ee8dcf..6bd1b76 100644 --- a/sound/soc/codecs/wm8804.c +++ b/sound/soc/codecs/wm8804.c @@ -755,6 +755,12 @@ static __devinit int wm8804_i2c_probe(struct i2c_client *i2c, if (!wm8804) return -ENOMEM; + wm8804->regmap = regmap_init_i2c(i2c, &wm8804_regmap_config); + if (IS_ERR(wm8804->regmap)) { + ret = PTR_ERR(wm8804->regmap); + return ret; + } + i2c_set_clientdata(i2c, wm8804); ret = snd_soc_register_codec(&i2c->dev, -- 1.7.5.4

2 1

[alsa-devel] Query about regmap SPI
by Ashish Chavan 06 Mar '12

06 Mar '12

Hi, I am planning to add SPI support for da7210 codec driver. SPI for this codec has slightly different format than others. It has 8 bit register address and 8 bit data. Out of 8 bits of register address, one bit (i.e. LSB) is used to indicate read or write. Value of 1 at LSB denotes READ while value of 0 at LSB denotes write operation. Thus in order for SPI READ to work correctly, the register address need to be left shifted by one and then ORed with 0x1. In the same way for SPI WRITE to work correctly, it need to be left shifted by one. I have gone though the regmap sources and found that ORing can be achieved by setting correct read_flag_mask. But I couldn't find anything by which I can tell regmap core to shift the register address before ORing it with read_flag_mask. Am I missing anything here? Is there any other way to achieve this using regmap? The only other way I can think of is providing a wrapper function to read and write in codec driver and doing the shifting job inside that wrapper. TIA!

2 1

Re: [alsa-devel] [PATCH v6] sound/soc/codecs: add LAPIS Semiconductor ML26124
by Mark Brown 06 Mar '12

06 Mar '12

On Tue, Mar 06, 2012 at 12:03:20PM +0900, Tomoya MORINAGA wrote: > 2012年3月2日21:58 Mark Brown <broonie(a)opensource.wolfsonmicro.com>: > >> Let me know why I should use SND_SOC_REGMAP not _I2C. > > Have you checked what _I2C and _REGMAP do? > I've just checked it. > If SND_SOC_REGMAP is used, it seems there is no processing in it. This is not the case. > So, can I delete snd_soc_codec_set_cache_io ? No. > > Use module_i2c_driver(). > I understand. > As a matter of interest, why can I use module_i2c_driver ? It is best practice. > There is no ASoC driver uses module_i2c_driver. This is not the case. As I have *REPEATEDLY* told you you should be sumbitting code against current development versions of the subsystem. > >> +static int ml26124_update_bits(struct snd_soc_codec *codec, unsigned short reg, > >> + unsigned int mask, unsigned int value) > > Why are you open coding this in your driver? There is no point in > > replicating subsystem functionality. > For ML26124 spec, it's necessary. > Because the codec's register read-address and write-address is not the same. > E.G. > Sampling Rate Register > R: offset=0 > W: offset=1 This is not what the above prototype says, the above prototype has only one register in it. You need to make this *much* clearer for the registers it's affecting.

1 0