November 2016 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] Applied "ASoC: samsung: Makefile cleanup" to the asoc tree
by Mark Brown 11 Nov '16

11 Nov '16

The patch ASoC: samsung: Makefile cleanup has been applied to the asoc tree at git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 5acbd343980b034b6ea9b01824cc28d0b01cf4d8 Mon Sep 17 00:00:00 2001 From: Valentin Rothberg <valentinrothberg(a)gmail.com> Date: Thu, 10 Nov 2016 08:11:55 +0100 Subject: [PATCH] ASoC: samsung: Makefile cleanup Commit a076d418235f ("ASoC: samsung: Drop AC97 drivers") removed some unused code and the associated Kconfig options, but left those options referenced in the Makefile. Remove the leftover references in the Makefile. Signed-off-by: Valentin Rothberg <valentinrothberg(a)gmail.com> Reviewed-by: Sylwester Nawrocki <s.nawrocki(a)samsung.com> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- sound/soc/samsung/Makefile | 3 --- 1 file changed, 3 deletions(-) diff --git a/sound/soc/samsung/Makefile b/sound/soc/samsung/Makefile index f3f4a32cd376..27956621c849 100644 --- a/sound/soc/samsung/Makefile +++ b/sound/soc/samsung/Makefile @@ -45,8 +45,6 @@ snd-soc-arndale-rt5631-objs := arndale_rt5631.o obj-$(CONFIG_SND_SOC_SAMSUNG_JIVE_WM8750) += snd-soc-jive-wm8750.o obj-$(CONFIG_SND_SOC_SAMSUNG_NEO1973_WM8753) += snd-soc-neo1973-wm8753.o -obj-$(CONFIG_SND_SOC_SAMSUNG_SMDK2443_WM9710) += snd-soc-smdk2443-wm9710.o -obj-$(CONFIG_SND_SOC_SAMSUNG_LN2440SBC_ALC650) += snd-soc-ln2440sbc-alc650.o obj-$(CONFIG_SND_SOC_SAMSUNG_S3C24XX_UDA134X) += snd-soc-s3c24xx-uda134x.o obj-$(CONFIG_SND_SOC_SAMSUNG_SIMTEC) += snd-soc-s3c24xx-simtec.o obj-$(CONFIG_SND_SOC_SAMSUNG_SIMTEC_HERMES) += snd-soc-s3c24xx-simtec-hermes.o @@ -56,7 +54,6 @@ obj-$(CONFIG_SND_SOC_SAMSUNG_RX1950_UDA1380) += snd-soc-rx1950-uda1380.o obj-$(CONFIG_SND_SOC_SAMSUNG_SMDK_WM8580) += snd-soc-smdk-wm8580.o obj-$(CONFIG_SND_SOC_SAMSUNG_SMDK_WM8994) += snd-soc-smdk-wm8994.o obj-$(CONFIG_SND_SOC_SNOW) += snd-soc-snow.o -obj-$(CONFIG_SND_SOC_SAMSUNG_SMDK_WM9713) += snd-soc-smdk-wm9713.o obj-$(CONFIG_SND_SOC_SMARTQ) += snd-soc-s3c64xx-smartq-wm8987.o obj-$(CONFIG_SND_SOC_SAMSUNG_SMDK_SPDIF) += snd-soc-smdk-spdif.o obj-$(CONFIG_SND_SOC_SMDK_WM8580_PCM) += snd-soc-smdk-wm8580pcm.o -- 2.10.2

1 0

[alsa-devel] Applied "ASoC: samsung: Remove unselectable smdk_wm8580pcm" to the asoc tree
by Mark Brown 11 Nov '16

11 Nov '16

