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

[alsa-devel] [PATCH] ALSA: HDA: Realtek: Fixup jack detection to input subsystem
by David Henningsson 28 Feb '11

28 Feb '11

-- David Henningsson, Canonical Ltd. http://launchpad.net/~diwic

2 1

[alsa-devel] ASoC updates for 2.6.39
by Mark Brown 28 Feb '11

28 Feb '11

The following changes since commit 9b34e6cc3bc2bf826c078c93c81b46f6c08da25f: ASoC: Add Freescale SGTL5000 codec support (2011-02-25 12:09:33 +0000) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-2.6.39 Eric Bénard (2): eukrea-tlv320: fix platform_name ASoC: eukrea-tlv320: add MBIMXSD51 support Mark Brown (3): ASoC: Move WM2000 to dev_pm_ops Merge branch 'for-2.6.38' into for-2.6.39 ASoC: Staticise non-exported symbols in SGTL5000 Zeng Zhaoming (1): ASoC: remove unnecessary header including in SGTL5000 codec driver sound/soc/codecs/sgtl5000.c | 7 +++---- sound/soc/codecs/sgtl5000.h | 2 -- sound/soc/codecs/wm2000.c | 14 +++++++------- sound/soc/imx/Kconfig | 3 ++- sound/soc/imx/eukrea-tlv320.c | 5 +++-- 5 files changed, 15 insertions(+), 16 deletions(-)

2 1

[alsa-devel] [PATCH 0/6] hdspmixer fixes
by Adrian Knoth 28 Feb '11

28 Feb '11

Hi! Here's a collection of fixes to hdspmixer. Besides style fixes, it re-enables support for Multiface/Digiface and other non-MADI cards. The support was accidently lost when merging hdspmixer64 with hdspmixer. Today, RME has provided me with two cards (Multiface and AES32), so I had the opportunity to fix the broken bits. Also, the old code never handled three cards correctly, but that's fixed, too. (and tested against the three RME cards currently in my workstation) Cheers Adrian Knoth (6): hdspmixer: Improve code coherency hdspmixer: Update FSF address. hdspmixer: Increase height of about window. hdspmixer: Bump version number to 1.10 hdspmixer: Fix ALSA snd_ctl_open error when running with three cards. hdspmixer: Fix metering for non-MADI cards hdspmixer/configure.in | 2 +- hdspmixer/src/HDSPMixerAboutText.cxx | 13 ++- hdspmixer/src/HDSPMixerCard.cxx | 163 ++--------------------- hdspmixer/src/HDSPMixerOutput.cxx | 4 +- hdspmixer/src/HDSPMixerSelector.cxx | 7 +- hdspmixer/src/HDSPMixerWindow.cxx | 75 +++++++---- hdspmixer/src/HDSPMixerWindow.h | 4 +- hdspmixer/src/channelmap.h | 234 +++++++++++++++++++++++++++++++--- hdspmixer/src/defines.h | 4 +- hdspmixer/src/hdspmixer.cxx | 3 + hdspmixer/src/mappings.h | 93 -------------- 11 files changed, 308 insertions(+), 294 deletions(-) delete mode 100644 hdspmixer/src/mappings.h -- 1.7.2.3

2 14

[alsa-devel] [PATCH 0/4] More hdspm fixes
by Adrian Knoth 28 Feb '11

28 Feb '11

Hi! Here are four more patches to hdspm. Most importantly, they add the missing PCI firmware revision for AES32. Without it, loading hdspm would crash on machines with these cards. To prevent such a crash upon unknown firmware revisions, I've created a second patch adding a default case to the firmware switch-case statement. Also worth mentioning: midi port initialization is now no longer hardcoded, thus fixing a bootup problem on MADIface. All patches have been runtime tested on MADIface, AES32, AES (PCIe) and RayDAT. Cheers Adrian Knoth (4): ALSA: hdspm - AES32: Use define instead of hardcoded channel count ALSA: hdspm - Add updated firmware revision for AES32 ALSA: hdspm - Abort on unknown firmware revision ALSA: hdspm - Fix midi port initialization sound/pci/rme9652/hdspm.c | 24 ++++++++++++++++++------ 1 files changed, 18 insertions(+), 6 deletions(-) -- 1.7.4.1

