July 2013 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH - oss plugin update revised 1/2] oss: Add support of 32-bit and other formats
by alex.d.wiggins＠gmail.com 08 Jul '13

08 Jul '13

From: Alex Wiggins <alex.d.wiggins(a)gmail.com> Added support of 32-bit and other audio formats via 3 changes: - Additional audio format definitions at the top of the file (if required); - Additional audio formats in oss_hw_params (to allow as input to pass to OSS); - Additional audio formats in oss_hw_constraint (to allow to report to ALSA). Signed-off-by: Alex Wiggins <alex.d.wiggins(a)gmail.com> diff --git a/oss/pcm_oss.c b/oss/pcm_oss.c index d43b44c..d5b5bc4 100644 --- a/oss/pcm_oss.c +++ b/oss/pcm_oss.c @@ -24,6 +24,32 @@ #include <alsa/pcm_external.h> #include <linux/soundcard.h> +/* definitions for additional OSS formats if required */ +#ifndef AFMT_S32_LE +#define AFMT_S32_LE 0x00001000 +#endif +#ifndef AFMT_S32_BE +#define AFMT_S32_BE 0x00002000 +#endif +#ifndef AFMT_S24_LE +#define AFMT_S24_LE 0x00008000 +#endif +#ifndef AFMT_S24_BE +#define AFMT_S24_BE 0x00010000 +#endif +#ifndef AFMT_S24_PACKED +#define AFMT_S24_PACKED 0x00040000 +#endif +#ifndef AFMT_FLOAT +#define AFMT_FLOAT 0x00004000 +#endif +#ifndef AFMT_SPDIF_RAW +#define AFMT_SPDIF_RAW 0x00020000 +#endif +#ifndef AFMT_VORBIS +#define AFMT_VORBIS 0x00000800 +#endif + typedef struct snd_pcm_oss { snd_pcm_ioplug_t io; char *device; @@ -165,6 +191,145 @@ static int oss_hw_params(snd_pcm_ioplug_t *io, case SND_PCM_FORMAT_S16_BE: oss->format = AFMT_S16_BE; break; + /* allow additional data formats (such as 32 bit) as input + to pass to OSS (set in OSS driver) */ + case SND_PCM_FORMAT_S32_LE: + oss->format = AFMT_S32_LE; + break; + case SND_PCM_FORMAT_S32_BE: + oss->format = AFMT_S32_BE; + break; + case SND_PCM_FORMAT_S8: + oss->format = AFMT_S8; + break; + case SND_PCM_FORMAT_U16_LE: + oss->format = AFMT_U16_LE; + break; + case SND_PCM_FORMAT_U16_BE: + oss->format = AFMT_U16_BE; + break; + case SND_PCM_FORMAT_S24_LE: + oss->format = AFMT_S24_LE; + break; + case SND_PCM_FORMAT_S24_BE: + oss->format = AFMT_S24_BE; + break; + case SND_PCM_FORMAT_MU_LAW: + oss->format = AFMT_MU_LAW; + break; + case SND_PCM_FORMAT_A_LAW: + oss->format = AFMT_A_LAW; + break; + case SND_PCM_FORMAT_IMA_ADPCM: + oss->format = AFMT_IMA_ADPCM; + break; + case SND_PCM_FORMAT_MPEG: + oss->format = AFMT_MPEG; + break; + case SND_PCM_FORMAT_S24_3LE: + oss->format = AFMT_S24_PACKED; + break; + case SND_PCM_FORMAT_FLOAT: + oss->format = AFMT_FLOAT; + break; + case SND_PCM_FORMAT_IEC958_SUBFRAME: + oss->format = AFMT_SPDIF_RAW; + break; + /* following formats need defining checking native endian: */ + #if 0 + case SND_PCM_FORMAT_S16: + oss->format = AFMT_S16_NE; + break; + case SND_PCM_FORMAT_U16: + oss->format = AFMT_U16_NE; + break; + case SND_PCM_FORMAT_S24: + oss->format = AFMT_S24_NE; + break; + case SND_PCM_FORMAT_S32: + oss->format = AFMT_S32_NE; + #endif + /* following formats found in ALSA but not in OSS: */ + #if 0 + case SND_PCM_FORMAT_U24_LE: + oss->format = AFMT_U24_LE; + break; + case SND_PCM_FORMAT_U24_BE: + oss->format = AFMT_U24_BE; + break; + case SND_PCM_FORMAT_U32_LE: + oss->format = AFMT_U32_LE; + break; + case SND_PCM_FORMAT_U32_BE: + oss->format = AFMT_U32_BE; + break; + case SND_PCM_FORMAT_FLOAT_LE: + oss->format = AFMT_FLOAT_LE; + break; + case SND_PCM_FORMAT_FLOAT_BE: + oss->format = AFMT_FLOAT_BE; + break; + case SND_PCM_FORMAT_FLOAT64_LE: + oss->format = AFMT_FLOAT64_LE; + break; + case SND_PCM_FORMAT_FLOAT64_BE: + oss->format = AFMT_FLOAT64_BE; + break; + case SND_PCM_FORMAT_IEC958_SUBFRAME_LE: + oss->format = AFMT_SPDIF_RAW_LE; + break; + case SND_PCM_FORMAT_IEC958_SUBFRAME_BE: + oss->format = AFMT_SPDIF_RAW_BE; + break; + case SND_PCM_FORMAT_GSM: + oss->format = AFMT_GSM; + break; + case SND_PCM_FORMAT_SPECIAL: + oss->format = AFMT_SPECIAL; + break; + case SND_PCM_FORMAT_S24_3BE: + oss->format = AFMT_S24_PACKED_BE; + break; + case SND_PCM_FORMAT_U24_3LE: + oss->format = AFMT_U24_PACKED; + break; + case SND_PCM_FORMAT_U24_3BE: + oss->format = AFMT_U24_PACKED_BE; + break; + case SND_PCM_FORMAT_S20_3LE: + oss->format = ; + break; + case SND_PCM_FORMAT_S20_3BE: + oss->format = ; + break; + case SND_PCM_FORMAT_U20_3LE: + oss->format = ; + break; + case SND_PCM_FORMAT_U20_3BE: + oss->format = ; + break; + case SND_PCM_FORMAT_S18_3LE: + oss->format = ; + break; + case SND_PCM_FORMAT_S18_3BE: + oss->format = ; + break; + case SND_PCM_FORMAT_U18_3LE: + oss->format = ; + break; + case SND_PCM_FORMAT_U18_3BE: + oss->format = ; + break; + case SND_PCM_FORMAT_U24: + oss->format = AFMT_U24_NE; + break; + case SND_PCM_FORMAT_U32: + oss->format = AFMT_U32_NE; + break; + case SND_PCM_FORMAT_FLOAT64: + oss->format = AFMT_FLOAT64; + break; + #endif default: fprintf(stderr, "*** OSS: unsupported format %s\n", snd_pcm_format_name(io->format)); return -EINVAL; @@ -239,7 +404,7 @@ static int oss_hw_constraint(snd_pcm_oss_t *oss) SND_PCM_ACCESS_MMAP_INTERLEAVED }; unsigned int nformats; - unsigned int format[5]; + unsigned int format[20]; unsigned int nchannels; unsigned int channel[6]; /* period and buffer bytes must be power of two */ @@ -273,6 +438,40 @@ static int oss_hw_constraint(snd_pcm_oss_t *oss) format[nformats++] = SND_PCM_FORMAT_S16_BE; if (tmp & AFMT_MU_LAW) format[nformats++] = SND_PCM_FORMAT_MU_LAW; + /* allow additional data formats (such as 32 bit) + to be reported from OSS to ALSA below */ + if (tmp & AFMT_S32_LE) + format[nformats++] = SND_PCM_FORMAT_S32_LE; + if (tmp & AFMT_S32_BE) + format[nformats++] = SND_PCM_FORMAT_S32_BE; + if (tmp & AFMT_A_LAW) + format[nformats++] = SND_PCM_FORMAT_A_LAW; + if (tmp & AFMT_IMA_ADPCM) + format[nformats++] = SND_PCM_FORMAT_IMA_ADPCM; + if (tmp & AFMT_S8) + format[nformats++] = SND_PCM_FORMAT_S8; + if (tmp & AFMT_U16_LE) + format[nformats++] = SND_PCM_FORMAT_U16_LE; + if (tmp & AFMT_U16_BE) + format[nformats++] = SND_PCM_FORMAT_U16_BE ; + if (tmp & AFMT_MPEG) + format[nformats++] = SND_PCM_FORMAT_MPEG; + if (tmp & AFMT_FLOAT) + format[nformats++] = SND_PCM_FORMAT_FLOAT; + if (tmp & AFMT_S24_LE) + format[nformats++] = SND_PCM_FORMAT_S24_LE; + if (tmp & AFMT_S24_BE) + format[nformats++] = SND_PCM_FORMAT_S24_BE; + if (tmp & AFMT_SPDIF_RAW) + format[nformats++] = SND_PCM_FORMAT_IEC958_SUBFRAME; + if (tmp & AFMT_S24_PACKED) + format[nformats++] = SND_PCM_FORMAT_S24_3LE; + /* following formats found in OSS but not in ALSA */ + if (tmp & AFMT_AC3) + format[nformats++] = SND_PCM_FORMAT_UNKNOWN; + if (tmp & AFMT_VORBIS) + format[nformats++] = SND_PCM_FORMAT_UNKNOWN; + /* assume signed 16 bit (native CPU endian) if not found above */ if (! nformats) format[nformats++] = SND_PCM_FORMAT_S16; if ((err = snd_pcm_ioplug_set_param_list(io, SND_PCM_IOPLUG_HW_FORMAT, -- 1.8.3.1