The patch ASoC: samsung: Remove unselectable smdk_wm8580pcm has been applied to the asoc tree at git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From f174c1db904fe49713571a3ea2547b79da025fa9 Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen <lars(a)metafoo.de> Date: Wed, 9 Nov 2016 19:45:10 +0100 Subject: [PATCH] ASoC: samsung: Remove unselectable smdk_wm8580pcm The SND_SOC_SMDK_WM8580_PCM Kconfig entry depends on either MACH_SMDKV210 or MACH_SMDKC110. Both of which were removed in commit 28c8331d386a ("ARM: S5PV210: Remove support for board files") over two years ago. The driver has been unselectable ever since. Considering the lack of complaints about this it can be concluded that the driver is unused and can be removed. Signed-off-by: Lars-Peter Clausen <lars(a)metafoo.de> Reviewed-by: Krzysztof Kozlowski <krzk(a)kernel.org> Reviewed-by: Sylwester Nawrocki <s.nawrocki(a)samsung.com> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- sound/soc/samsung/Kconfig | 9 -- sound/soc/samsung/Makefile | 2 - sound/soc/samsung/smdk_wm8580pcm.c | 175 ------------------------------------- 3 files changed, 186 deletions(-) delete mode 100644 sound/soc/samsung/smdk_wm8580pcm.c diff --git a/sound/soc/samsung/Kconfig b/sound/soc/samsung/Kconfig index 1d2ef4c2afd0..79ae6a7c93ff 100644 --- a/sound/soc/samsung/Kconfig +++ b/sound/soc/samsung/Kconfig @@ -119,15 +119,6 @@ config SND_SOC_SAMSUNG_SMDK_SPDIF help Say Y if you want to add support for SoC S/PDIF audio on the SMDK. -config SND_SOC_SMDK_WM8580_PCM - tristate "SoC PCM Audio support for WM8580 on SMDK" - depends on MACH_SMDKV210 || MACH_SMDKC110 - depends on I2C - select SND_SOC_WM8580 - select SND_SAMSUNG_PCM - help - Say Y if you want to add support for SoC audio on the SMDK. - config SND_SOC_SMDK_WM8994_PCM tristate "SoC PCM Audio support for WM8994 on SMDK" depends on I2C=y diff --git a/sound/soc/samsung/Makefile b/sound/soc/samsung/Makefile index 27956621c849..c95b6835361f 100644 --- a/sound/soc/samsung/Makefile +++ b/sound/soc/samsung/Makefile @@ -34,7 +34,6 @@ snd-soc-snow-objs := snow.o snd-soc-smdk-wm9713-objs := smdk_wm9713.o snd-soc-s3c64xx-smartq-wm8987-objs := smartq_wm8987.o snd-soc-smdk-spdif-objs := smdk_spdif.o -snd-soc-smdk-wm8580pcm-objs := smdk_wm8580pcm.o snd-soc-smdk-wm8994pcm-objs := smdk_wm8994pcm.o snd-soc-speyside-objs := speyside.o snd-soc-tobermory-objs := tobermory.o @@ -56,7 +55,6 @@ obj-$(CONFIG_SND_SOC_SAMSUNG_SMDK_WM8994) += snd-soc-smdk-wm8994.o obj-$(CONFIG_SND_SOC_SNOW) += snd-soc-snow.o obj-$(CONFIG_SND_SOC_SMARTQ) += snd-soc-s3c64xx-smartq-wm8987.o obj-$(CONFIG_SND_SOC_SAMSUNG_SMDK_SPDIF) += snd-soc-smdk-spdif.o -obj-$(CONFIG_SND_SOC_SMDK_WM8580_PCM) += snd-soc-smdk-wm8580pcm.o obj-$(CONFIG_SND_SOC_SMDK_WM8994_PCM) += snd-soc-smdk-wm8994pcm.o obj-$(CONFIG_SND_SOC_SPEYSIDE) += snd-soc-speyside.o obj-$(CONFIG_SND_SOC_TOBERMORY) += snd-soc-tobermory.o diff --git a/sound/soc/samsung/smdk_wm8580pcm.c b/sound/soc/samsung/smdk_wm8580pcm.c deleted file mode 100644 index a6d223310c67..000000000000 --- a/sound/soc/samsung/smdk_wm8580pcm.c +++ /dev/null @@ -1,175 +0,0 @@ -/* - * sound/soc/samsung/smdk_wm8580pcm.c - * - * Copyright (c) 2011 Samsung Electronics Co. Ltd - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - */ -#include <linux/module.h> -#include <sound/soc.h> -#include <sound/pcm_params.h> -#include <sound/pcm.h> - -#include <asm/mach-types.h> - -#include "../codecs/wm8580.h" -#include "pcm.h" - -/* - * Board Settings: - * o '1' means 'ON' - * o '0' means 'OFF' - * o 'X' means 'Don't care' - * - * SMDK6410 Base B/D: CFG1-0000, CFG2-1111 - * SMDKC110, SMDKV210: CFGB11-100100, CFGB12-0000 - */ - -#define SMDK_WM8580_EXT_OSC 12000000 -#define SMDK_WM8580_EXT_MCLK 4096000 -#define SMDK_WM8580_EXT_VOICE 2048000 - -static unsigned long mclk_freq; -static unsigned long xtal_freq; - -/* - * If MCLK clock directly gets from XTAL, we don't have to use PLL - * to make MCLK, but if XTAL clock source connects with other codec - * pin (like XTI), we should have to set codec's PLL to make MCLK. - * Because Samsung SoC does not support pcmcdclk output like I2S. - */ - -static int smdk_wm8580_pcm_hw_params(struct snd_pcm_substream *substream, - struct snd_pcm_hw_params *params) -{ - struct snd_soc_pcm_runtime *rtd = substream->private_data; - struct snd_soc_dai *codec_dai = rtd->codec_dai; - struct snd_soc_dai *cpu_dai = rtd->cpu_dai; - int rfs, ret; - - switch (params_rate(params)) { - case 8000: - break; - default: - printk(KERN_ERR "%s:%d Sampling Rate %u not supported!\n", - __func__, __LINE__, params_rate(params)); - return -EINVAL; - } - - rfs = mclk_freq / params_rate(params) / 2; - - if (mclk_freq == xtal_freq) { - ret = snd_soc_dai_set_sysclk(codec_dai, WM8580_CLKSRC_MCLK, - mclk_freq, SND_SOC_CLOCK_IN); - if (ret < 0) - return ret; - - ret = snd_soc_dai_set_clkdiv(codec_dai, WM8580_MCLK, - WM8580_CLKSRC_MCLK); - if (ret < 0) - return ret; - } else { - ret = snd_soc_dai_set_sysclk(codec_dai, WM8580_CLKSRC_PLLA, - mclk_freq, SND_SOC_CLOCK_IN); - if (ret < 0) - return ret; - - ret = snd_soc_dai_set_clkdiv(codec_dai, WM8580_MCLK, - WM8580_CLKSRC_PLLA); - if (ret < 0) - return ret; - - ret = snd_soc_dai_set_pll(codec_dai, WM8580_PLLA, 0, - xtal_freq, mclk_freq); - if (ret < 0) - return ret; - } - - /* Set PCM source clock on CPU */ - ret = snd_soc_dai_set_sysclk(cpu_dai, S3C_PCM_CLKSRC_MUX, - mclk_freq, SND_SOC_CLOCK_IN); - if (ret < 0) - return ret; - - /* Set SCLK_DIV for making bclk */ - ret = snd_soc_dai_set_clkdiv(cpu_dai, S3C_PCM_SCLK_PER_FS, rfs); - if (ret < 0) - return ret; - - return 0; -} - -static struct snd_soc_ops smdk_wm8580_pcm_ops = { - .hw_params = smdk_wm8580_pcm_hw_params, -}; - -#define SMDK_DAI_FMT (SND_SOC_DAIFMT_DSP_B | SND_SOC_DAIFMT_IB_NF | \ - SND_SOC_DAIFMT_CBS_CFS) - -static struct snd_soc_dai_link smdk_dai[] = { - { - .name = "WM8580 PAIF PCM RX", - .stream_name = "Playback", - .cpu_dai_name = "samsung-pcm.0", - .codec_dai_name = "wm8580-hifi-playback", - .platform_name = "samsung-audio", - .codec_name = "wm8580.0-001b", - .dai_fmt = SMDK_DAI_FMT, - .ops = &smdk_wm8580_pcm_ops, - }, { - .name = "WM8580 PAIF PCM TX", - .stream_name = "Capture", - .cpu_dai_name = "samsung-pcm.0", - .codec_dai_name = "wm8580-hifi-capture", - .platform_name = "samsung-pcm.0", - .codec_name = "wm8580.0-001b", - .dai_fmt = SMDK_DAI_FMT, - .ops = &smdk_wm8580_pcm_ops, - }, -}; - -static struct snd_soc_card smdk_pcm = { - .name = "SMDK-PCM", - .owner = THIS_MODULE, - .dai_link = smdk_dai, - .num_links = 2, -}; - -/* - * After SMDKC110 Base Board's Rev is '0.1', 12MHz External OSC(X1) - * is absent (or not connected), so we connect EXT_VOICE_CLK(OSC4), - * 2.0484Mhz, directly with MCLK both Codec and SoC. - */ -static int snd_smdk_probe(struct platform_device *pdev) -{ - int ret = 0; - - xtal_freq = SMDK_WM8580_EXT_OSC; - mclk_freq = SMDK_WM8580_EXT_MCLK; - - if (machine_is_smdkc110() || machine_is_smdkv210()) - xtal_freq = mclk_freq = SMDK_WM8580_EXT_VOICE; - - smdk_pcm.dev = &pdev->dev; - ret = devm_snd_soc_register_card(&pdev->dev, &smdk_pcm); - if (ret) - dev_err(&pdev->dev, "snd_soc_register_card failed %d\n", ret); - - return ret; -} - -static struct platform_driver snd_smdk_driver = { - .driver = { - .name = "samsung-smdk-pcm", - }, - .probe = snd_smdk_probe, -}; - -module_platform_driver(snd_smdk_driver); - -MODULE_AUTHOR("Sangbeom Kim, <sbkim73(a)samsung.com>"); -MODULE_DESCRIPTION("ALSA SoC SMDK WM8580 for PCM"); -MODULE_LICENSE("GPL"); -- 2.10.2

