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

[alsa-devel] [PATCH 3/3] sb_mixer: Add extended SB16 mixer controls for newer chips
by Ondrej Zary 22 May '12

22 May '12

Newer SB16 chips (Vibra 16C and later) have extended mixer controls. This detects them and enables automatically if present. Supported extended controls: Synth Playback Switch PCM Playback Switch Beep Playback Switch Master Playback Switch PCM Capture Switch Master Capture Volume Master Capture Switch Vibra 16XV has an additional Aux input which is used on SF16-FMD and SF16-FMD2 cards to connect the onboard FM tuner: Aux Playback Switch Aux Volume Aux Capture Switch Signed-off-by: Ondrej Zary <linux(a)rainbow-software.org> --- a/include/sound/sb.h +++ b/include/sound/sb.h @@ -214,6 +214,12 @@ struct snd_sb { #define SB_DSP4_IGAIN_DEV 0x3f #define SB_DSP4_OGAIN_DEV 0x41 #define SB_DSP4_MIC_AGC 0x43 +/* extended registers for newer SB16 */ +#define SB_DSP4_OUTPUT2_SW 0x48 +#define SB_DSP4_MASTER_SW 0x49 +#define SB_DSP4_INPUT2_SW 0x4a +#define SB_DSP4_MASTER_REC_DEV 0x50 +#define SB_DSP4_AUX_DEV 0x52 /* additional registers for SB 16 mixer */ #define SB_DSP4_IRQSETUP 0x80 --- a/sound/isa/sb/sb_mixer.c +++ b/sound/isa/sb/sb_mixer.c @@ -615,6 +615,38 @@ static struct sbmix_elem snd_sb16_gain_ctls[] = { SB_DSP4_OGAIN_DEV, (SB_DSP4_OGAIN_DEV + 1), 6, 6, 3), }; +static struct sbmix_elem snd_sb16_output2_ctls[] = { + SB_DOUBLE("Synth Playback Switch", + SB_DSP4_OUTPUT2_SW, SB_DSP4_OUTPUT2_SW, 4, 3, 1), + SB_DOUBLE("PCM Playback Switch", + SB_DSP4_OUTPUT2_SW, SB_DSP4_OUTPUT2_SW, 2, 1, 1), + SB_SINGLE("Beep Playback Switch", SB_DSP4_OUTPUT2_SW, 0, 1), +}; + +static struct sbmix_elem snd_sb16_master_sw_ctl = + SB_DOUBLE("Master Playback Switch", + SB_DSP4_MASTER_SW, SB_DSP4_MASTER_SW, 3, 2, 1); + +static struct sbmix_elem snd_sb16_pcm_capture_sw_ctl = + SB_DOUBLE("PCM Capture Switch", + SB_DSP4_INPUT2_SW, SB_DSP4_INPUT2_SW, 1, 0, 1); + +static struct sbmix_elem snd_sb16_master_rec_ctls[] = { + SB_DOUBLE("Master Capture Volume", + SB_DSP4_MASTER_REC_DEV, (SB_DSP4_MASTER_REC_DEV + 1), 3, 3, 31), + SB_DOUBLE("Master Capture Switch", + SB_DSP4_MASTER_SW, SB_DSP4_MASTER_SW, 1, 0, 1), +}; + +static struct sbmix_elem snd_sb16_aux_ctls[] = { + SB_DOUBLE("Aux Playback Switch", + SB_DSP4_OUTPUT2_SW, SB_DSP4_OUTPUT2_SW, 6, 5, 1), + SB_DOUBLE("Aux Volume", + SB_DSP4_AUX_DEV, (SB_DSP4_AUX_DEV + 1), 3, 3, 31), + SB_DOUBLE("Aux Capture Switch", + SB_DSP4_INPUT2_SW, SB_DSP4_INPUT2_SW, 3, 2, 1), +}; + static struct sbmix_elem snd_sb16_3d_ctl = SB_SINGLE("3D Control - Switch", SB_DSP4_3DSE, 0, 1); @@ -789,6 +821,43 @@ static int snd_sbmixer_sb16_opt_init(struct snd_sb *chip) if (err < 0) return err; } + /* CT8903 has the following registers but they don't do anything */ + if (sb16_type == CT8903) + return 0; + /* additional playback switches */ + if ((snd_sbmixer_read(chip, SB_DSP4_OUTPUT2_SW) & 0x9f) == 0x1f) + for (idx = 0; idx < ARRAY_SIZE(snd_sb16_output2_ctls); idx++) { + err = snd_sbmixer_add_ctl_elem(chip, &snd_sb16_output2_ctls[idx]); + if (err < 0) + return err; + } + /* master playback switch */ + if ((snd_sbmixer_read(chip, SB_DSP4_MASTER_SW) & 0xfc) == 0x0c) { + err = snd_sbmixer_add_ctl_elem(chip, &snd_sb16_master_sw_ctl); + if (err < 0) + return err; + } + /* PCM capture switch */ + snd_sbmixer_write(chip, SB_DSP4_INPUT2_SW, 0xff); + if ((snd_sbmixer_read(chip, SB_DSP4_INPUT2_SW) & 0xf3) == 0x03) { + err = snd_sbmixer_add_ctl_elem(chip, &snd_sb16_pcm_capture_sw_ctl); + if (err < 0) + return err; + } + /* master capture volume + switch (CT2511) */ + if (snd_sbmixer_read(chip, SB_DSP4_MASTER_REC_DEV) == 0xe0) + for (idx = 0; idx < ARRAY_SIZE(snd_sb16_master_rec_ctls); idx++) { + err = snd_sbmixer_add_ctl_elem(chip, &snd_sb16_master_rec_ctls[idx]); + if (err < 0) + return err; + } + /* Aux input + switches (CT2511) */ + if (snd_sbmixer_read(chip, SB_DSP4_AUX_DEV) == 0xc0) + for (idx = 0; idx < ARRAY_SIZE(snd_sb16_aux_ctls); idx++) { + err = snd_sbmixer_add_ctl_elem(chip, &snd_sb16_aux_ctls[idx]); + if (err < 0) + return err; + } return 0; } -- Ondrej Zary

1 0

[alsa-devel] [PATCH 1/3] sb_mixer: Correct SB16 mixer control names
by Ondrej Zary 22 May '12

22 May '12

SB16 volume controls affect both playback and recording. Correct the volume controls to match that. (Beep volume was already correct). Correct misleading "Capture Volume" and "Playback Volume" names - they're in fact gain controls. Also change "3D Enhancement Switch" to standard name "3D Control - Switch". Signed-off-by: Ondrej Zary <linux(a)rainbow-software.org> --- a/sound/isa/sb/sb_mixer.c +++ b/sound/isa/sb/sb_mixer.c @@ -579,31 +579,31 @@ static struct sbmix_elem snd_sb16_controls[] = { SB_DSP4_PCM_DEV, (SB_DSP4_PCM_DEV + 1), 3, 3, 31), SB16_INPUT_SW("Synth Capture Route", SB_DSP4_INPUT_LEFT, SB_DSP4_INPUT_RIGHT, 6, 5), - SB_DOUBLE("Synth Playback Volume", + SB_DOUBLE("Synth Volume", SB_DSP4_SYNTH_DEV, (SB_DSP4_SYNTH_DEV + 1), 3, 3, 31), SB16_INPUT_SW("CD Capture Route", SB_DSP4_INPUT_LEFT, SB_DSP4_INPUT_RIGHT, 2, 1), SB_DOUBLE("CD Playback Switch", SB_DSP4_OUTPUT_SW, SB_DSP4_OUTPUT_SW, 2, 1, 1), - SB_DOUBLE("CD Playback Volume", + SB_DOUBLE("CD Volume", SB_DSP4_CD_DEV, (SB_DSP4_CD_DEV + 1), 3, 3, 31), SB16_INPUT_SW("Mic Capture Route", SB_DSP4_INPUT_LEFT, SB_DSP4_INPUT_RIGHT, 0, 0), SB_SINGLE("Mic Playback Switch", SB_DSP4_OUTPUT_SW, 0, 1), - SB_SINGLE("Mic Playback Volume", SB_DSP4_MIC_DEV, 3, 31), + SB_SINGLE("Mic Volume", SB_DSP4_MIC_DEV, 3, 31), SB_SINGLE("Beep Volume", SB_DSP4_SPEAKER_DEV, 6, 3), - SB_DOUBLE("Capture Volume", + SB_DOUBLE("Gain Capture Volume", SB_DSP4_IGAIN_DEV, (SB_DSP4_IGAIN_DEV + 1), 6, 6, 3), - SB_DOUBLE("Playback Volume", + SB_DOUBLE("Gain Playback Volume", SB_DSP4_OGAIN_DEV, (SB_DSP4_OGAIN_DEV + 1), 6, 6, 3), SB16_INPUT_SW("Line Capture Route", SB_DSP4_INPUT_LEFT, SB_DSP4_INPUT_RIGHT, 4, 3), SB_DOUBLE("Line Playback Switch", SB_DSP4_OUTPUT_SW, SB_DSP4_OUTPUT_SW, 4, 3, 1), - SB_DOUBLE("Line Playback Volume", + SB_DOUBLE("Line Volume", SB_DSP4_LINE_DEV, (SB_DSP4_LINE_DEV + 1), 3, 3, 31), SB_SINGLE("Mic Auto Gain", SB_DSP4_MIC_AGC, 0, 1), - SB_SINGLE("3D Enhancement Switch", SB_DSP4_3DSE, 0, 1), + SB_SINGLE("3D Control - Switch", SB_DSP4_3DSE, 0, 1), SB_DOUBLE("Tone Control - Bass", SB_DSP4_BASS_DEV, (SB_DSP4_BASS_DEV + 1), 4, 4, 15), SB_DOUBLE("Tone Control - Treble", -- Ondrej Zary

1 0

Re: [alsa-devel] [PATCH] ASoC: codecs: Add DA732x codec driver
by Mark Brown 22 May '12

22 May '12

On Tue, May 22, 2012 at 12:57:35PM +0000, Software Maintainer wrote: > This patch adds support for the Dialog DA732x audio codec. > > Signed-off-by: Michal Hajduk <Michal.Hajduk(a)diasemi.com> > Signed-off-by: Adam Thomson <Adam.Thomson(a)diasemi.com> I've not had time to look at the patch yet but I need these to come from a human with proper signoffs, not from a role account. The signoff bit is really important for licensing purposes, see SubmittingPatches.

2 1

[alsa-devel] [PATCH V2 00/11] enable imx6q_sabrelite sgtl5000 audio support
by Richard Zhao 22 May '12

22 May '12

Changes since v1: - rebase to latest clk and pinctrl base - fix according v1 comments. You can also get at: https://github.com/riczhao/kernel-imx/tree/topics/audio Richard Zhao (11): dma: imx-sdma: make channel0 operations atomic ARM: dts: imx6q-sabrelite: add i2c1 pinctrl support ASoC: imx-audmux: add pinctrl support ARM: dts: imx6q-sabrelite: add audmux pinctrl support ARM: imx6q: add ssi1_ipg clk_lookup ASoC: fsl_ssi: convert to use devm_clk_get ARM: imx6q_sabrelite: clk_register_clkdev cko1 for sgtl5000 ARM: dts: imx6q-sabrelite: add sound device imx6q-sabrelite-sgtl5000 ARM: dts: imx6q-sabrelite: add serial2 pinctrl support ARM: imx6q: change clkdev device name from xxxx.uart to xxxx.serial ARM: imx6q: change clkdev device name from xxxx.enet to xxxx.ethernet arch/arm/boot/dts/imx6q-sabrelite.dts | 20 +++++++++++ arch/arm/boot/dts/imx6q.dtsi | 23 +++++++++++++ arch/arm/mach-imx/clk-imx6q.c | 35 +++++++++++--------- arch/arm/mach-imx/mach-imx6q.c | 28 ++++++++++++++++ drivers/dma/imx-sdma.c | 57 ++++++++++++++++++--------------- sound/soc/fsl/fsl_ssi.c | 7 +--- sound/soc/fsl/imx-audmux.c | 8 +++++ 7 files changed, 132 insertions(+), 46 deletions(-) -- 1.7.5.4

10 60

Re: [alsa-devel] [PATCH 2/2] ASoC: add pxa-squ dma support
by Mark Brown 22 May '12

22 May '12

On Mon, May 21, 2012 at 05:33:42PM -0700, Qiao Zhou wrote: > Is there any suggestion/comment for this patch? Thanks! Don't top post. > +config SND_PXA_SOC_SQU > + tristate > + select GENERIC_ALLOCATOR > + The main reason I've left this is that I'm trying to decide what to say about the fact that it's not using dmaengine - why is it not doing so? There's also a few smaller issues below: > + for (i = 0; i < 2; i++) { > + dint = SDISR(i); > + if (dint) { > + substream = squ_data->stream[i]; > + prtd = substream->runtime->private_data; > + if (SDISR(i) & 0x1) > + snd_pcm_period_elapsed(substream); > + else > + pr_debug("%s: SQU error on channel %d\n", > + prtd->params->name, i); Should be dev_err(). > + SDISR(i) = 0; > + } > + } > + > + return IRQ_HANDLED; This interrupt handler unconditionally returns IRQ_HANDLED even if there were no interrupts reported. It should probably only do this if one of the tests in the loop returned true. > + /* return if this is a bufferless transfer e.g. > + * codec <--> BT codec or GSM modem -- lg FIXME */ > + if (!dma) > + return 0; Remove this, systems should use the framework features for this (and I don't think you're Liam...). > + prtd = kzalloc(sizeof(struct pxa_runtime_data), GFP_KERNEL); > + if (prtd == NULL) { > + ret = -ENOMEM; > + goto out; > + } devm_kzalloc(). > +struct snd_soc_platform_driver pxa_squ_soc_platform = { > + .ops = &pxa_squ_pcm_ops, > + .pcm_new = pxa_squ_pcm_new, > + .pcm_free = pxa_squ_pcm_free, > +}; > +EXPORT_SYMBOL_GPL(pxa_squ_soc_platform); This should never need to be exported. > + squ_data = kzalloc(sizeof(struct pxa_squ_priv), GFP_KERNEL); > + if (!squ_data) > + return -ENOMEM; devm_kzalloc(). > + squ_data->irq = pdata->irq; Shouldn't the interrupt be supplied via a resource? > + ret = > + request_irq(squ_data->irq, pxa_squ_dma_irq, IRQF_DISABLED, > + "pxa-squ", pdev); > + if (ret) { > + pr_err("Wow! Can't register IRQ for SQU\n"); dev_err() and print the error code. > +static int __init pxa_squ_pcm_modinit(void) > +{ > + return platform_driver_register(&pxa_squ_driver); > +} > + > +module_init(pxa_squ_pcm_modinit); module_platform_driver().

1 0

[alsa-devel] PCM states and snd_pcm_drain()
by Alan Horstmann 22 May '12

22 May '12

Hi, Can snd_pcm_drain() be safely called on a non-running stream - particularly one in SND_PCM_STATE_XRUN? I can demonstrate lock-ups (on rather old Alsa versions, though) when _drain is called on a stream in Xrun but it does seem to vary between hardwares. However, the docs at: http://www.alsa-project.org/alsa-doc/alsa-lib/pcm.html suggest that it should be fine. In our case it seems safer (for widest compatibility) to always check for SND_PCM_STATE_RUNNING, and call snd_pcm_drop() if the stream is not running. Regards Alan

2 3

Re: [alsa-devel] [PATCH 2/2] ASoC: fix pxa-ssp compiling issue under mach-mmp
by Haojian Zhuang 22 May '12

22 May '12

On Tue, May 22, 2012 at 2:58 PM, Qiao Zhou <zhouqiao(a)marvell.com> wrote: > pxa-ssp.c uses API like cpu_is_pxa3xx(), cpu_is_pxa2xx(), which is > defined under arch-pxa architecture, so to compile it under mach-mmp > just add CONFIG_ARCH_PXA macro to separate it. > > Signed-off-by: Qiao Zhou <zhouqiao(a)marvell.com> > --- > sound/soc/pxa/pxa-ssp.c | 25 ++++++++++++++++++------- > 1 files changed, 18 insertions(+), 7 deletions(-) > Acked-by: Haojian Zhuang <haojian.zhuang(a)gmail.com> Mark, Do you mind that both of these two patches could apply into asoc git tree? Regards Haojian -- To unsubscribe from this list: send the line "unsubscribe alsa-devel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

1 0

Re: [alsa-devel] [PATCH 1/2] ARM: MMP: add pxa910-ssp into ssp_id_table
by Haojian Zhuang 22 May '12

22 May '12

On Tue, May 22, 2012 at 2:57 PM, Qiao Zhou <zhouqiao(a)marvell.com> wrote: > add pxa910-ssp into ssp_id_table, and fix pxa-ssp compiling issue > under mach-mmp architect. > > Signed-off-by: Qiao Zhou <zhouqiao(a)marvell.com> > --- > arch/arm/plat-pxa/ssp.c | 1 + > include/linux/pxa2xx_ssp.h | 1 + > include/linux/spi/pxa2xx_spi.h | 2 +- > 3 files changed, 3 insertions(+), 1 deletions(-) > Acked-by: Haojian Zhuang <haojian.zhuang(a)gmail.com> -- To unsubscribe from this list: send the line "unsubscribe alsa-devel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

1 0

Re: [alsa-devel] [PATCH 1/2] ARM: MMP: add pxa-squ header file
by Haojian Zhuang 22 May '12

22 May '12

On Fri, May 18, 2012 at 4:43 PM, Qiao Zhou <zhouqiao(a)marvell.com> wrote: > add pxa-squ header file to support SQU DMA. > > Signed-off-by: Qiao Zhou <zhouqiao(a)marvell.com> > --- > arch/arm/mach-mmp/include/mach/pxa-squ.h | 39 ++++++++++++++++++++++++++++++ > 1 files changed, 39 insertions(+), 0 deletions(-) > create mode 100644 arch/arm/mach-mmp/include/mach/pxa-squ.h > > diff --git a/arch/arm/mach-mmp/include/mach/pxa-squ.h b/arch/arm/mach-mmp/include/mach/pxa-squ.h > new file mode 100644 > index 0000000..3ee187f > --- /dev/null > +++ b/arch/arm/mach-mmp/include/mach/pxa-squ.h > @@ -0,0 +1,39 @@ > +#ifndef __MACH_SQU_H > +#define __MACH_SQU_H > + > +#include <mach/addr-map.h> > + > +#define SQU_REGS_VIRT (AXI_VIRT_BASE + 0xA0000) > +#define SQU_REG(x) (*((__iomem u32 *)(SQU_REGS_VIRT + (x)))) > + > + /*SQU*/ > +#define SDSAR(x) SQU_REG(0x810 + ((x) << 2)) > +#define SDDAR(x) SQU_REG(0x820 + ((x) << 2)) > +#define SDNDPR(x) SQU_REG(0x830 + ((x) << 2)) > +#define SDCR(x) SQU_REG(0x840 + ((x) << 2)) > +#define SDIMR(x) SQU_REG(0x880 + ((x) << 2)) > +#define SDISR(x) SQU_REG(0x8a0 + ((x) << 2)) > +#define SDCR_SSPMOD (1 << 21) /* SSPMod */ > +#define SDCR_FETCHND (1 << 13) > +#define SDCR_CHANEN (1 << 12) /* Channel Enable */ > +#define SDCR_DST_ADDR_INC (0 << 4) > +#define SDCR_DST_ADDR_HOLD (0x2 << 4) > +#define SDCR_SRC_ADDR_INC (0 << 2) > +#define SDCR_SRC_ADDR_HOLD (0x2 << 2) > +#define SDCR_DMA_BURST_4B (0x0 << 6) > +#define SDCR_DMA_BURST_8B (0x1 << 6) > +#define SDCR_DMA_BURST_16B (0x3 << 6) > +#define SDCR_DMA_BURST_1B (0x5 << 6) > +#define SDCR_DMA_BURST_2B (0x6 << 6) > +#define SDCR_DMA_BURST_32B (0x7 << 6) > +#define SDIMR_COMP (1 << 0) > + > +struct pxa_squ_platdata { > + char *pool_name; > + int irq; > + int period_max_out; /* max period size for playback */ > + int period_max_in; /* max period size for capture */ > + int buffer_max_out; /* max buffer size for playback */ > + int buffer_max_in; /* max buffer size for capture */ > +}; > +#endif /* __MACH_SQU_H */ > -- > 1.7.4.1 > Acked all. Mark, Would you mind to apply this patch series? Thanks Haojian -- To unsubscribe from this list: send the line "unsubscribe alsa-devel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

1 0

[alsa-devel] ASoC updates for 3.5
by Mark Brown 22 May '12

22 May '12

The following changes since commit 5fb86e5d4a951ddb0474cdfd809380c8e2a8d101: ARM: mx31_3ds: Add sound support (2012-05-18 16:42:44 +0100) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-3.5 for you to fetch changes up to 766812e6d5e2e23be1e212cf84902d5e834dd865: ASoC: sh: fsi: enable chip specific data transfer mode (2012-05-19 19:41:45 +0100) ---------------------------------------------------------------- ASoC: Last minute updates These are all new code, they've been in -next already so should be OK for merge this time round. I'd been planning to send a pull request today after they'd had a bit of exposure there to make sure breakage didn't propagate into your tree. ---------------------------------------------------------------- Kuninori Morimoto (5): ASoC: sh: fsi: use register field macro name on IN/OUT_DMAC ASoC: sh: fsi: add fsi_version() and removed meaningless version check ASoC: sh: fsi: use same format for IN/OUT ASoC: sh: fsi: call fsi_hw_startup/shutdown from fsi_dai_trigger() ASoC: sh: fsi: enable chip specific data transfer mode Ricardo Neri (1): ASoC: OMAP: HDMI: Introduce codec Stephen Warren (1): ASoC: tegra: Add machine driver for WM8753 codec .../bindings/sound/tegra-audio-wm8753.txt | 54 +++++ include/sound/sh_fsi.h | 6 +- sound/soc/codecs/Kconfig | 4 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/omap-hdmi.c | 69 ++++++ sound/soc/omap/Kconfig | 1 + sound/soc/sh/fsi.c | 224 ++++++++++++++------ sound/soc/tegra/Kconfig | 10 + sound/soc/tegra/Makefile | 2 + sound/soc/tegra/tegra_wm8753.c | 224 ++++++++++++++++++++ 10 files changed, 529 insertions(+), 67 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/tegra-audio-wm8753.txt create mode 100644 sound/soc/codecs/omap-hdmi.c create mode 100644 sound/soc/tegra/tegra_wm8753.c

2 1