4 5

[alsa-devel] ASoC: fsl-ssi: ac97-slave support
by Markus Pargmann 08 Jul '13

08 Jul '13

Hi, This series adds DT support for phycore-ac97. Beside ac97 support, the series adds imx-pcm-fiq and generic DMA bindings to fsl-ssi. Version 9 contains some style fixes. Regards, Markus Changes in v9: - Style and compile fixes. - Removed "ASoC: fsl: Kconfig: Use fsl-ssi for phycore-ac97". This patch is not necessary with the seperated phycore-ac97-dt driver. Changes in v8: - Fix build issues in phycore-ac97. Changes in v7: - Only one soc_ac97_ops struct for both ssi drivers (fsl-ssi and imx-ssi) to make it possible to compile a kernel with both drivers. - Other small bug/style fixes described in the changelogs of the patches. Changes in v6: - Rebased onto 3.10-rc3 with Shawn's pcm cleanup patches - Setup of reset functions moved to phycore-ac97.c Changes in v5: - Pass of_node via parent device to imx-pcm-dma. Changes in v4: - phycore-ac97 uses the iomux functions based on audmux phandle now. - fsl-ssi imx-pcm-fiq got some new comments about problems with imx-ssi and incompatible codecs Changes in v3: - Rebased onto pcm dma cleanup patches - A lot of cleanups for the fsl-ssi ac97 integration - Some small changes which are listed in the notes of the patches. Markus Pargmann (10): ASoC: imx-pcm-dma: DT support ASoC: imx-pcm-fiq: Introduce pcm-fiq-params ASoC: fsl: Move soc_ac97_ops from imx-ssi to fsl_ssi ASoC: fsl-ssi: Add support for imx-pcm-fiq ASoC: fsl-ssi: Use generic DMA bindings if possible ASoC: fsl-ssi: imx ac97 support ARM: imx: Export ac97 reset functions ASoC: Add phycore-ac97-dt driver ASoC: fsl: Move fsl-ssi binding doc to sound/ ASoC: fsl: Update fsl-ssi binding doc .../{powerpc/fsl/ssi.txt => sound/fsl,ssi.txt} | 10 + .../bindings/sound/phytec,phycore-ac97.txt | 14 + arch/arm/mach-imx/mach-pca100.c | 7 +- arch/arm/mach-imx/mach-pcm043.c | 7 +- sound/soc/fsl/Kconfig | 17 +- sound/soc/fsl/Makefile | 2 + sound/soc/fsl/fsl_ssi.c | 451 +++++++++++++++++---- sound/soc/fsl/fsl_ssi.h | 7 + sound/soc/fsl/imx-pcm-dma.c | 1 - sound/soc/fsl/imx-pcm-fiq.c | 18 +- sound/soc/fsl/imx-pcm.h | 15 +- sound/soc/fsl/imx-ssi.c | 14 +- sound/soc/fsl/imx-ssi.h | 1 + sound/soc/fsl/phycore-ac97-dt.c | 242 +++++++++++ sound/soc/fsl/phycore-ac97.c | 13 +- 15 files changed, 704 insertions(+), 115 deletions(-) rename Documentation/devicetree/bindings/{powerpc/fsl/ssi.txt => sound/fsl,ssi.txt} (88%) create mode 100644 Documentation/devicetree/bindings/sound/phytec,phycore-ac97.txt create mode 100644 sound/soc/fsl/phycore-ac97-dt.c