1 0

[alsa-devel] [PATCH 0/23] ASoC: add OF graph base simple-card
by Kuninori Morimoto 11 Nov '16

11 Nov '16

Hi Rob, Mark These are OF graph base simple-card patch-set. 1) - 3) : simple-scu-card cleanup 4) - 10) : soc-core prepare for OF graph card 11) - 17) : OF graph new feature 18) - 23) : OF graph base simple-card I posted 11) - 17) OF graph new feature patches before, and then Rob requested about usecase. 18) - 23) can be usecase for it. 1) - 10) are independent (= Mark) 11) - 17) are independent (= Rob) 18) - 23) are depends on 1) - 10) and 11) - 17) (= Mark) Kuninori Morimoto (23): 1) ASoC: simple-scu-card: code sync: follow to simple family style 2) ASoC: simple-scu-card: code sync: rename asoc_simple_card_priv 3) ASoC: simple-scu-card: code sync: tidyup props/link naming 4) ASoC: soc-core: adjust for graph on snd_soc_of_parse_card_name 5) ASoC: soc-core: adjust for graph on snd_soc_of_parse_audio_simple_widgets 6) ASoC: soc-core: adjust for graph on snd_soc_of_parse_audio_routing 7) ASoC: soc-core: adjust for graph on snd_soc_of_parse_audio_prefix 8) ASoC: soc-core: snd_soc_get_dai_name() become non static 9) ASoC: simple-card-utils: remove unnecessary cpu/codec pointer check 10) ASoC: simple-card-utils: adjust for graph on asoc_simple_card_parse_card_name 11) Documentation: of: add type property 12) of_graph: add of_graph_get_remote_endpoint() 13) of_graph: add of_graph_port_type_is() 14) of_graph: add of_graph_get_port_parent() 15) of_graph: add of_graph_get_top_port() 16) of_graph: add for_each_of_port() / for_each_of_endpoint_in_port() 17) of_graph: add of_graph_get_endpoint_count() 18) ASoC: simple-card-utils: add asoc_simple_card_parse_graph_dai() 19) ASoC: simple-card-utils: add asoc_simple_card_try_to_probe_graph_card() 20) ASoC: add simple-graph-card document 21) ASoC: add simple-graph-card support 22) ASoC: add simple-graph-scu-card document 23) ASoC: add simple-graph-scu-card support Documentation/devicetree/bindings/graph.txt | 21 +++++ Documentation/devicetree/bindings/sound/simple-graph-card.txt | 65 ++++++++++++++ Documentation/devicetree/bindings/sound/simple-graph-scu-card.txt | 66 ++++++++++++++ drivers/of/base.c | 166 +++++++++++++++++++++++++++++++--- include/linux/of_graph.h | 62 +++++++++++++ include/sound/simple_card_utils.h | 14 +++ include/sound/soc.h | 32 +++++-- sound/soc/generic/Kconfig | 15 ++++ sound/soc/generic/Makefile | 4 + sound/soc/generic/simple-card-utils.c | 105 +++++++++++++++++++++- sound/soc/generic/simple-card.c | 2 +- sound/soc/generic/simple-graph-card.c | 461 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ sound/soc/generic/simple-graph-scu-card.c | 437 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ sound/soc/generic/simple-scu-card.c | 115 +++++++++++------------- sound/soc/soc-core.c | 41 +++++---- 15 files changed, 1505 insertions(+), 101 deletions(-)

