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

[alsa-devel] [PATCH 1/2] ARM: OMAP: Trivial driver changes to remove include plat/cpu.h
by Tony Lindgren 17 Oct '12

17 Oct '12

Drivers should not use cpu_is_omap or cpu_class_is_omap macros, they should be private to the platform init code. And we'll be removing plat/cpu.h and only have a private soc.h for the arch/arm/*omap* code. This patch is intended as preparation for the core omap changes and removes the need to include plat/cpu.h from several drivers. This is needed for the ARM common zImage support. These changes are OK to do because: - omap-rng.c and hsmmc.c don't need plat/cpu.h - omap-aes.c and omap-sham.c get the proper platform_data passed to them so they don't need extra checks in the driver - omap-dma.c and omap-pcm.c can test the arch locally as omap1 and omap2 cannot be compiled together because of conflicting compiler flags Cc: Deepak Saxena <dsaxena(a)plexity.net> Cc: Matt Mackall <mpm(a)selenic.com> Cc: Herbert Xu <herbert(a)gondor.apana.org.au> Cc: David S. Miller <davem(a)davemloft.net> Cc: Venkatraman S <svenkatr(a)ti.com> Cc: Chris Ball <cjb(a)laptop.org> Cc: Vinod Koul <vinod.koul(a)intel.com> Cc: Dan Williams <djbw(a)fb.com> Cc: Peter Ujfalusi <peter.ujfalusi(a)ti.com> Cc: Jarkko Nikula <jarkko.nikula(a)bitmer.com> Cc: Liam Girdwood <lrg(a)ti.com> Cc: Mark Brown <broonie(a)opensource.wolfsonmicro.com> Cc: linux-crypto(a)vger.kernel.org Cc: linux-mmc(a)vger.kernel.org Cc: alsa-devel(a)alsa-project.org Cc: linux-kernel(a)vger.kernel.org Signed-off-by: Tony Lindgren <tony(a)atomide.com> --- drivers/char/hw_random/omap-rng.c | 2 -- drivers/crypto/omap-aes.c | 6 ------ drivers/crypto/omap-sham.c | 8 -------- drivers/dma/omap-dma.c | 9 +++++++-- drivers/mmc/host/omap_hsmmc.c | 1 - sound/soc/omap/omap-pcm.c | 9 +++++++-- 6 files changed, 14 insertions(+), 21 deletions(-) diff --git a/drivers/char/hw_random/omap-rng.c b/drivers/char/hw_random/omap-rng.c index a5effd8..45e467d 100644 --- a/drivers/char/hw_random/omap-rng.c +++ b/drivers/char/hw_random/omap-rng.c @@ -27,8 +27,6 @@ #include <asm/io.h> -#include <plat/cpu.h> - #define RNG_OUT_REG 0x00 /* Output register */ #define RNG_STAT_REG 0x04 /* Status register [0] = STAT_BUSY */ diff --git a/drivers/crypto/omap-aes.c b/drivers/crypto/omap-aes.c index 3e61feb..649a146 100644 --- a/drivers/crypto/omap-aes.c +++ b/drivers/crypto/omap-aes.c @@ -29,7 +29,6 @@ #include <crypto/scatterwalk.h> #include <crypto/aes.h> -#include <plat/cpu.h> #include <plat-omap/dma-omap.h> /* OMAP TRM gives bitfields as start:end, where start is the higher bit @@ -941,11 +940,6 @@ static int __init omap_aes_mod_init(void) { pr_info("loading %s driver\n", "omap-aes"); - if (!cpu_class_is_omap2() || omap_type() != OMAP2_DEVICE_TYPE_SEC) { - pr_err("Unsupported cpu\n"); - return -ENODEV; - } - return platform_driver_register(&omap_aes_driver); } diff --git a/drivers/crypto/omap-sham.c b/drivers/crypto/omap-sham.c index 6d79695..d76fe06 100644 --- a/drivers/crypto/omap-sham.c +++ b/drivers/crypto/omap-sham.c @@ -37,7 +37,6 @@ #include <crypto/hash.h> #include <crypto/internal/hash.h> -#include <plat/cpu.h> #include <plat-omap/dma-omap.h> #include <mach/irqs.h> @@ -1289,13 +1288,6 @@ static int __init omap_sham_mod_init(void) { pr_info("loading %s driver\n", "omap-sham"); - if (!cpu_class_is_omap2() || - (omap_type() != OMAP2_DEVICE_TYPE_SEC && - omap_type() != OMAP2_DEVICE_TYPE_EMU)) { - pr_err("Unsupported cpu\n"); - return -ENODEV; - } - return platform_driver_register(&omap_sham_driver); } diff --git a/drivers/dma/omap-dma.c b/drivers/dma/omap-dma.c index 0b4fa50..56d9253 100644 --- a/drivers/dma/omap-dma.c +++ b/drivers/dma/omap-dma.c @@ -19,9 +19,14 @@ #include "virt-dma.h" -#include <plat/cpu.h> #include <plat-omap/dma-omap.h> +#ifdef CONFIG_ARCH_OMAP2PLUS +#define dma_omap2plus() 1 +#else +#define dma_omap2plus() 0 +#endif + struct omap_dmadev { struct dma_device ddev; spinlock_t lock; @@ -438,7 +443,7 @@ static struct dma_async_tx_descriptor *omap_dma_prep_dma_cyclic( omap_disable_dma_irq(c->dma_ch, OMAP_DMA_BLOCK_IRQ); } - if (!cpu_class_is_omap1()) { + if (dma_omap2plus()) { omap_set_dma_src_burst_mode(c->dma_ch, OMAP_DMA_DATA_BURST_16); omap_set_dma_dest_burst_mode(c->dma_ch, OMAP_DMA_DATA_BURST_16); } diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c index 85b164e..24df035 100644 --- a/drivers/mmc/host/omap_hsmmc.c +++ b/drivers/mmc/host/omap_hsmmc.c @@ -40,7 +40,6 @@ #include <linux/pm_runtime.h> #include <linux/platform_data/mmc-omap.h> #include <mach/hardware.h> -#include <plat/cpu.h> /* OMAP HSMMC Host Controller Registers */ #define OMAP_HSMMC_SYSSTATUS 0x0014 diff --git a/sound/soc/omap/omap-pcm.c b/sound/soc/omap/omap-pcm.c index 340874e..52977aa 100644 --- a/sound/soc/omap/omap-pcm.c +++ b/sound/soc/omap/omap-pcm.c @@ -32,9 +32,14 @@ #include <sound/dmaengine_pcm.h> #include <sound/soc.h> -#include <plat/cpu.h> #include "omap-pcm.h" +#ifdef CONFIG_ARCH_OMAP1 +#define pcm_omap1510() cpu_is_omap1510() +#else +#define pcm_omap1510() 0 +#endif + static const struct snd_pcm_hardware omap_pcm_hardware = { .info = SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID | @@ -159,7 +164,7 @@ static snd_pcm_uframes_t omap_pcm_pointer(struct snd_pcm_substream *substream) { snd_pcm_uframes_t offset; - if (cpu_is_omap1510()) + if (pcm_omap1510()) offset = snd_dmaengine_pcm_pointer_no_residue(substream); else offset = snd_dmaengine_pcm_pointer(substream);