4 25

[alsa-devel] Digital Mute DAI control
by Vishal Thanki 08 Jul '13

08 Jul '13

Hi All, I am new to ALSA development. I want to understand the what is the purpose of ".digital_mute" DAI control. Also, why during ".prepare" routine, the ".digital_mute" is invoked? Thanks in advance, Vishal

1 0

[alsa-devel] ROG Xonar Phoebus support planned?
by Andreas Allacher 06 Jul '13

06 Jul '13

Hello, are there any plans to fully (and officially) support the ROG Xonar Phoebus - with good audio quality (last time there was a discussion regarding this it apparantly was possible to use the card but sound quality was bad)

2 1

[alsa-devel] [usb-audio] VIA/Audinst HUD-mx2: One of two PCM device is available for playback
by Takashi Sakamoto 06 Jul '13

06 Jul '13

Hi, This sound card has two PCM devices. If the sound card is realized "card 0", there are "hw:0,0" and "hw:0,1". But former seems not to generate sound and latter seems to generate. This issue is reported to Ubuntu-jp and LinuxMint forum. The reporter said this happens in Fedora18 so I think this does not depends on these desktop invironment. https://forums.ubuntulinux.jp/viewtopic.php?pid=98940#p98940 http://forums.linuxmint.com/viewtopic.php?f=49&t=128478 Please see attached lsusb.log to know usb information and alsainfo.sh in detail. Audinst HUD-mx2 applies VIA Technologies chip internally. http://www.audinst.com/en/bbs/board.php?bo_table=HUDmx2&wr_id=4 The sound card has a lamp which turn on when data comes. When "hw:0,0" is used, the lamp turns on but no sound. When "hw:0,1" is used, the lamp turns on and sound. My question is: 1. does hw:0,0 seem to be available when some control are changed? 2. are there some ways to use hw:0,1 as a default? Regards Takashi Sakamoto o-takashi(a)sakamocchi.jp