4 40

Re: [alsa-devel] BeagleBone with TLV320AIC3100
by Kai Riedel 11 Nov '16

11 Nov '16

Hi, is there a possibility (parameter in dts file) to get the mclk from the sitara and not from an external oscillator? With external clock it works fine now. BR, Kai

2 1

[alsa-devel] [PATCH] ASoC: nau8825: Disable short Frame Sync detection logic
by John Hsu 11 Nov '16

11 Nov '16

If the short Frame Sync detection logic enabled, the logic will check the short frame sync threshold. If frame sync is less than the setting; for example, frame sync less than 252 MCLK, the short frame sync signal is flagged, digital filter temporary mute and skip that data. If the system was intended for sampling rate change which could create temporary short frame sync and not enough MIPS to run the digital filter. But the situation doesn't happen in ALSA architecure. Thus the Frame Sync is always stable, then no require to do the detection. Therefore, the dirver disables the function for better performance. Signed-off-by: John Hsu <KCHSU0(a)nuvoton.com> --- sound/soc/codecs/nau8825.c | 3 +++ sound/soc/codecs/nau8825.h | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/sound/soc/codecs/nau8825.c b/sound/soc/codecs/nau8825.c index 8f2608a..3f9137f 100644 --- a/sound/soc/codecs/nau8825.c +++ b/sound/soc/codecs/nau8825.c @@ -1883,6 +1883,9 @@ static void nau8825_init_regs(struct nau8825 *nau8825) NAU8825_DACL_CH_SEL_MASK, NAU8825_DACL_CH_SEL_L); regmap_update_bits(nau8825->regmap, NAU8825_REG_DACR_CTRL, NAU8825_DACL_CH_SEL_MASK, NAU8825_DACL_CH_SEL_R); + /* Disable short Frame Sync detection logic */ + regmap_update_bits(regmap, NAU8825_REG_LEFT_TIME_SLOT, + NAU8825_DIS_FS_SHORT_DET, NAU8825_DIS_FS_SHORT_DET); } static const struct regmap_config nau8825_regmap_config = { diff --git a/sound/soc/codecs/nau8825.h b/sound/soc/codecs/nau8825.h index 46cd1a6..0672a25 100644 --- a/sound/soc/codecs/nau8825.h +++ b/sound/soc/codecs/nau8825.h @@ -255,6 +255,11 @@ #define NAU8825_I2S_MS_SLAVE (0 << NAU8825_I2S_MS_SFT) #define NAU8825_I2S_BLK_DIV_MASK 0x7 +/* LEFT_TIME_SLOT (0x1e) */ +#define NAU8825_FS_ERR_CMP_SEL_SFT 14 +#define NAU8825_FS_ERR_CMP_SEL_MASK (0x3 << NAU8825_FS_ERR_CMP_SEL_SFT) +#define NAU8825_DIS_FS_SHORT_DET (1 << 13) + /* BIQ_CTRL (0x20) */ #define NAU8825_BIQ_WRT_SFT 4 #define NAU8825_BIQ_WRT_EN (1 << NAU8825_BIQ_WRT_SFT) -- 2.6.4