2 5

[alsa-devel] [PATCH] ASoC: Tegra: Fix error handling in DMA channel alloc
by Stephen Warren 28 Feb '11

28 Feb '11

tegra_dma_allocate_channel() returns NULL on errors, not an error pointer. Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- sound/soc/tegra/tegra_pcm.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/tegra/tegra_pcm.c b/sound/soc/tegra/tegra_pcm.c index 40540b1..3c271f9 100644 --- a/sound/soc/tegra/tegra_pcm.c +++ b/sound/soc/tegra/tegra_pcm.c @@ -161,8 +161,8 @@ static int tegra_pcm_open(struct snd_pcm_substream *substream) prtd->dma_req[1].dev = prtd; prtd->dma_chan = tegra_dma_allocate_channel(TEGRA_DMA_MODE_ONESHOT); - if (IS_ERR(prtd->dma_chan)) { - ret = PTR_ERR(prtd->dma_chan); + if (prtd->dma_chan == NULL) { + ret = -ENOMEM; goto err; } -- 1.7.1

3 2

[alsa-devel] [PATCH] ASoC: Staticise non-exported symbols in SGTL5000
by Mark Brown 28 Feb '11

28 Feb '11

Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/sgtl5000.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c index b528f97..b7e97c0 100644 --- a/sound/soc/codecs/sgtl5000.c +++ b/sound/soc/codecs/sgtl5000.c @@ -124,7 +124,7 @@ static struct regulator_consumer_supply ldo_consumer[] = { REGULATOR_SUPPLY(LDO_CONSUMER_NAME, NULL), }; -struct regulator_init_data ldo_init_data = { +static struct regulator_init_data ldo_init_data = { .constraints = { .min_uV = 850000, .max_uV = 1600000, @@ -946,7 +946,7 @@ static int sgtl5000_set_bias_level(struct snd_soc_codec *codec, SNDRV_PCM_FMTBIT_S24_LE |\ SNDRV_PCM_FMTBIT_S32_LE) -struct snd_soc_dai_ops sgtl5000_ops = { +static struct snd_soc_dai_ops sgtl5000_ops = { .hw_params = sgtl5000_pcm_hw_params, .digital_mute = sgtl5000_digital_mute, .set_fmt = sgtl5000_set_dai_fmt, @@ -1421,7 +1421,7 @@ static int sgtl5000_remove(struct snd_soc_codec *codec) return 0; } -struct snd_soc_codec_driver sgtl5000_driver = { +static struct snd_soc_codec_driver sgtl5000_driver = { .probe = sgtl5000_probe, .remove = sgtl5000_remove, .suspend = sgtl5000_suspend, -- 1.7.2.3

2 1

[PATCH] ALSA: HDA: Realtek: Fixup jack detection to input subsystem
by David Henningsson 28 Feb '11

28 Feb '11

This patch fixes an error in the jack detection reporting, causing the jack detection sometimes not to be reported correctly to the input subsystem. It should apply to several Realtek codecs. Cc: stable(a)kernel.org Signed-off-by: David Henningsson <david.henningsson(a)canonical.com> --- sound/pci/hda/patch_realtek.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 3328a25..c052fc5 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -1133,11 +1133,8 @@ static void alc_automute_speaker(struct hda_codec *codec, int pinctl) nid = spec->autocfg.hp_pins[i]; if (!nid) break; - if (snd_hda_jack_detect(codec, nid)) { - spec->jack_present = 1; - break; - } - alc_report_jack(codec, spec->autocfg.hp_pins[i]); + alc_report_jack(codec, nid); + spec->jack_present |= snd_hda_jack_detect(codec, nid); } mute = spec->jack_present ? HDA_AMP_MUTE : 0; -- 1.7.1 --------------060702070005020905070804--

1 0

Re: [alsa-devel] [PATCH v5] ASoC: Add Freescale SGTL5000 codec support
by Mark Brown 28 Feb '11

28 Feb '11

On Fri, Feb 25, 2011 at 11:56:52PM +0800, Zeng Zhaoming wrote: > On Fri, Feb 25, 2011 at 8:09 PM, Mark Brown > > This is going to fail on systems without voltage readback capabilities, > > including systems which have the regulator API disabled and stubbed out. > if the regulator driver not allow readback, I have no way to get the > voltage of vdda and vddio, > the voltage levels are critical to codec initialization. > Can you shed some light on howto around this? If you can't read the data back you need to guess what the configuration is somehow; I'd suggest just picking values and warning about what you're doing. > >> + memcpy((void *)(&sgtl5000_regs[0] + (SGTL5000_DAP_REG_OFFSET >> 1)), > >> + sgtl5000_dap_regs, > >> + SGTL5000_MAX_REG_OFFSET - SGTL5000_DAP_REG_OFFSET); > > As has been pointed out on previous revisions of the patch there is no > > need to cast away from void in C and it can be actively harmful. > I have not remove void* since my toolchain ( gcc 4.4.4) complains > about the type mismatch, I will test > it with other version toolchain to confirm. As Timur indicated the reason this is complaining is that you're memcpy() is writing to const data. This is *clearly* buggy - the fact that casting away removes the warning is an example of why you should never have casts like this. You should take a copy of the array and modify that, having the defaults as const is correct.

1 0

[alsa-devel] [PATCH] ASoC: remove unnecessary header including in SGTL5000 codec driver
by zhaoming.zeng＠freescale.com 28 Feb '11

28 Feb '11

From: Zeng Zhaoming <b32542(a)freescale.com> Remove unnecessary headers: - mach/hardware.h in sgtl5000.c - linux/i2c.h in sgtl5000.h Signed-off-by: Zeng Zhaoming <b32542(a)freescale.com> --- sound/soc/codecs/sgtl5000.c | 1 - sound/soc/codecs/sgtl5000.h | 2 -- 2 files changed, 0 insertions(+), 3 deletions(-) diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c index 9eb206e..b528f97 100644 --- a/sound/soc/codecs/sgtl5000.c +++ b/sound/soc/codecs/sgtl5000.c @@ -27,7 +27,6 @@ #include <sound/soc.h> #include <sound/soc-dapm.h> #include <sound/initval.h> -#include <mach/hardware.h> #include "sgtl5000.h" diff --git a/sound/soc/codecs/sgtl5000.h b/sound/soc/codecs/sgtl5000.h index c29312a..eec3ab3 100644 --- a/sound/soc/codecs/sgtl5000.h +++ b/sound/soc/codecs/sgtl5000.h @@ -11,8 +11,6 @@ #ifndef _SGTL5000_H #define _SGTL5000_H -#include <linux/i2c.h> - /* * Register values. */ -- 1.7.0.4

2 1

[alsa-devel] [PATCH 1/2] acore: deprecated function in wrappers.c
by Grzegorz Daniluk 28 Feb '11

28 Feb '11

This patch replace the call of pci_find_device() to pci_get_device(). The function pci_find_device() was deprecated for quite a long time, and now it is no longer in the kernel. Signed-off-by: Grzegorz Daniluk <g.daniluk(a)elproma.com.pl> --- diff -uprN a/acore/wrappers.c b/acore/wrappers.c --- a/acore/wrappers.c 2011-01-27 12:09:20.000000000 +0000 +++ b/acore/wrappers.c 2011-02-25 13:41:46.000000000 +0000 @@ -197,7 +197,7 @@ EXPORT_SYMBOL(snd_compat_devfs_mk_cdev); int snd_pci_dev_present(const struct pci_device_id *ids) { while (ids->vendor || ids->subvendor) { - if (pci_find_device(ids->vendor, ids->subvendor, NULL)) + if (pci_get_device(ids->vendor, ids->subvendor, NULL)) return 1; ids++; }

2 5