2 3

[alsa-devel] [PATCH] ASoC: Allow imx-pcm-{dma, fiq}.c to be modules
by Arnd Bergmann 05 Jul '13

05 Jul '13

This is required so we can build the imx sound support when ALSA itself is a loadable module. Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> Cc: alsa-devel(a)alsa-project.org Cc: Mark Brown <broonie(a)kernel.org> Cc: Fabio Estevam <fabio.estevam(a)freescale.com> diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig index aa43854..805b83e 100644 --- a/sound/soc/fsl/Kconfig +++ b/sound/soc/fsl/Kconfig @@ -109,11 +109,11 @@ config SND_SOC_IMX_SSI tristate config SND_SOC_IMX_PCM_FIQ - bool + tristate select FIQ config SND_SOC_IMX_PCM_DMA - bool + tristate select SND_SOC_GENERIC_DMAENGINE_PCM config SND_SOC_IMX_AUDMUX diff --git a/sound/soc/fsl/imx-pcm.h b/sound/soc/fsl/imx-pcm.h index 67f656c..0e3619e 100644 --- a/sound/soc/fsl/imx-pcm.h +++ b/sound/soc/fsl/imx-pcm.h @@ -32,7 +32,7 @@ imx_pcm_dma_params_init_data(struct imx_dma_data *dma_data, dma_data->peripheral_type = IMX_DMATYPE_SSI; } -#ifdef CONFIG_SND_SOC_IMX_PCM_DMA +#if IS_ENABLED(CONFIG_SND_SOC_IMX_PCM_DMA) int imx_pcm_dma_init(struct platform_device *pdev); void imx_pcm_dma_exit(struct platform_device *pdev); #else @@ -46,7 +46,7 @@ static inline void imx_pcm_dma_exit(struct platform_device *pdev) } #endif -#ifdef CONFIG_SND_SOC_IMX_PCM_FIQ +#if IS_ENABLED(CONFIG_SND_SOC_IMX_PCM_FIQ) int imx_pcm_fiq_init(struct platform_device *pdev); void imx_pcm_fiq_exit(struct platform_device *pdev); #else

2 4

[alsa-devel] [PATCH] ASoC: ak4554: add DT support
by Kuninori Morimoto 05 Jul '13

05 Jul '13