1 0

[alsa-devel] [PATCH 00/30] Modernize documents
by Takashi Iwai 10 Nov '16

10 Nov '16

Hi, this is a patch set to convert most of document files in Documentation/sound/alsa/ and Documentation/DocBook/ to the ReST format that has been recently introduced. The files are moved to a few different subdirectories depending on the contents, with renames to lower letters to be more consistent. I didn't try to correct / update the contents unless really needed, but only concentrate on reformatting. Most of changes are trivial, and can be seen easily in git diff. Some are more intrusive (e.g. the conversion from DocBook or HTML). The ASoC documents aren't included in this patch set. They will follow later. The latest changes are found in topic/restize-docs branch of my sound git tree. Takashi === Takashi Iwai (30): ALSA: doc: Remove alsa-parameters.txt ALSA: doc: ReSTize alsa-driver-api document ALSA: doc: ReSTize writing-an-alsa-driver document ALSA: doc: ReSTize HD-Audio document ALSA: doc: ReSTize HD-Audio-Models document ALSA: doc: ReSTize HD-Audio-Controls document ALSA: doc: ReSTize HD-Audio-DP-MST-audio.txt ALSA: doc: ReSTize ALSA-Configuration document ALSA: doc: ReSTize Procfile document ALSA: doc: ReSTize powersave document ALSA: doc: ReSTize Channel-Mapping-API document ALSA: doc: ReSTize OSS-Emulation document ALSA: doc: ReSTize seq_oss document ALSA: doc: ReSTize ControlNames.txt ALSA: doc: ReSTize compress-offload document ALSA: doc: ReSTize timestamping document ALSA: doc: ReSTize Jack-Controls.txt ALSA: doc: ReSTize Joystick document ALSA: doc: ReSTize CMIPCI document ALSA: doc: ReSTize SB-Live-mixer document ALSA: doc: ReSTize Audigy-mixer.txt ALSA: doc: ReSTize emu10k1-jack.txt ALSA: doc: ReSTize VIA82xx-mixer.txt ALSA: doc: ReSTize Audiophile-USB.txt ALSA: doc: ReSTize MIXART.txt ALSA: doc: ReSTize Bt87x.txt ALSA: doc: ReSTize README.maya44 ALSA: doc: ReSTize hdspm.txt ALSA: doc: ReSTize serial-u16550.txt ALSA: doc: ReSTize img,spdif-in.txt Documentation/DocBook/Makefile | 3 +- Documentation/DocBook/alsa-driver-api.tmpl | 142 - Documentation/DocBook/writing-an-alsa-driver.tmpl | 6206 -------------------- Documentation/index.rst | 1 + Documentation/sound/alsa-configuration.rst | 2683 +++++++++ Documentation/sound/alsa/ALSA-Configuration.txt | 2330 -------- Documentation/sound/alsa/ControlNames.txt | 107 - Documentation/sound/alsa/HD-Audio-Models.txt | 324 - Documentation/sound/alsa/VIA82xx-mixer.txt | 8 - Documentation/sound/alsa/alsa-parameters.txt | 135 - Documentation/sound/alsa/seq_oss.html | 409 -- .../Audigy-mixer.txt => cards/audigy-mixer.rst} | 297 +- .../audiophile-usb.rst} | 258 +- .../sound/{alsa/Bt87x.txt => cards/bt87x.rst} | 23 +- .../sound/{alsa/CMIPCI.txt => cards/cmipci.rst} | 62 +- .../emu10k1-jack.txt => cards/emu10k1-jack.rst} | 20 +- .../sound/{alsa/hdspm.txt => cards/hdspm.rst} | 253 +- .../img,spdif-in.txt => cards/img-spdif-in.rst} | 24 +- Documentation/sound/cards/index.rst | 19 + .../{alsa/Joystick.txt => cards/joystick.rst} | 71 +- .../sound/{alsa/README.maya44 => cards/maya44.rst} | 137 +- .../sound/{alsa/MIXART.txt => cards/mixart.rst} | 26 +- .../SB-Live-mixer.txt => cards/sb-live-mixer.rst} | 337 +- .../serial-u16550.txt => cards/serial-u16550.rst} | 21 +- Documentation/sound/cards/via82xx-mixer.rst | 8 + .../channel-mapping-api.rst} | 77 +- .../compress-offload.rst} | 127 +- Documentation/sound/designs/control-names.rst | 142 + Documentation/sound/designs/index.rst | 15 + .../jack-controls.rst} | 13 +- .../oss-emulation.rst} | 169 +- .../{alsa/powersave.txt => designs/powersave.rst} | 16 +- .../{alsa/Procfile.txt => designs/procfile.rst} | 106 +- Documentation/sound/designs/seq-oss.rst | 371 ++ .../timestamping.txt => designs/timestamping.rst} | 143 +- .../controls.rst} | 33 +- .../dp-mst.rst} | 30 +- Documentation/sound/hd-audio/index.rst | 10 + Documentation/sound/hd-audio/models.rst | 518 ++ .../{alsa/HD-Audio.txt => hd-audio/notes.rst} | 635 +- Documentation/sound/index.rst | 19 + Documentation/sound/kernel-api/alsa-driver-api.rst | 134 + Documentation/sound/kernel-api/index.rst | 8 + .../sound/kernel-api/writing-an-alsa-driver.rst | 4219 +++++++++++++ 44 files changed, 9766 insertions(+), 10923 deletions(-) delete mode 100644 Documentation/DocBook/alsa-driver-api.tmpl delete mode 100644 Documentation/DocBook/writing-an-alsa-driver.tmpl create mode 100644 Documentation/sound/alsa-configuration.rst delete mode 100644 Documentation/sound/alsa/ALSA-Configuration.txt delete mode 100644 Documentation/sound/alsa/ControlNames.txt delete mode 100644 Documentation/sound/alsa/HD-Audio-Models.txt delete mode 100644 Documentation/sound/alsa/VIA82xx-mixer.txt delete mode 100644 Documentation/sound/alsa/alsa-parameters.txt delete mode 100644 Documentation/sound/alsa/seq_oss.html rename Documentation/sound/{alsa/Audigy-mixer.txt => cards/audigy-mixer.rst} (57%) rename Documentation/sound/{alsa/Audiophile-Usb.txt => cards/audiophile-usb.rst} (81%) rename Documentation/sound/{alsa/Bt87x.txt => cards/bt87x.rst} (82%) rename Documentation/sound/{alsa/CMIPCI.txt => cards/cmipci.rst} (86%) rename Documentation/sound/{alsa/emu10k1-jack.txt => cards/emu10k1-jack.rst} (89%) rename Documentation/sound/{alsa/hdspm.txt => cards/hdspm.rst} (56%) rename Documentation/sound/{alsa/img,spdif-in.txt => cards/img-spdif-in.rst} (68%) create mode 100644 Documentation/sound/cards/index.rst rename Documentation/sound/{alsa/Joystick.txt => cards/joystick.rst} (56%) rename Documentation/sound/{alsa/README.maya44 => cards/maya44.rst} (65%) rename Documentation/sound/{alsa/MIXART.txt => cards/mixart.rst} (83%) rename Documentation/sound/{alsa/SB-Live-mixer.txt => cards/sb-live-mixer.rst} (54%) rename Documentation/sound/{alsa/serial-u16550.txt => cards/serial-u16550.rst} (92%) create mode 100644 Documentation/sound/cards/via82xx-mixer.rst rename Documentation/sound/{alsa/Channel-Mapping-API.txt => designs/channel-mapping-api.rst} (75%) rename Documentation/sound/{alsa/compress_offload.txt => designs/compress-offload.rst} (73%) create mode 100644 Documentation/sound/designs/control-names.rst create mode 100644 Documentation/sound/designs/index.rst rename Documentation/sound/{alsa/Jack-Controls.txt => designs/jack-controls.rst} (86%) rename Documentation/sound/{alsa/OSS-Emulation.txt => designs/oss-emulation.rst} (70%) rename Documentation/sound/{alsa/powersave.txt => designs/powersave.rst} (76%) rename Documentation/sound/{alsa/Procfile.txt => designs/procfile.rst} (71%) create mode 100644 Documentation/sound/designs/seq-oss.rst rename Documentation/sound/{alsa/timestamping.txt => designs/timestamping.rst} (56%) rename Documentation/sound/{alsa/HD-Audio-Controls.txt => hd-audio/controls.rst} (92%) rename Documentation/sound/{alsa/HD-Audio-DP-MST-audio.txt => hd-audio/dp-mst.rst} (69%) create mode 100644 Documentation/sound/hd-audio/index.rst create mode 100644 Documentation/sound/hd-audio/models.rst rename Documentation/sound/{alsa/HD-Audio.txt => hd-audio/notes.rst} (61%) create mode 100644 Documentation/sound/index.rst create mode 100644 Documentation/sound/kernel-api/alsa-driver-api.rst create mode 100644 Documentation/sound/kernel-api/index.rst create mode 100644 Documentation/sound/kernel-api/writing-an-alsa-driver.rst -- 2.10.2