3 6

[alsa-devel] [PATCH] emu10k1: add chip details for E-mu 1010 PCIe card
by Maxim Kachur 17 Oct '12

17 Oct '12

emu10k1_main.c: Add chip details for E-mu 1010 PCIe card. It has the same chip as found in E-mu 1010b but it uses different PCI id. Signed-off-by: Maxim Kachur <mcdebugger(a)duganet.ru> --- sound/pci/emu10k1/emu10k1_main.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c index bed4485..c21adb6 100644 --- a/sound/pci/emu10k1/emu10k1_main.c +++ b/sound/pci/emu10k1/emu10k1_main.c @@ -1416,6 +1416,15 @@ static struct snd_emu_chip_details emu_chip_details[] = { .ca0108_chip = 1, .spk71 = 1, .emu_model = EMU_MODEL_EMU1010B}, /* EMU 1010 new revision */ + /* Tested by Maxim Kachur <mcdebugger(a)duganet.ru> 17th Oct 2012. */ + /* This is MAEM8986, 0202 is MAEM8980 */ + {.vendor = 0x1102, .device = 0x0008, .subsystem = 0x40071102, + .driver = "Audigy2", .name = "E-mu 1010 PCIe [MAEM8986]", + .id = "EMU1010", + .emu10k2_chip = 1, + .ca0108_chip = 1, + .spk71 = 1, + .emu_model = EMU_MODEL_EMU1010B}, /* EMU 1010 PCIe */ /* Tested by James(a)superbug.co.uk 8th July 2005. */ /* This is MAEM8810, 0202 is MAEM8820 */ {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x40011102, -- 1.7.8.6

2 2

[alsa-devel] [PATCH] emu10k1: add chip details for E-mu 1010 PCIe card
by Maxim Kachur 17 Oct '12

17 Oct '12

emu10k1_main.c: Add chip details for E-mu 1010 PCIe card. It has the same chip as found in E-mu 1010b but it uses different PCI id. Signed-off-by: Maxim Kachur <mcdebugger(a)duganet.ru> --- sound/pci/emu10k1/emu10k1_main.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c index bed4485..c21adb6 100644 --- a/sound/pci/emu10k1/emu10k1_main.c +++ b/sound/pci/emu10k1/emu10k1_main.c @@ -1416,6 +1416,15 @@ static struct snd_emu_chip_details emu_chip_details[] = { .ca0108_chip = 1, .spk71 = 1, .emu_model = EMU_MODEL_EMU1010B}, /* EMU 1010 new revision */ + /* Tested by Maxim Kachur <mcdebugger(a)duganet.ru> 17th Oct 2012. */ + /* This is MAEM8986, 0202 is MAEM8980 */ + {.vendor = 0x1102, .device = 0x0008, .subsystem = 0x40071102, + .driver = "Audigy2", .name = "E-mu 1010 PCIe [MAEM8986]", + .id = "EMU1010", + .emu10k2_chip = 1, + .ca0108_chip = 1, + .spk71 = 1, + .emu_model = EMU_MODEL_EMU1010B}, /* EMU 1010 PCIe */ /* Tested by James(a)superbug.co.uk 8th July 2005. */ /* This is MAEM8810, 0202 is MAEM8820 */ {.vendor = 0x1102, .device = 0x0004, .subsystem = 0x40011102, -- 1.7.8.6

1 0

[alsa-devel] [PATCH] ASoC: codecs: da9055: DAPMise Headphone and Lineout enable controls
by Ashish Chavan 17 Oct '12

17 Oct '12

This patch DAPMises headphone and lineout output enable controls. Earlier these output enable bits were permanently turned on in probe. In da9055 codec, right outmixer is directly connected with right HP and Line out. This resulted in two side effects, (1) When you only want to use lineout, right HP (and connected charge pump) also gets enabled (2) When you only want to use stereo HP, lineout also gets enabled This patch adds three switches to select which output(s) should be enabled. Signed-off-by: Ashish Chavan <ashish.chavan(a)kpitcummins.com> Signed-off-by: David Dajun Chen <david.chen(a)diasemi.com> --- sound/soc/codecs/da9055.c | 39 ++++++++++++++++++++++++++------------- 1 files changed, 26 insertions(+), 13 deletions(-) diff --git a/sound/soc/codecs/da9055.c b/sound/soc/codecs/da9055.c index abf3e43..d3a6de2 100644 --- a/sound/soc/codecs/da9055.c +++ b/sound/soc/codecs/da9055.c @@ -753,6 +753,17 @@ static const struct snd_kcontrol_new da9055_dapm_mixoutr_controls[] = { 6, 1, 0), }; +/* Headphone Output Enable */ +static const struct snd_kcontrol_new da9055_dapm_hp_l_control = +SOC_DAPM_SINGLE("Switch", DA9055_HP_L_CTRL, 3, 1, 0); + +static const struct snd_kcontrol_new da9055_dapm_hp_r_control = +SOC_DAPM_SINGLE("Switch", DA9055_HP_R_CTRL, 3, 1, 0); + +/* Lineout Output Enable */ +static const struct snd_kcontrol_new da9055_dapm_lineout_control = +SOC_DAPM_SINGLE("Switch", DA9055_LINE_CTRL, 3, 1, 0); + /* DAPM widgets */ static const struct snd_soc_dapm_widget da9055_dapm_widgets[] = { /* Input Side */ @@ -817,6 +828,14 @@ static const struct snd_soc_dapm_widget da9055_dapm_widgets[] = { &da9055_dapm_mixoutr_controls[0], ARRAY_SIZE(da9055_dapm_mixoutr_controls)), + /* Output Enable Switches */ + SND_SOC_DAPM_SWITCH("Headphone Left Enable", SND_SOC_NOPM, 0, 0, + &da9055_dapm_hp_l_control), + SND_SOC_DAPM_SWITCH("Headphone Right Enable", SND_SOC_NOPM, 0, 0, + &da9055_dapm_hp_r_control), + SND_SOC_DAPM_SWITCH("Lineout Enable", SND_SOC_NOPM, 0, 0, + &da9055_dapm_lineout_control), + /* Output PGAs */ SND_SOC_DAPM_PGA("MIXOUT Left", DA9055_MIXOUT_L_CTRL, 7, 0, NULL, 0), SND_SOC_DAPM_PGA("MIXOUT Right", DA9055_MIXOUT_R_CTRL, 7, 0, NULL, 0), @@ -902,17 +921,20 @@ static const struct snd_soc_dapm_route da9055_audio_map[] = { {"Out Mixer Right", "DAC Right Switch", "DAC Right"}, {"MIXOUT Left", NULL, "Out Mixer Left"}, - {"Headphone Left", NULL, "MIXOUT Left"}, + {"Headphone Left Enable", "Switch", "MIXOUT Left"}, + {"Headphone Left", NULL, "Headphone Left Enable"}, {"Headphone Left", NULL, "Charge Pump"}, {"HPL", NULL, "Headphone Left"}, {"MIXOUT Right", NULL, "Out Mixer Right"}, - {"Headphone Right", NULL, "MIXOUT Right"}, + {"Headphone Right Enable", "Switch", "MIXOUT Right"}, + {"Headphone Right", NULL, "Headphone Right Enable"}, {"Headphone Right", NULL, "Charge Pump"}, {"HPR", NULL, "Headphone Right"}, {"MIXOUT Right", NULL, "Out Mixer Right"}, - {"Lineout", NULL, "MIXOUT Right"}, + {"Lineout Enable", "Switch", "MIXOUT Right"}, + {"Lineout", NULL, "Lineout Enable"}, {"LINE", NULL, "Lineout"}, }; @@ -1394,8 +1416,7 @@ static int da9055_probe(struct snd_soc_codec *codec) DA9055_GAIN_RAMPING_EN, DA9055_GAIN_RAMPING_EN); /* - * There are two separate control bits for input and output mixers as - * well as headphone and line outs. + * There are two separate control bits for input and output mixers. * One to enable corresponding amplifier and other to enable its * output. As amplifier bits are related to power control, they are * being managed by DAPM while other (non power related) bits are @@ -1411,14 +1432,6 @@ static int da9055_probe(struct snd_soc_codec *codec) snd_soc_update_bits(codec, DA9055_MIXOUT_R_CTRL, DA9055_MIXOUT_R_MIX_EN, DA9055_MIXOUT_R_MIX_EN); - snd_soc_update_bits(codec, DA9055_HP_L_CTRL, - DA9055_HP_L_AMP_OE, DA9055_HP_L_AMP_OE); - snd_soc_update_bits(codec, DA9055_HP_R_CTRL, - DA9055_HP_R_AMP_OE, DA9055_HP_R_AMP_OE); - - snd_soc_update_bits(codec, DA9055_LINE_CTRL, - DA9055_LINE_AMP_OE, DA9055_LINE_AMP_OE); - /* Set this as per your system configuration */ snd_soc_write(codec, DA9055_PLL_CTRL, DA9055_PLL_INDIV_10_20_MHZ); -- 1.7.1

2 1

[alsa-devel] [PATCH 0/3] Convert to use snd_soc_register_card()
by Bo Shen 17 Oct '12

17 Oct '12

Convert to use snd_soc_register_card(), and enable it Change the id for the gpio i2c to let it work Bo Shen (3): ASoC: sam9g20-wm8731: convert to use snd_soc_register_card() ASoC: sam9g20: using platform device for audio part i2c: change the id to let the i2c-gpio work arch/arm/mach-at91/at91sam9260_devices.c | 11 ++++++- arch/arm/mach-at91/board-sam9g20ek.c | 17 ++++++++++ sound/soc/atmel/sam9g20_wm8731.c | 51 +++++++++++++----------------- 3 files changed, 49 insertions(+), 30 deletions(-) -- 1.7.9.5

2 7

[alsa-devel] [PATCH] ALSA: hda - Don't enable unsol for jacks we're polling
by David Henningsson 17 Oct '12

17 Oct '12

This will greatly reduce the frequency for detection errors in those cases where the hardware is "flaky", i e, rapidly changing between plugged and unplugged states even without user interaction. Signed-off-by: David Henningsson <david.henningsson(a)canonical.com> --- sound/pci/hda/hda_jack.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/pci/hda/hda_jack.c b/sound/pci/hda/hda_jack.c index 07d5288..5bdbada 100644 --- a/sound/pci/hda/hda_jack.c +++ b/sound/pci/hda/hda_jack.c @@ -206,6 +206,8 @@ int snd_hda_jack_detect_enable_callback(struct hda_codec *codec, hda_nid_t nid, jack->action = action; if (cb) jack->callback = cb; + if (codec->jackpoll_interval > 0) + return 0; /* No unsol if we're polling instead */ return snd_hda_codec_write_cache(codec, nid, 0, AC_VERB_SET_UNSOLICITED_ENABLE, AC_USRSP_EN | jack->tag); -- 1.7.9.5

2 1

[alsa-devel] [PATCH] hda-emu: Handle snd_BUG()
by David Henningsson 17 Oct '12

17 Oct '12

Signed-off-by: David Henningsson <david.henningsson(a)canonical.com> --- include/sound/core.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/sound/core.h b/include/sound/core.h index 57774ea..a749460 100644 --- a/include/sound/core.h +++ b/include/sound/core.h @@ -24,6 +24,7 @@ static inline int _snd_BUG_ON(int cond, const char *func, int line) return cond; } #define snd_BUG_ON(cond) _snd_BUG_ON(cond, __func__, __LINE__) +#define snd_BUG() snd_BUG_ON(1) #include "asound.h" #include "codec_config.h" -- 1.7.9.5

2 1

[alsa-devel] [PATCH] ALSA: hda - Always check array bounds in alc_get_line_out_pfx
by David Henningsson 17 Oct '12

17 Oct '12

Even when CONFIG_SND_DEBUG is not enabled, we don't want to return an arbitrary memory location when the channel count is larger than we expected. Cc: stable(a)kernel.org Signed-off-by: David Henningsson <david.henningsson(a)canonical.com> --- Notes: This was found while debugging an OOPS on kernel 3.2. See https://bugs.launchpad.net/ubuntu/+source/alsa-driver/+bug/1067269 for details. The badness calculation was improved in kernel 3.4; so not sure if the same could happen in later kernels, but at least apply to kernels <= 3.3 would make sense. Also adding to current trees (3.7, 3.8) would make sense IMO, just as extra safety. sound/pci/hda/patch_realtek.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 2d2bb66..651822c 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -2599,8 +2599,10 @@ static const char *alc_get_line_out_pfx(struct alc_spec *spec, int ch, return "PCM"; break; } - if (snd_BUG_ON(ch >= ARRAY_SIZE(channel_name))) + if (ch >= ARRAY_SIZE(channel_name)) { + snd_BUG(); return "PCM"; + } return channel_name[ch]; } -- 1.7.9.5

2 1

[alsa-devel] ASoC updates for 3.7
by Mark Brown 17 Oct '12

17 Oct '12

The following changes since commit 9911f7f7562a25381eff93fdc660a4a3b4c0f6e0: ASoC: codecs: Add DA9055 codec driver (2012-09-28 14:21:54 +0100) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-3.7 for you to fetch changes up to 9233ef6b559faa3db14144f41dea2e70d1ad0092: ASoC: bells: Correct typo in sub speaker DAI name for WM5110 (2012-10-17 19:01:38 +0900) ---------------------------------------------------------------- ASoC: Fixes for v3.7 Nothing too exciting except for the ams-delta change which is relatively lerge due to the fact that the driver loading had been totally broken as the driver needed a newer API to function. ---------------------------------------------------------------- Ashish Chavan (1): ASoC: codecs: da9055: Minor improvement in ALC calibration process Chris Ball (1): ARM: pxa: Fix build error caused by sram.h rename Guennadi Liakhovetski (1): ASoC: fsi: don't reschedule DMA from an atomic context Janusz Krzysztofik (1): ASoC: ams-delta: Convert to use snd_soc_register_card() Mark Brown (5): Merge branches 'asoc-twl6040' and 'asoc-omap' into for-3.7 ASoC: bells: Correct typo in sub speaker DAI name for WM5110 ASoC: wm2200: Use rev A register patches on rev B ASoC: wm2200: Fix non-inverted OUT2 mute control ASoC: bells: Correct typo in sub speaker DAI name for WM5110 Peter Meerwald (1): ASoC: fix documentation in soc-jack Peter Ujfalusi (4): ASoC: twl6040: Fix Stream DAPM mapping ASoC: omap-abe-twl6040: Fix typo of Vibrator ASoC: omap-mcpdm: Remove OMAP revision check ASoC: dmaengine: Correct Makefile when sound is built as module Tony Lindgren (1): ASoC: Fix wrong include for McPDM arch/arm/mach-omap1/board-ams-delta.c | 12 +++++++ sound/soc/Makefile | 5 +-- sound/soc/codecs/da9055.c | 22 +++++++++++- sound/soc/codecs/twl6040.c | 8 ++--- sound/soc/codecs/wm2200.c | 3 +- sound/soc/omap/ams-delta.c | 63 ++++++++++++++++----------------- sound/soc/omap/omap-abe-twl6040.c | 2 +- sound/soc/omap/omap-mcpdm.c | 9 ++--- sound/soc/pxa/mmp-pcm.c | 2 +- sound/soc/samsung/bells.c | 4 +-- sound/soc/sh/fsi.c | 15 ++++---- sound/soc/soc-jack.c | 7 ++-- 12 files changed, 90 insertions(+), 62 deletions(-)

2 1

[alsa-devel] ALSA hda_intel.c:834 spurious response ... ?
by Oleksij Rempel 17 Oct '12

17 Oct '12

Hallo all, i get with latest linus master fallowing messages after resume from suspend to ram: [ 9188.636589] ALSA hda_intel.c:834 spurious response 0x0:0x0, last cmd=0x170500 [ 9188.636592] ALSA hda_intel.c:834 spurious response 0x0:0x0, last cmd=0x170500 [ 9188.636595] ALSA hda_intel.c:834 spurious response 0x0:0x3, last cmd=0x301f0500 [ 9188.636598] ALSA hda_intel.c:834 spurious response 0x0:0x3, last cmd=0x301f0500 [ 9188.636601] ALSA hda_intel.c:834 spurious response 0x0:0x3, last cmd=0x301f0500 [ 9188.636604] ALSA hda_intel.c:834 spurious response 0x9000094:0x3, last cmd=0x301f0500 [ 9188.636606] ALSA hda_intel.c:834 spurious response 0x0:0x3, last cmd=0x301f0500 is it some thing you need to know? For more info see attached dmesg. -- Regards, Oleksij

2 3