Support for loading the ak4554 codec module via devicetree. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- This is for mark/topic/ak4554 branch Documentation/devicetree/bindings/sound/ak4554.c | 11 +++++++++++ sound/soc/codecs/ak4554.c | 7 +++++++ 2 files changed, 18 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/ak4554.c diff --git a/Documentation/devicetree/bindings/sound/ak4554.c b/Documentation/devicetree/bindings/sound/ak4554.c new file mode 100644 index 0000000..934fa02 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/ak4554.c @@ -0,0 +1,11 @@ +AK4554 ADC/DAC + +Required properties: + + - compatible : "asahi-kasei,ak4554" + +Example: + +ak4554-adc-dac { + compatible = "asahi-kasei,ak4554"; +}; diff --git a/sound/soc/codecs/ak4554.c b/sound/soc/codecs/ak4554.c index c1a1733..6aed9c4 100644 --- a/sound/soc/codecs/ak4554.c +++ b/sound/soc/codecs/ak4554.c @@ -64,10 +64,17 @@ static int ak4554_soc_remove(struct platform_device *pdev) return 0; } +static struct of_device_id ak4554_of_match[] = { + { .compatible = "asahi-kasei,ak4554" }, + {}, +}; +MODULE_DEVICE_TABLE(of, ak4554_of_match); + static struct platform_driver ak4554_driver = { .driver = { .name = "ak4554-adc-dac", .owner = THIS_MODULE, + .of_match_table = ak4554_of_match, }, .probe = ak4554_soc_probe, .remove = ak4554_soc_remove, -- 1.7.9.5

4 5

[alsa-devel] ASoC updates for v3.11
by Mark Brown 05 Jul '13

05 Jul '13

The following changes since commit 8bb495e3f02401ee6f76d1b1d77f3ac9f079e376: Linux 3.10 (2013-06-30 15:13:29 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-v3.11-4 for you to fetch changes up to 70a9f8797ce298544cfd07328ff59f00488bc491: Merge remote-tracking branch 'asoc/fix/wm8962' into asoc-linus (2013-07-04 18:30:03 +0100) ---------------------------------------------------------------- ASoC: Updates for v3.11 A few small fixes, all driver specific. The removal of the GPIO based pinmuxing is a bug fix, since the obsolete nodes had been removed from the DT it stopped the driver loading. ---------------------------------------------------------------- Arnaud Patard (1): ASoC: imx-sgtl5000: return E_PROBE_DEFER if ssi/codec not found Mark Brown (5): ASoC: samsung: Remove obsolete GPIO based DT pinmuxing Merge remote-tracking branch 'asoc/fix/fsl' into asoc-linus Merge remote-tracking branch 'asoc/fix/mxs' into asoc-linus Merge remote-tracking branch 'asoc/fix/samsung' into asoc-linus Merge remote-tracking branch 'asoc/fix/wm8962' into asoc-linus Sachin Kamat (1): ASoC: Samsung: Remove redundant comment Shawn Guo (2): ASoC: mxs: register saif mclk to clock framework ASoC: wm8962: fix NULL pdata pointer Documentation/devicetree/bindings/mfd/arizona.txt | 62 + .../devicetree/bindings/sound/adi,adau1701.txt | 23 + .../devicetree/bindings/sound/imx-audio-wm8962.txt | 46 + .../devicetree/bindings/sound/mxs-saif.txt | 17 +- .../bindings/sound/nvidia,tegra-audio-rt5640.txt | 71 + Documentation/devicetree/bindings/sound/rt5640.txt | 30 + .../devicetree/bindings/sound/sgtl5000.txt | 3 + .../devicetree/bindings/sound/spdif-receiver.txt | 10 + .../bindings/sound/spdif-transmitter.txt | 10 + .../devicetree/bindings/sound/ssm2518.txt | 20 + Documentation/devicetree/bindings/sound/wm8962.txt | 23 + arch/blackfin/mach-bf527/boards/ad7160eval.c | 12 - arch/blackfin/mach-bf527/boards/ezkit.c | 32 +- arch/blackfin/mach-bf533/boards/ezkit.c | 12 - arch/blackfin/mach-bf533/boards/stamp.c | 35 +- arch/blackfin/mach-bf537/boards/stamp.c | 30 +- arch/blackfin/mach-bf548/boards/ezkit.c | 28 +- arch/blackfin/mach-bf561/boards/ezkit.c | 14 +- arch/blackfin/mach-bf609/boards/ezkit.c | 2 +- drivers/mfd/arizona-core.c | 234 ++- drivers/mfd/arizona-i2c.c | 10 +- drivers/mfd/arizona-spi.c | 10 +- drivers/mfd/arizona.h | 12 + drivers/mfd/wm5102-tables.c | 9 +- drivers/mfd/wm5110-tables.c | 8 + drivers/misc/atmel-ssc.c | 8 +- include/linux/mfd/arizona/core.h | 2 + include/linux/mfd/arizona/pdata.h | 2 +- include/linux/mfd/arizona/registers.h | 47 + include/linux/mfd/wm8994/pdata.h | 5 + include/linux/mfd/wm8994/registers.h | 8 + include/linux/platform_data/ssm2518.h | 22 + include/sound/rt5640.h | 22 + include/sound/soc-dapm.h | 3 +- sound/soc/Kconfig | 1 + sound/soc/Makefile | 1 + sound/soc/atmel/sam9g20_wm8731.c | 9 - sound/soc/blackfin/Kconfig | 47 +- sound/soc/blackfin/Makefile | 4 - sound/soc/blackfin/bf5xx-ac97-pcm.c | 1 - sound/soc/blackfin/bf5xx-ac97-pcm.h | 26 - sound/soc/blackfin/bf5xx-ac97.c | 8 +- sound/soc/blackfin/bf5xx-ad1836.c | 19 +- sound/soc/blackfin/bf5xx-ad193x.c | 40 +- sound/soc/blackfin/bf5xx-ad1980.c | 1 - sound/soc/blackfin/bf5xx-ad73311.c | 1 - sound/soc/blackfin/bf5xx-i2s-pcm.c | 183 +- sound/soc/blackfin/bf5xx-i2s-pcm.h | 21 +- sound/soc/blackfin/bf5xx-i2s.c | 129 +- sound/soc/blackfin/bf5xx-sport.c | 10 +- sound/soc/blackfin/bf5xx-sport.h | 2 +- sound/soc/blackfin/bf5xx-ssm2602.c | 1 - sound/soc/blackfin/bf5xx-tdm-pcm.c | 345 ---- sound/soc/blackfin/bf5xx-tdm-pcm.h | 18 - sound/soc/blackfin/bf5xx-tdm.c | 328 --- sound/soc/blackfin/bf5xx-tdm.h | 23 - sound/soc/cirrus/Kconfig | 2 +- sound/soc/cirrus/ep93xx-ac97.c | 16 +- sound/soc/cirrus/ep93xx-i2s.c | 16 +- sound/soc/cirrus/ep93xx-pcm.c | 138 +- sound/soc/codecs/88pm860x-codec.c | 9 +- sound/soc/codecs/Kconfig | 18 +- sound/soc/codecs/Makefile | 14 +- sound/soc/codecs/ab8500-codec.c | 85 +- sound/soc/codecs/ab8500-codec.h | 42 +- sound/soc/codecs/adau1701.c | 69 +- sound/soc/codecs/arizona.c | 7 + sound/soc/codecs/arizona.h | 3 +- sound/soc/codecs/{dfbmcs320.c => bt-sco.c} | 37 +- sound/soc/codecs/{omap-hdmi.c => hdmi.c} | 26 +- sound/soc/codecs/jz4740.c | 2 - sound/soc/codecs/max98090.c | 24 +- sound/soc/codecs/rt5640.c | 2128 ++++++++++++++++++++ sound/soc/codecs/rt5640.h | 2092 +++++++++++++++++++ sound/soc/codecs/sgtl5000.c | 267 ++- sound/soc/codecs/sgtl5000.h | 2 +- sound/soc/codecs/sn95031.c | 2 +- sound/soc/codecs/spdif_receiver.c | 10 + .../{spdif_transciever.c => spdif_transmitter.c} | 10 + sound/soc/codecs/ssm2518.c | 856 ++++++++ sound/soc/codecs/ssm2518.h | 20 + sound/soc/codecs/wm0010.c | 10 + sound/soc/codecs/wm5102.c | 205 +- sound/soc/codecs/wm5110.c | 192 ++ sound/soc/codecs/wm8962.c | 145 +- sound/soc/codecs/wm8994.c | 188 +- sound/soc/codecs/wm8994.h | 3 + sound/soc/codecs/wm_adsp.c | 461 ++++- sound/soc/codecs/wm_adsp.h | 3 + sound/soc/davinci/Kconfig | 10 - sound/soc/davinci/Makefile | 2 - sound/soc/davinci/davinci-mcasp.c | 4 +- sound/soc/davinci/davinci-sffsdr.c | 181 -- sound/soc/dwc/designware_i2s.c | 6 +- sound/soc/fsl/Kconfig | 17 +- sound/soc/fsl/Makefile | 13 +- sound/soc/fsl/eukrea-tlv320.c | 2 +- sound/soc/fsl/fsl_ssi.c | 13 +- sound/soc/fsl/imx-audmux.c | 8 - sound/soc/fsl/imx-mc13783.c | 2 +- sound/soc/fsl/imx-pcm-dma.c | 2 + sound/soc/fsl/imx-pcm-fiq.c | 92 + sound/soc/fsl/imx-pcm.c | 145 -- sound/soc/fsl/imx-pcm.h | 10 +- sound/soc/fsl/imx-sgtl5000.c | 43 +- sound/soc/fsl/imx-ssi.c | 44 +- sound/soc/fsl/imx-ssi.h | 3 - sound/soc/fsl/imx-wm8962.c | 323 +++ sound/soc/fsl/mx27vis-aic32x4.c | 2 +- sound/soc/fsl/phycore-ac97.c | 2 +- sound/soc/fsl/wm1133-ev1.c | 2 +- sound/soc/jz4740/jz4740-i2s.c | 17 +- sound/soc/kirkwood/kirkwood-dma.c | 2 +- sound/soc/mid-x86/mfld_machine.c | 1 - sound/soc/mxs/mxs-pcm.c | 18 - sound/soc/mxs/mxs-pcm.h | 7 - sound/soc/mxs/mxs-saif.c | 72 +- sound/soc/mxs/mxs-saif.h | 1 - sound/soc/mxs/mxs-sgtl5000.c | 10 +- sound/soc/omap/Makefile | 1 - sound/soc/omap/omap-hdmi-card.c | 2 +- sound/soc/omap/omap-mcbsp.c | 2 - sound/soc/pxa/Kconfig | 20 - sound/soc/pxa/Makefile | 4 - sound/soc/pxa/mmp-pcm.c | 6 +- sound/soc/pxa/mmp-sspa.c | 2 +- sound/soc/pxa/saarb.c | 190 -- sound/soc/pxa/tavorevb3.c | 189 -- sound/soc/pxa/zylonite.c | 1 - sound/soc/samsung/Kconfig | 2 +- sound/soc/samsung/bells.c | 14 + sound/soc/samsung/i2s.c | 66 +- sound/soc/samsung/neo1973_wm8753.c | 2 +- sound/soc/samsung/s3c-i2s-v2.c | 4 +- sound/soc/samsung/smdk_wm8580pcm.c | 1 - sound/soc/samsung/smdk_wm8994pcm.c | 1 - sound/soc/sh/fsi.c | 10 +- sound/soc/soc-core.c | 106 +- sound/soc/soc-dapm.c | 110 +- sound/soc/soc-pcm.c | 91 +- sound/soc/soc-utils.c | 13 +- sound/soc/spear/Kconfig | 9 + sound/soc/spear/Makefile | 8 + sound/soc/spear/spdif_in.c | 31 +- sound/soc/spear/spdif_out.c | 43 +- sound/soc/spear/spear_pcm.c | 152 +- sound/soc/tegra/Kconfig | 10 + sound/soc/tegra/Makefile | 2 + sound/soc/tegra/tegra30_ahub.c | 25 + sound/soc/tegra/tegra30_i2s.c | 26 + sound/soc/tegra/tegra_asoc_utils.c | 23 +- sound/soc/tegra/tegra_rt5640.c | 257 +++ sound/soc/ux500/mop500.c | 2 +- sound/soc/ux500/mop500_ab8500.c | 62 +- sound/soc/ux500/ux500_msp_dai.c | 11 +- sound/soc/ux500/ux500_msp_dai.h | 4 - sound/soc/ux500/ux500_msp_i2s.c | 88 +- sound/soc/ux500/ux500_msp_i2s.h | 74 +- sound/soc/ux500/ux500_pcm.c | 30 + 159 files changed, 8829 insertions(+), 3121 deletions(-) create mode 100644 Documentation/devicetree/bindings/mfd/arizona.txt create mode 100644 Documentation/devicetree/bindings/sound/adi,adau1701.txt create mode 100644 Documentation/devicetree/bindings/sound/imx-audio-wm8962.txt create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra-audio-rt5640.txt create mode 100644 Documentation/devicetree/bindings/sound/rt5640.txt create mode 100644 Documentation/devicetree/bindings/sound/spdif-receiver.txt create mode 100644 Documentation/devicetree/bindings/sound/spdif-transmitter.txt create mode 100644 Documentation/devicetree/bindings/sound/ssm2518.txt create mode 100644 include/linux/platform_data/ssm2518.h create mode 100644 include/sound/rt5640.h delete mode 100644 sound/soc/blackfin/bf5xx-ac97-pcm.h delete mode 100644 sound/soc/blackfin/bf5xx-tdm-pcm.c delete mode 100644 sound/soc/blackfin/bf5xx-tdm-pcm.h delete mode 100644 sound/soc/blackfin/bf5xx-tdm.c delete mode 100644 sound/soc/blackfin/bf5xx-tdm.h rename sound/soc/codecs/{dfbmcs320.c => bt-sco.c} (53%) rename sound/soc/codecs/{omap-hdmi.c => hdmi.c} (69%) create mode 100644 sound/soc/codecs/rt5640.c create mode 100644 sound/soc/codecs/rt5640.h rename sound/soc/codecs/{spdif_transciever.c => spdif_transmitter.c} (88%) create mode 100644 sound/soc/codecs/ssm2518.c create mode 100644 sound/soc/codecs/ssm2518.h delete mode 100644 sound/soc/davinci/davinci-sffsdr.c delete mode 100644 sound/soc/fsl/imx-pcm.c create mode 100644 sound/soc/fsl/imx-wm8962.c delete mode 100644 sound/soc/pxa/saarb.c delete mode 100644 sound/soc/pxa/tavorevb3.c create mode 100644 sound/soc/spear/Kconfig create mode 100644 sound/soc/spear/Makefile create mode 100644 sound/soc/tegra/tegra_rt5640.c

2 1

[alsa-devel] [PATCHv2 00/31] HDSPM: A lot
by Adrian Knoth 05 Jul '13

05 Jul '13

Hi! Here's a revised series of the two patchsets I've sent earlier this week. Features by card: AIO: - Support Analog Expansion Boards - Support all card settings like gain, coax/optical switching etc. - Fixed S/PDIF Sync status and frequency reporting RayDAT: - Controls for S/PDIF and WordClock AES(32): - Support for TCO module (originally by Martin Dausel) All cards: - Code cleanups - Documentation Takashi: As agreed, I've split the big "TCO patch" into smaller chunks to ease reviewing. Adrian Knoth (30): ALSA: hdspm - Add missing defines for RME AIO and RayDAT ALSA: hdspm - Introduce hdspm_is_raydat_or_aio() ALSA: hdspm - Augment HDSPM_TOGGLE_SETTING for AIO/RayDAT ALSA: hdspm - Drop duplicate code in hdspm_set_system_clock_mode() ALSA: hdspm - Add S/PDIF and WCK48 controls for RME RayDAT ALSA: hdspm - Add S/PDIF, XLR, WCK48 and ADAT-in controls for RME AIO cards ALSA: hdspm - Refactor ENUMERATED_CTL_INFO into function ALSA: hdspm - Introduce generic AIO tristate control ALSA: hdspm - Enable AD/DA/PH gains and S/PDIF-Input select on AIO ALSA: hdspm - Add support for AEBs on RME AIO ALSA: hdspm - Fix S/PDIF Sync status and frequency on RME AIO ALSA: hdspm - Create TCO readout function ALSA: hdspm - AES32: Fix TCO sync check reporting ALSA: hdspm - Cosmetics, no real change ALSA: hdspm - AIO: Drop superfluous HDSPM_AUTOSYNC_REF ALSA: hdspm - AES32: Add TCO and Sync-In text entries ALSA: hdspm - Introduce hdspm_get_aes_sample_rate() ALSA: hdspm - Add prototype declarations ALSA: hdspm - Enable AES32 in hdspm_get_wc_sample_rate ALSA: hdspm - Enable AES32 in hdspm_get_tco_sample_rate ALSA: hdspm - AES32: Ignore float/int format bit ALSA: hdspm - AES32: Enable TCO input in hdspm_external_sample_rate() ALSA: hdspm - AES32: Enable TCO/Sync-In in snd_hdspm_put_sync_ref() ALSA: hdspm - AES32: Include TCO and Sync-In in proc output ALSA: hdspm - Introduce hdspm_external_rate_to_enum() helper function ALSA: hdspm - AES32: Report external sample rate to userspace ALSA: hdspm - AES32: Enable TCO support ALSA: hdspm - Use snd_ctl_enum_info for most text arrays ALSA: hdspm - Use snd_ctl_enum_info() for texts_autosync ALSA: hdspm - Use snd_ctl_enum_info() in snd_hdspm_info_autosync_ref Martin Dausel (1): ALSA: hdspm - Added some comments and control register documentation sound/pci/rme9652/hdspm.c | 765 ++++++++++++++++++++++++++++++++-------------- 1 file changed, 538 insertions(+), 227 deletions(-) -- 1.8.3.1

2 32

[alsa-devel] [PATCH 1/3] ASoC: sglt5000: Provide the reg_stride field
by Fabio Estevam 05 Jul '13

05 Jul '13

From: Fabio Estevam <fabio.estevam(a)freescale.com> sgtl5000 has 16-bit registers, so we need to tell regmap to use a reg_stride of two bytes. Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- sound/soc/codecs/sgtl5000.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c index d441559..7c99f3c 100644 --- a/sound/soc/codecs/sgtl5000.c +++ b/sound/soc/codecs/sgtl5000.c @@ -1470,6 +1470,7 @@ static struct snd_soc_codec_driver sgtl5000_driver = { static const struct regmap_config sgtl5000_regmap = { .reg_bits = 16, .val_bits = 16, + .reg_stride = 2, .max_register = SGTL5000_MAX_REG_OFFSET, .volatile_reg = sgtl5000_volatile, -- 1.8.1.2

2 3