1 30

[alsa-devel] [asoc:topic/sunxi 16/16] sound/soc/sunxi/sun4i-codec.c:1339:2-3: Unneeded semicolon
by kbuild test robot 10 Nov '16

10 Nov '16

tree: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git topic/sunxi head: 9aead156c0665a362c8b007b51fe3396fea4d346 commit: 9aead156c0665a362c8b007b51fe3396fea4d346 [16/16] ASoC: sun4i-codec: Add support for optional reset control to quirks coccinelle warnings: (new ones prefixed by >>) >> sound/soc/sunxi/sun4i-codec.c:1339:2-3: Unneeded semicolon Please review and possibly fold the followup patch. --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

3 3

[alsa-devel] [asoc:topic/cs42l42 4/5] sound/soc/codecs/cs42l42.c:1972:3-8: No need to set .owner here. The core will do it.
by kbuild test robot 10 Nov '16

10 Nov '16

tree: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git topic/cs42l42 head: da16c55793539a8c83c81240984915ce6d0140fe commit: 2c394ca79604b404fe60218670ab301ecb758b34 [4/5] ASoC: Add support for CS42L42 codec coccinelle warnings: (new ones prefixed by >>) >> sound/soc/codecs/cs42l42.c:1972:3-8: No need to set .owner here. The core will do it. Please review and possibly fold the followup patch. --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

2 2

[alsa-devel] [PATCH] ASoC: wm2200: Correct types of mixer texts and values
by Charles Keepax 10 Nov '16

10 Nov '16

The core expects "const char * const" and "unsigned int" for enum controls, the mixer control definitions in wm2200 use "const char *" and "int". This patch corrects the type of these arrays. Signed-off-by: Charles Keepax <ckeepax(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm2200.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/wm2200.c b/sound/soc/codecs/wm2200.c index 606bf88..d83dab5 100644 --- a/sound/soc/codecs/wm2200.c +++ b/sound/soc/codecs/wm2200.c @@ -999,7 +999,7 @@ static DECLARE_TLV_DB_SCALE(in_tlv, -6300, 100, 0); static DECLARE_TLV_DB_SCALE(digital_tlv, -6400, 50, 0); static DECLARE_TLV_DB_SCALE(out_tlv, -6400, 100, 0); -static const char *wm2200_mixer_texts[] = { +static const char * const wm2200_mixer_texts[] = { "None", "Tone Generator", "AEC Loopback", @@ -1033,7 +1033,7 @@ static const char *wm2200_mixer_texts[] = { "DSP2.6", }; -static int wm2200_mixer_values[] = { +static unsigned int wm2200_mixer_values[] = { 0x00, 0x04, /* Tone */ 0x08, /* AEC */ -- 2.1.4

2 1

[alsa-devel] [PATCH 1/2] ASoC: arizona: Move notifier functions to header and make inline
by Charles Keepax 10 Nov '16

10 Nov '16

These functions are very thin wrappers around core functions, so they make sense as inline functions. Also making them inline avoids build issues in the case where the machine driver is built in but the CODEC is built as a module. Signed-off-by: Charles Keepax <ckeepax(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/arizona.c | 24 ------------------------ sound/soc/codecs/arizona.h | 32 ++++++++++++++++++++++++-------- 2 files changed, 24 insertions(+), 32 deletions(-) diff --git a/sound/soc/codecs/arizona.c b/sound/soc/codecs/arizona.c index 99ce6a0e..ca5ca9e 100644 --- a/sound/soc/codecs/arizona.c +++ b/sound/soc/codecs/arizona.c @@ -2691,30 +2691,6 @@ int arizona_lhpf_coeff_put(struct snd_kcontrol *kcontrol, } EXPORT_SYMBOL_GPL(arizona_lhpf_coeff_put); -int arizona_register_notifier(struct snd_soc_codec *codec, - struct notifier_block *nb, - int (*notify)(struct notifier_block *nb, - unsigned long action, void *data)) -{ - struct arizona_priv *priv = snd_soc_codec_get_drvdata(codec); - struct arizona *arizona = priv->arizona; - - nb->notifier_call = notify; - - return blocking_notifier_chain_register(&arizona->notifier, nb); -} -EXPORT_SYMBOL_GPL(arizona_register_notifier); - -int arizona_unregister_notifier(struct snd_soc_codec *codec, - struct notifier_block *nb) -{ - struct arizona_priv *priv = snd_soc_codec_get_drvdata(codec); - struct arizona *arizona = priv->arizona; - - return blocking_notifier_chain_unregister(&arizona->notifier, nb); -} -EXPORT_SYMBOL_GPL(arizona_unregister_notifier); - MODULE_DESCRIPTION("ASoC Wolfson Arizona class device support"); MODULE_AUTHOR("Mark Brown <broonie(a)opensource.wolfsonmicro.com>"); MODULE_LICENSE("GPL"); diff --git a/sound/soc/codecs/arizona.h b/sound/soc/codecs/arizona.h index 34d65d1..813f1cd 100644 --- a/sound/soc/codecs/arizona.h +++ b/sound/soc/codecs/arizona.h @@ -14,6 +14,8 @@ #define _ASOC_ARIZONA_H #include <linux/completion.h> +#include <linux/notifier.h> +#include <linux/mfd/arizona/core.h> #include <sound/soc.h> @@ -66,7 +68,6 @@ /* Notifier events */ #define ARIZONA_NOTIFY_VOICE_TRIGGER 0x1 -struct arizona; struct wm_adsp; struct arizona_dai_priv { @@ -329,12 +330,27 @@ extern bool arizona_input_analog(struct snd_soc_codec *codec, int shift); extern const char *arizona_sample_rate_val_to_name(unsigned int rate_val); -extern int arizona_register_notifier(struct snd_soc_codec *codec, - struct notifier_block *nb, - int (*notify)(struct notifier_block *nb, - unsigned long action, - void *data)); -extern int arizona_unregister_notifier(struct snd_soc_codec *codec, - struct notifier_block *nb); +static inline int arizona_register_notifier(struct snd_soc_codec *codec, + struct notifier_block *nb, + int (*notify) + (struct notifier_block *nb, + unsigned long action, void *data)) +{ + struct arizona_priv *priv = snd_soc_codec_get_drvdata(codec); + struct arizona *arizona = priv->arizona; + + nb->notifier_call = notify; + + return blocking_notifier_chain_register(&arizona->notifier, nb); +} + +static inline int arizona_unregister_notifier(struct snd_soc_codec *codec, + struct notifier_block *nb) +{ + struct arizona_priv *priv = snd_soc_codec_get_drvdata(codec); + struct arizona *arizona = priv->arizona; + + return blocking_notifier_chain_unregister(&arizona->notifier, nb); +} #endif -- 2.1.4

2 3