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

[alsa-devel] [PATCH] ASoC: fix build warning in soc-core.c
by Randy Dunlap 02 Nov '17

02 Nov '17

From: Randy Dunlap <rdunlap(a)infradead.org> Fix kernel-doc build error. A symbol that ends with an underscore character ('_') has special meaning in reST (reStructuredText), so add a '*' to prevent this error and to indicate that there are several of these values to choose from. ../sound/soc/soc-core.c:2799: ERROR: Unknown target name: "snd_soc_daifmt". Signed-off-by: Randy Dunlap <rdunlap(a)infradead.org> Cc: Liam Girdwood <lgirdwood(a)gmail.com> Cc: Mark Brown <broonie(a)kernel.org> Cc: alsa-devel(a)alsa-project.org --- sound/soc/soc-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- lnx-414-rc7.orig/sound/soc/soc-core.c +++ lnx-414-rc7/sound/soc/soc-core.c @@ -2796,7 +2796,7 @@ EXPORT_SYMBOL_GPL(snd_soc_dai_set_bclk_r /** * snd_soc_dai_set_fmt - configure DAI hardware audio format. * @dai: DAI - * @fmt: SND_SOC_DAIFMT_ format value. + * @fmt: SND_SOC_DAIFMT_* format value. * * Configures the DAI hardware format and clocking. */

2 1

[alsa-devel] [PATCH RESEND1 00/12] ALSA: vsnd: Add Xen para-virtualized frontend driver
by Oleksandr Andrushchenko 02 Nov '17

02 Nov '17

From: Oleksandr Andrushchenko <oleksandr_andrushchenko(a)epam.com> This patch series adds support for Xen [1] para-virtualized sound frontend driver. It implements the protocol from include/xen/interface/io/sndif.h with the following limitations: - mute/unmute is not supported - get/set volume is not supported Volume control is not supported for the reason that most of the use-cases (at the moment) are based on scenarious where unprivileged OS (e.g. Android, AGL etc) use software mixers. Both capture and playback are supported. Thank you, Oleksandr Resending because of rebase onto [2] + added missing patch [1] https://xenproject.org/ [2] https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git/log/?h=for-… Oleksandr Andrushchenko (12): ALSA: vsnd: Introduce Xen para-virtualized sound frontend driver ALSA: vsnd: Implement driver's probe/remove ALSA: vsnd: Implement Xen bus state handling ALSA: vsnd: Read sound driver configuration from Xen store ALSA: vsnd: Implement Xen event channel handling ALSA: vsnd: Implement handling of shared buffers ALSA: vsnd: Introduce ALSA virtual sound driver ALSA: vsnd: Initialize virtul sound card ALSA: vsnd: Add timer for period interrupt emulation ALSA: vsnd: Implement ALSA PCM operations ALSA: vsnd: Implement communication with backend ALSA: vsnd: Introduce Kconfig option to enable Xen PV sound sound/drivers/Kconfig | 12 + sound/drivers/Makefile | 2 + sound/drivers/xen-front.c | 2107 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 2121 insertions(+) create mode 100644 sound/drivers/xen-front.c -- 2.7.4

5 33

[alsa-devel] [Patch v6 0/7] Introduce framework for SLIMbus device drivers
by srinivas.kandagatla＠linaro.org 02 Nov '17

02 Nov '17

From: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> It's been very long time since there was any activity on the slimbus patches, Am currently working on getting Qualcomm DSP based audio working on top of mainline. Slimbus is one of the major component for getting any analog audio on QCOM SoC's. So am taking intiative to address the review comments on the older patchset and send it. I have tested this patch on IFC6410 board with wcd9310 codec. SLIMbus (Serial Low Power Interchip Media Bus) is a specification developed by MIPI (Mobile Industry Processor Interface) alliance. SLIMbus is a 2-wire implementation, which is used to communicate with peripheral components like audio-codec. SLIMbus uses Time-Division-Multiplexing to accommodate multiple data channels, and control channel. Control channel has messages to do device-enumeration, messages to send/receive control-data to/from slimbus devices, messages for port/channel management, and messages to do bandwidth allocation. Framework is introduced to support multiple instances of the bus (1 controller per bus), and multiple slave devices per controller. SPI and I2C frameworks, and comments from last time when I submitted the patches were referred-to while working on this framework. These patchsets introduce device-management, OF helpers, and messaging APIs, controller driver for Qualcomm's slimbus controller, and clock-pause feature for entering/exiting low-power mode for SLIMbus. Framework patches to do channel, port and bandwidth management are work-in-progress and will be sent out once these initial patches are accepted. These patchsets were tested on Qualcomm Snapdragon processor board using the controller driver, and a test slave device. Changes from V5 to V6: * aligned slim_driver_register more like other buses, suggested by Arnd. * removed boardinfo and add_device apis for now, suggested by Arnd * Few namespace cleanups suggested by Masami * merged of apis in to first patch as suggested by Arnd. * slimbus clients "compatible" name space made much inline with USB and PCIE, suggested by Rob and Arnd. * Removed memory allocations to controller drivers, as suggested by Arnd. * Various bindings comments addressed as suggested by Mark and others. * Added regmap interface so that codecs can write more generic code. * Added MAINTAINER file. Sagar Dharia (5): slimbus: Device management on SLIMbus slimbus: Add messaging APIs to slimbus framework slimbus: qcom: Add Qualcomm Slimbus controller driver slimbus: Add support for 'clock-pause' feature slimbus: qcom: Add runtime-pm support using clock-pause feature Srinivas Kandagatla (2): regmap: add SLIMBUS support MAINTAINERS: Add SLIMbus maintainer Documentation/devicetree/bindings/slimbus/bus.txt | 57 ++ .../devicetree/bindings/slimbus/slim-qcom-ctrl.txt | 43 ++ Documentation/slimbus/summary | 109 ++++ MAINTAINERS | 8 + drivers/Kconfig | 2 + drivers/Makefile | 1 + drivers/base/regmap/Kconfig | 4 + drivers/base/regmap/Makefile | 1 + drivers/base/regmap/regmap-slimbus.c | 89 +++ drivers/slimbus/Kconfig | 20 + drivers/slimbus/Makefile | 8 + drivers/slimbus/slim-core.c | 725 +++++++++++++++++++++ drivers/slimbus/slim-messaging.c | 509 +++++++++++++++ drivers/slimbus/slim-qcom-ctrl.c | 714 ++++++++++++++++++++ drivers/slimbus/slim-qcom.h | 64 ++ drivers/slimbus/slim-sched.c | 126 ++++ include/linux/mod_devicetable.h | 13 + include/linux/regmap.h | 18 + include/linux/slimbus.h | 512 +++++++++++++++ 19 files changed, 3023 insertions(+) create mode 100644 Documentation/devicetree/bindings/slimbus/bus.txt create mode 100644 Documentation/devicetree/bindings/slimbus/slim-qcom-ctrl.txt create mode 100644 Documentation/slimbus/summary create mode 100644 drivers/base/regmap/regmap-slimbus.c create mode 100644 drivers/slimbus/Kconfig create mode 100644 drivers/slimbus/Makefile create mode 100644 drivers/slimbus/slim-core.c create mode 100644 drivers/slimbus/slim-messaging.c create mode 100644 drivers/slimbus/slim-qcom-ctrl.c create mode 100644 drivers/slimbus/slim-qcom.h create mode 100644 drivers/slimbus/slim-sched.c create mode 100644 include/linux/slimbus.h -- 2.9.3

11 57

[alsa-devel] [PATCH] dmaengine: imx-sdma: advertise all supported slave bus widths
by Lucas Stach 31 Oct '17

31 Oct '17

The commit [1] which changed imx-pcm-dma to derive the pcm_config from the attached dmaengine introduced a regression on the supported sample formats, as imx-sdma doesn't properly advertise all the supported slave bus widths. Fix this to restore full functionality of the imx sound subsystem. [1] 70d435ba1cd6 ("ASoC: imx-pcm-dma: simplify pcm_config") Signed-off-by: Lucas Stach <l.stach(a)pengutronix.de> --- drivers/dma/imx-sdma.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index a67ec1bdc4e0..e374183f19d0 100644 --- a/drivers/dma/imx-sdma.c +++ b/drivers/dma/imx-sdma.c @@ -1851,8 +1851,12 @@ static int sdma_probe(struct platform_device *pdev) sdma->dma_device.device_prep_dma_cyclic = sdma_prep_dma_cyclic; sdma->dma_device.device_config = sdma_config; sdma->dma_device.device_terminate_all = sdma_disable_channel_with_delay; - sdma->dma_device.src_addr_widths = BIT(DMA_SLAVE_BUSWIDTH_4_BYTES); - sdma->dma_device.dst_addr_widths = BIT(DMA_SLAVE_BUSWIDTH_4_BYTES); + sdma->dma_device.src_addr_widths = BIT(DMA_SLAVE_BUSWIDTH_4_BYTES) | + BIT(DMA_SLAVE_BUSWIDTH_2_BYTES) | + BIT(DMA_SLAVE_BUSWIDTH_1_BYTE); + sdma->dma_device.dst_addr_widths = BIT(DMA_SLAVE_BUSWIDTH_4_BYTES) | + BIT(DMA_SLAVE_BUSWIDTH_2_BYTES) | + BIT(DMA_SLAVE_BUSWIDTH_1_BYTE); sdma->dma_device.directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV); sdma->dma_device.residue_granularity = DMA_RESIDUE_GRANULARITY_SEGMENT; sdma->dma_device.device_issue_pending = sdma_issue_pending; -- 2.11.0

4 11

[alsa-devel] [PATCH] ASoC: rt5645: remove unexisting route on new rt5645
by Bard Liao 31 Oct '17

31 Oct '17

"SPOL MIX DAC R1 Switch" and "SPOL MIX SPKVOL R Switch" are only exist in the early version of rt5645. Signed-off-by: Bard Liao <bardliao(a)realtek.com> --- sound/soc/codecs/rt5645.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/rt5645.c b/sound/soc/codecs/rt5645.c index e34f278..b7eef6a 100644 --- a/sound/soc/codecs/rt5645.c +++ b/sound/soc/codecs/rt5645.c @@ -432,6 +432,7 @@ struct rt5645_priv { int jack_type; bool en_button_func; bool hp_on; + int v_id; }; static int rt5645_reset(struct snd_soc_codec *codec) @@ -2516,9 +2517,7 @@ static const struct snd_soc_dapm_route rt5645_dapm_routes[] = { { "SPKVOL L", "Switch", "SPK MIXL" }, { "SPKVOL R", "Switch", "SPK MIXR" }, - { "SPOL MIX", "DAC R1 Switch", "DAC R1" }, { "SPOL MIX", "DAC L1 Switch", "DAC L1" }, - { "SPOL MIX", "SPKVOL R Switch", "SPKVOL R" }, { "SPOL MIX", "SPKVOL L Switch", "SPKVOL L" }, { "SPOR MIX", "DAC R1 Switch", "DAC R1" }, { "SPOR MIX", "SPKVOL R Switch", "SPKVOL R" }, @@ -2707,6 +2706,11 @@ static const struct snd_soc_dapm_route rt5645_specific_dapm_routes[] = { { "DAC R2 Mux", "IF1 DAC", "RT5645 IF1 DAC2 R Mux" }, }; +static const struct snd_soc_dapm_route rt5645_old_dapm_routes[] = { + { "SPOL MIX", "DAC R1 Switch", "DAC R1" }, + { "SPOL MIX", "SPKVOL R Switch", "SPKVOL R" }, +}; + static int rt5645_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params, struct snd_soc_dai *dai) { @@ -3363,6 +3367,11 @@ static int rt5645_probe(struct snd_soc_codec *codec) snd_soc_dapm_add_routes(dapm, rt5645_specific_dapm_routes, ARRAY_SIZE(rt5645_specific_dapm_routes)); + if (rt5645->v_id < 3) { + snd_soc_dapm_add_routes(dapm, + rt5645_old_dapm_routes, + ARRAY_SIZE(rt5645_old_dapm_routes)); + } break; case CODEC_TYPE_RT5650: snd_soc_dapm_new_controls(dapm, @@ -3803,6 +3812,9 @@ static int rt5645_i2c_probe(struct i2c_client *i2c, regmap_write(rt5645->regmap, RT5645_RESET, 0); + regmap_read(regmap, RT5645_VENDOR_ID, &val); + rt5645->v_id = val & 0xff; + ret = regmap_register_patch(rt5645->regmap, init_list, ARRAY_SIZE(init_list)); if (ret != 0) -- 2.7.4

2 1

[alsa-devel] [PATCH 0/5] ASoC: rsnd: small tidyups for Renesas sound
by Kuninori Morimoto 31 Oct '17

31 Oct '17

Hi Mark These are small tidyups for Renesas sound driver. Kuninori Morimoto (5): ASoC: rsnd: don't use io->mod[] directly ASoC: rsnd: tidyup rsnd_mod_next() for loop method ASoC: rsnd: NULL check is not needed for clk_unprepare() ASoC: rsnd: use snd_pcm_running() in rsnd_io_is_working() ASoC: rsnd: Don't check SSISR::DIRQ when Capture sound/soc/sh/rcar/core.c | 16 ++++++++-------- sound/soc/sh/rcar/ssi.c | 15 +++++++++------ 2 files changed, 17 insertions(+), 14 deletions(-) -- 1.9.1

2 10

[alsa-devel] [PATCH 0/2] Enable TDM slot and fix SSP params for kabylake machine driver
by Harsha Priya 31 Oct '17

31 Oct '17

This patch series includes 2 patches for kabylake machine driver using max98927 and rt5663 codecs. The changes are: 1. Enable 4 tdm slots for IV feedback and 2 tdm slots for playback on max98927 2. Fix setting of SSP parameters to be based on FE and BE dai links. Naveen M (2): ASoC: Intel: Enable tdm slots for max98927 ASoC: Intel: Fix setting of SSP parameters in Kabylake machine driver sound/soc/intel/boards/kbl_rt5663_max98927.c | 55 ++++++++++++++++++++++++++-- 1 file changed, 52 insertions(+), 3 deletions(-) -- 1.9.1

3 5

[alsa-devel] [PATCH] ASoC: Intel: kbl: fix jack name
by Vinod Koul 31 Oct '17

31 Oct '17

Commit d1c4cb447a7e ("ASoC: Intel: Skylake: Fix jack name format substitution") added Jack name but erroneously added a space as well, so remove the space in Jack name. Fixes: d1c4cb447a7e ("ASoC: Intel: Skylake: Fix jack name format substitution") Signed-off-by: Vinod Koul <vinod.koul(a)intel.com> --- sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c b/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c index 9cd0769ccd34..69ab55956492 100644 --- a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c +++ b/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c @@ -605,7 +605,7 @@ static int kabylake_card_late_probe(struct snd_soc_card *card) list_for_each_entry(pcm, &ctx->hdmi_pcm_list, head) { codec = pcm->codec_dai->codec; snprintf(jack_name, sizeof(jack_name), - "HDMI/DP, pcm=%d Jack", pcm->device); + "HDMI/DP,pcm=%d Jack", pcm->device); err = snd_soc_card_jack_new(card, jack_name, SND_JACK_AVOUT, &ctx->kabylake_hdmi[i], NULL, 0); -- 2.7.4

2 1

[alsa-devel] [PATCH] sound: Retire OSS
by Takashi Iwai 31 Oct '17

31 Oct '17

Hi, below is a snippet of the patch I'm going to apply for finally dropping the OSS code. It's been already disabled for a few kernel versions, and we didn't get any complains. So, as discussed in the last audio mini-summit, we go forward now. Since the whole patch just removing a bunch of files is too big to post (and useless), I attach only a part of it: namely, the changelog, the diffstat, and the files that are modified (but not deleted). thanks, Takashi -- 8< -- From: Takashi Iwai <tiwai(a)suse.de> Subject: [PATCH] sound: Retire OSS Since no complaints have been raised after disabling the build of OSS (Open Sound System) by the commit 31cbee6a5611 ("sound: Disable the build of OSS drivers"), let's finally drop the whole code and documentation. Some glue codes are still left intact since sound/oss/dmasound stuff remains -- which is an independent implementation solely for m68k, and it's not covered by ALSA yet. Also, a couple of API header files (linux/sound.h and linux/soundcard.h) are kept remaining as well, since the OSS API itself is still supported by ALSA OSS emulation, and applications can refer to these. Where we're at it, some help texts in the top-level Kconfig are adjusted, too (who still needs to specify I/O port in kbuild nowadays?). Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- Documentation/sound/oss/ALS | 66 - Documentation/sound/oss/AudioExcelDSP16 | 101 - Documentation/sound/oss/CMI8330 | 152 -- Documentation/sound/oss/ESS | 34 - Documentation/sound/oss/ESS1868 | 55 - Documentation/sound/oss/Introduction | 459 ----- Documentation/sound/oss/MultiSound | 1137 ----------- Documentation/sound/oss/OPL3 | 6 - Documentation/sound/oss/Opti | 218 -- Documentation/sound/oss/PAS16 | 162 -- Documentation/sound/oss/PSS | 41 - Documentation/sound/oss/PSS-updates | 88 - Documentation/sound/oss/README.OSS | 1455 ------------- Documentation/sound/oss/README.modules | 106 - Documentation/sound/oss/README.ymfsb | 107 - Documentation/sound/oss/SoundPro | 105 - Documentation/sound/oss/Soundblaster | 53 - Documentation/sound/oss/Tropez+ | 26 - Documentation/sound/oss/VIBRA16 | 80 - Documentation/sound/oss/WaveArtist | 170 -- Documentation/sound/oss/btaudio | 92 - Documentation/sound/oss/mwave | 185 -- Documentation/sound/oss/oss-parameters.txt | 51 - Documentation/sound/oss/ultrasound | 30 - MAINTAINERS | 11 - sound/Kconfig | 33 +- sound/oss/CHANGELOG | 369 ---- sound/oss/Kconfig | 533 ----- sound/oss/Makefile | 107 - sound/oss/README.FIRST | 6 - sound/oss/ad1848.c | 3062 ---------------------------- sound/oss/ad1848.h | 24 - sound/oss/ad1848_mixer.h | 253 --- sound/oss/aedsp16.c | 1373 ------------- sound/oss/audio.c | 985 --------- sound/oss/bin2hex.c | 39 - sound/oss/coproc.h | 12 - sound/oss/dev_table.c | 256 --- sound/oss/dev_table.h | 390 ---- sound/oss/dmabuf.c | 1268 ------------ sound/oss/hex2hex.c | 101 - sound/oss/kahlua.c | 229 --- sound/oss/midi_ctrl.h | 22 - sound/oss/midi_synth.c | 712 ------- sound/oss/midi_synth.h | 47 - sound/oss/midibuf.c | 427 ---- sound/oss/mpu401.c | 1804 ---------------- sound/oss/mpu401.h | 11 - sound/oss/msnd.c | 413 ---- sound/oss/msnd.h | 278 --- sound/oss/msnd_classic.c | 3 - sound/oss/msnd_classic.h | 185 -- sound/oss/msnd_pinnacle.c | 1941 ------------------ sound/oss/msnd_pinnacle.h | 246 --- sound/oss/opl3.c | 1255 ------------ sound/oss/opl3_hw.h | 246 --- sound/oss/os.h | 45 - sound/oss/pas2.h | 20 - sound/oss/pas2_card.c | 458 ----- sound/oss/pas2_midi.c | 262 --- sound/oss/pas2_mixer.c | 327 --- sound/oss/pas2_pcm.c | 419 ---- sound/oss/pss.c | 1270 ------------ sound/oss/sb.h | 185 -- sound/oss/sb_audio.c | 1097 ---------- sound/oss/sb_card.c | 354 ---- sound/oss/sb_card.h | 149 -- sound/oss/sb_common.c | 1287 ------------ sound/oss/sb_ess.c | 1822 ----------------- sound/oss/sb_ess.h | 34 - sound/oss/sb_midi.c | 206 -- sound/oss/sb_mixer.c | 770 ------- sound/oss/sb_mixer.h | 105 - sound/oss/sequencer.c | 1661 --------------- sound/oss/sleep.h | 18 - sound/oss/sound_calls.h | 87 - sound/oss/sound_config.h | 144 -- sound/oss/sound_firmware.h | 29 - sound/oss/sound_timer.c | 327 --- sound/oss/soundcard.c | 733 ------- sound/oss/soundvers.h | 2 - sound/oss/swarm_cs4297a.c | 2781 ------------------------- sound/oss/sys_timer.c | 280 --- sound/oss/trix.c | 525 ----- sound/oss/tuning.h | 23 - sound/oss/uart401.c | 477 ----- sound/oss/uart6850.c | 361 ---- sound/oss/ulaw.h | 69 - sound/oss/v_midi.c | 290 --- sound/oss/v_midi.h | 14 - sound/oss/vidc.c | 557 ----- sound/oss/vidc.h | 63 - sound/oss/vidc_fill.S | 218 -- sound/oss/waveartist.c | 2043 ------------------- sound/oss/waveartist.h | 92 - 95 files changed, 1 insertion(+), 41223 deletions(-) delete mode 100644 Documentation/sound/oss/ALS delete mode 100644 Documentation/sound/oss/AudioExcelDSP16 delete mode 100644 Documentation/sound/oss/CMI8330 delete mode 100644 Documentation/sound/oss/ESS delete mode 100644 Documentation/sound/oss/ESS1868 delete mode 100644 Documentation/sound/oss/Introduction delete mode 100644 Documentation/sound/oss/MultiSound delete mode 100644 Documentation/sound/oss/OPL3 delete mode 100644 Documentation/sound/oss/Opti delete mode 100644 Documentation/sound/oss/PAS16 delete mode 100644 Documentation/sound/oss/PSS delete mode 100644 Documentation/sound/oss/PSS-updates delete mode 100644 Documentation/sound/oss/README.OSS delete mode 100644 Documentation/sound/oss/README.modules delete mode 100644 Documentation/sound/oss/README.ymfsb delete mode 100644 Documentation/sound/oss/SoundPro delete mode 100644 Documentation/sound/oss/Soundblaster delete mode 100644 Documentation/sound/oss/Tropez+ delete mode 100644 Documentation/sound/oss/VIBRA16 delete mode 100644 Documentation/sound/oss/WaveArtist delete mode 100644 Documentation/sound/oss/btaudio delete mode 100644 Documentation/sound/oss/mwave delete mode 100644 Documentation/sound/oss/oss-parameters.txt delete mode 100644 Documentation/sound/oss/ultrasound delete mode 100644 sound/oss/CHANGELOG delete mode 100644 sound/oss/Kconfig delete mode 100644 sound/oss/Makefile delete mode 100644 sound/oss/README.FIRST delete mode 100644 sound/oss/ad1848.c delete mode 100644 sound/oss/ad1848.h delete mode 100644 sound/oss/ad1848_mixer.h delete mode 100644 sound/oss/aedsp16.c delete mode 100644 sound/oss/audio.c delete mode 100644 sound/oss/bin2hex.c delete mode 100644 sound/oss/coproc.h delete mode 100644 sound/oss/dev_table.c delete mode 100644 sound/oss/dev_table.h delete mode 100644 sound/oss/dmabuf.c delete mode 100644 sound/oss/hex2hex.c delete mode 100644 sound/oss/kahlua.c delete mode 100644 sound/oss/midi_ctrl.h delete mode 100644 sound/oss/midi_synth.c delete mode 100644 sound/oss/midi_synth.h delete mode 100644 sound/oss/midibuf.c delete mode 100644 sound/oss/mpu401.c delete mode 100644 sound/oss/mpu401.h delete mode 100644 sound/oss/msnd.c delete mode 100644 sound/oss/msnd.h delete mode 100644 sound/oss/msnd_classic.c delete mode 100644 sound/oss/msnd_classic.h delete mode 100644 sound/oss/msnd_pinnacle.c delete mode 100644 sound/oss/msnd_pinnacle.h delete mode 100644 sound/oss/opl3.c delete mode 100644 sound/oss/opl3_hw.h delete mode 100644 sound/oss/os.h delete mode 100644 sound/oss/pas2.h delete mode 100644 sound/oss/pas2_card.c delete mode 100644 sound/oss/pas2_midi.c delete mode 100644 sound/oss/pas2_mixer.c delete mode 100644 sound/oss/pas2_pcm.c delete mode 100644 sound/oss/pss.c delete mode 100644 sound/oss/sb.h delete mode 100644 sound/oss/sb_audio.c delete mode 100644 sound/oss/sb_card.c delete mode 100644 sound/oss/sb_card.h delete mode 100644 sound/oss/sb_common.c delete mode 100644 sound/oss/sb_ess.c delete mode 100644 sound/oss/sb_ess.h delete mode 100644 sound/oss/sb_midi.c delete mode 100644 sound/oss/sb_mixer.c delete mode 100644 sound/oss/sb_mixer.h delete mode 100644 sound/oss/sequencer.c delete mode 100644 sound/oss/sleep.h delete mode 100644 sound/oss/sound_calls.h delete mode 100644 sound/oss/sound_config.h delete mode 100644 sound/oss/sound_firmware.h delete mode 100644 sound/oss/sound_timer.c delete mode 100644 sound/oss/soundcard.c delete mode 100644 sound/oss/soundvers.h delete mode 100644 sound/oss/swarm_cs4297a.c delete mode 100644 sound/oss/sys_timer.c delete mode 100644 sound/oss/trix.c delete mode 100644 sound/oss/tuning.h delete mode 100644 sound/oss/uart401.c delete mode 100644 sound/oss/uart6850.c delete mode 100644 sound/oss/ulaw.h delete mode 100644 sound/oss/v_midi.c delete mode 100644 sound/oss/v_midi.h delete mode 100644 sound/oss/vidc.c delete mode 100644 sound/oss/vidc.h delete mode 100644 sound/oss/vidc_fill.S delete mode 100644 sound/oss/waveartist.c delete mode 100644 sound/oss/waveartist.h diff --git a/MAINTAINERS b/MAINTAINERS index 2d3d750b19c0..01f0b76dcc06 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -527,11 +527,6 @@ W: http://ez.analog.com/community/linux-device-drivers S: Supported F: drivers/input/misc/adxl34x.c -AEDSP16 DRIVER -M: Riccardo Facchetti <fizban(a)tin.it> -S: Maintained -F: sound/oss/aedsp16.c - AF9013 MEDIA DRIVER M: Antti Palosaari <crope(a)iki.fi> L: linux-media(a)vger.kernel.org @@ -9199,12 +9194,6 @@ F: include/linux/dt-bindings/mux/ F: include/linux/mux/ F: drivers/mux/ -MULTISOUND SOUND DRIVER -M: Andrew Veliath <andrewtv(a)usa.net> -S: Maintained -F: Documentation/sound/oss/MultiSound -F: sound/oss/msnd* - MULTITECH MULTIPORT CARD (ISICOM) S: Orphan F: drivers/tty/isicom.c diff --git a/sound/Kconfig b/sound/Kconfig index d7d2aac9542e..b6d047985905 100644 --- a/sound/Kconfig +++ b/sound/Kconfig @@ -3,25 +3,7 @@ menuconfig SOUND depends on HAS_IOMEM help If you have a sound card in your computer, i.e. if it can say more - than an occasional beep, say Y. Be sure to have all the information - about your sound card and its configuration down (I/O port, - interrupt and DMA channel), because you will be asked for it. - - You want to read the Sound-HOWTO, available from - <http://www.tldp.org/docs.html#howto>. General information about - the modular sound system is contained in the files - <file:Documentation/sound/oss/Introduction>. The file - <file:Documentation/sound/oss/README.OSS> contains some slightly - outdated but still useful information as well. Newer sound - driver documentation is found in <file:Documentation/sound/alsa/*>. - - If you have a PnP sound card and you want to configure it at boot - time using the ISA PnP tools (read - <http://www.roestock.demon.co.uk/isapnptools/>), then you need to - compile the sound card support as a module and load that module - after the PnP configuration is finished. To do this, choose M here - and read <file:Documentation/sound/oss/README.modules>; the module - will be called soundcore. + than an occasional beep, say Y. if SOUND @@ -114,19 +96,6 @@ source "sound/synth/Kconfig" endif # SND -menuconfig SOUND_PRIME - tristate "Open Sound System (DEPRECATED)" - select SOUND_OSS_CORE - depends on BROKEN - help - Say 'Y' or 'M' to enable Open Sound System drivers. - -if SOUND_PRIME - -source "sound/oss/Kconfig" - -endif # SOUND_PRIME - endif # !UML endif # SOUND -- 2.14.2

2 4

Re: [alsa-devel] possible deadlock in snd_seq_deliver_event
by Dmitry Vyukov 31 Oct '17

31 Oct '17

On Fri, Oct 27, 2017 at 10:09 AM, syzbot <bot+7feb8de6b4d6bf810cf098bef942cc387e79d0ad(a)syzkaller.appspotmail.com> wrote: > Hello, > > syzkaller hit the following crash on > 2bd6bf03f4c1c59381d62c61d03f6cc3fe71f66e > git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git/master > compiler: gcc (GCC) 7.1.1 20170620 > .config is attached > Raw console output is attached. > C reproducer is attached > syzkaller reproducer is attached. See https://goo.gl/kgGztJ > for information about syzkaller reproducers > > > ============================================ > WARNING: possible recursive locking detected > 4.14.0-rc1+ #88 Not tainted > -------------------------------------------- > syzkaller883997/2981 is trying to acquire lock: > (&grp->list_mutex){++++}, at: [<ffffffff83d4dd49>] deliver_to_subscribers > sound/core/seq/seq_clientmgr.c:666 [inline] > (&grp->list_mutex){++++}, at: [<ffffffff83d4dd49>] > snd_seq_deliver_event+0x279/0x790 sound/core/seq/seq_clientmgr.c:807 > > but task is already holding lock: > (&grp->list_mutex){++++}, at: [<ffffffff83d4dd49>] deliver_to_subscribers > sound/core/seq/seq_clientmgr.c:666 [inline] > (&grp->list_mutex){++++}, at: [<ffffffff83d4dd49>] > snd_seq_deliver_event+0x279/0x790 sound/core/seq/seq_clientmgr.c:807 > > other info that might help us debug this: > Possible unsafe locking scenario: > > CPU0 > ---- > lock(&grp->list_mutex); > lock(&grp->list_mutex); > > *** DEADLOCK *** > > May be due to missing lock nesting notation > > 2 locks held by syzkaller883997/2981: > #0: (register_mutex#4){+.+.}, at: [<ffffffff83d60ada>] > odev_release+0x4a/0x70 sound/core/seq/oss/seq_oss.c:152 > #1: (&grp->list_mutex){++++}, at: [<ffffffff83d4dd49>] > deliver_to_subscribers sound/core/seq/seq_clientmgr.c:666 [inline] > #1: (&grp->list_mutex){++++}, at: [<ffffffff83d4dd49>] > snd_seq_deliver_event+0x279/0x790 sound/core/seq/seq_clientmgr.c:807 > > stack backtrace: > CPU: 1 PID: 2981 Comm: syzkaller883997 Not tainted 4.14.0-rc1+ #88 > Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS > Google 01/01/2011 > Call Trace: > __dump_stack lib/dump_stack.c:16 [inline] > dump_stack+0x194/0x257 lib/dump_stack.c:52 > print_deadlock_bug kernel/locking/lockdep.c:1797 [inline] > check_deadlock kernel/locking/lockdep.c:1844 [inline] > validate_chain kernel/locking/lockdep.c:2453 [inline] > __lock_acquire+0x1232/0x4620 kernel/locking/lockdep.c:3498 > lock_acquire+0x1d5/0x580 kernel/locking/lockdep.c:4002 > down_read+0x96/0x150 kernel/locking/rwsem.c:23 > deliver_to_subscribers sound/core/seq/seq_clientmgr.c:666 [inline] > snd_seq_deliver_event+0x279/0x790 sound/core/seq/seq_clientmgr.c:807 > snd_seq_kernel_client_dispatch+0x11e/0x150 > sound/core/seq/seq_clientmgr.c:2309 > dummy_input+0x2c4/0x400 sound/core/seq/seq_dummy.c:104 > snd_seq_deliver_single_event.constprop.11+0x2fb/0x940 > sound/core/seq/seq_clientmgr.c:621 > deliver_to_subscribers sound/core/seq/seq_clientmgr.c:676 [inline] > snd_seq_deliver_event+0x318/0x790 sound/core/seq/seq_clientmgr.c:807 > snd_seq_kernel_client_dispatch+0x11e/0x150 > sound/core/seq/seq_clientmgr.c:2309 > dummy_input+0x2c4/0x400 sound/core/seq/seq_dummy.c:104 > snd_seq_deliver_single_event.constprop.11+0x2fb/0x940 > sound/core/seq/seq_clientmgr.c:621 > snd_seq_deliver_event+0x12c/0x790 sound/core/seq/seq_clientmgr.c:818 > snd_seq_kernel_client_dispatch+0x11e/0x150 > sound/core/seq/seq_clientmgr.c:2309 > snd_seq_oss_dispatch sound/core/seq/oss/seq_oss_device.h:150 [inline] > snd_seq_oss_midi_reset+0x44b/0x700 sound/core/seq/oss/seq_oss_midi.c:481 > snd_seq_oss_synth_reset+0x398/0x980 sound/core/seq/oss/seq_oss_synth.c:416 > snd_seq_oss_reset+0x6c/0x260 sound/core/seq/oss/seq_oss_init.c:448 > snd_seq_oss_release+0x71/0x120 sound/core/seq/oss/seq_oss_init.c:425 > odev_release+0x52/0x70 sound/core/seq/oss/seq_oss.c:153 > __fput+0x333/0x7f0 fs/file_table.c:210 > ____fput+0x15/0x20 fs/file_table.c:244 > task_work_run+0x199/0x270 kernel/task_work.c:112 > exit_task_work include/linux/task_work.h:21 [inline] > do_exit+0xa52/0x1b40 kernel/exit.c:865 > do_group_exit+0x149/0x400 kernel/exit.c:968 > SYSC_exit_group kernel/exit.c:979 [inline] > SyS_exit_group+0x1d/0x20 kernel/exit.c:977 > entry_SYSCALL_64_fastpath+0x1f/0xbe > RIP: 0033:0x442c58 > RSP: 002b:00007ffd15d4f8d8 EFLAGS: 00000246 ORIG_RAX: 00000000000000e7 > RAX: ffffffffffffffda RBX: 0000000000000000 RCX: 0000000000442c58 > RDX: 0000000000000000 RSI: 000000000000003c RDI: 0000000000000000 > RBP: 0000000000000082 R08: 00000000000000e7 R09: ffffffffffffffd0 > R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000401ca0 > R13: 0000000000401d30 R14 I've just re-reproduced this on upstream 15f859ae5c43c7f0a064ed92d33f7a5bc5de6de0 (Oct 26): ============================================ WARNING: possible recursive locking detected 4.14.0-rc6+ #10 Not tainted -------------------------------------------- a.out/3062 is trying to acquire lock: (&grp->list_mutex){++++}, at: [<ffffffff83d28879>] deliver_to_subscribers sound/core/seq/seq_clientmgr.c:666 [inline] (&grp->list_mutex){++++}, at: [<ffffffff83d28879>] snd_seq_deliver_event+0x279/0x790 sound/core/seq/seq_clientmgr.c:807 but task is already holding lock: (&grp->list_mutex){++++}, at: [<ffffffff83d28879>] deliver_to_subscribers sound/core/seq/seq_clientmgr.c:666 [inline] (&grp->list_mutex){++++}, at: [<ffffffff83d28879>] snd_seq_deliver_event+0x279/0x790 sound/core/seq/seq_clientmgr.c:807 other info that might help us debug this: Possible unsafe locking scenario: CPU0 ---- lock(&grp->list_mutex); lock(&grp->list_mutex); *** DEADLOCK *** May be due to missing lock nesting notation 2 locks held by a.out/3062: #0: (register_mutex#4){+.+.}, at: [<ffffffff83d3b5da>] odev_release+0x4a/0x70 sound/core/seq/oss/seq_oss.c:152 #1: (&grp->list_mutex){++++}, at: [<ffffffff83d28879>] deliver_to_subscribers sound/core/seq/seq_clientmgr.c:666 [inline] #1: (&grp->list_mutex){++++}, at: [<ffffffff83d28879>] snd_seq_deliver_event+0x279/0x790 sound/core/seq/seq_clientmgr.c:807 stack backtrace: CPU: 0 PID: 3062 Comm: a.out Not tainted 4.14.0-rc6+ #10 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS Bochs 01/01/2011 Call Trace: __dump_stack lib/dump_stack.c:16 [inline] dump_stack+0x194/0x257 lib/dump_stack.c:52 print_deadlock_bug kernel/locking/lockdep.c:1797 [inline] check_deadlock kernel/locking/lockdep.c:1844 [inline] validate_chain kernel/locking/lockdep.c:2445 [inline] __lock_acquire+0xed5/0x3d50 kernel/locking/lockdep.c:3490 lock_acquire+0x1d5/0x580 kernel/locking/lockdep.c:3994 down_read+0x96/0x150 kernel/locking/rwsem.c:23 deliver_to_subscribers sound/core/seq/seq_clientmgr.c:666 [inline] snd_seq_deliver_event+0x279/0x790 sound/core/seq/seq_clientmgr.c:807 snd_seq_kernel_client_dispatch+0x11e/0x150 sound/core/seq/seq_clientmgr.c:2313 dummy_input+0x2c4/0x400 sound/core/seq/seq_dummy.c:104 snd_seq_deliver_single_event.constprop.11+0x2fb/0x940 sound/core/seq/seq_clientmgr.c:621 deliver_to_subscribers sound/core/seq/seq_clientmgr.c:676 [inline] snd_seq_deliver_event+0x318/0x790 sound/core/seq/seq_clientmgr.c:807 snd_seq_kernel_client_dispatch+0x11e/0x150 sound/core/seq/seq_clientmgr.c:2313 dummy_input+0x2c4/0x400 sound/core/seq/seq_dummy.c:104 snd_seq_deliver_single_event.constprop.11+0x2fb/0x940 sound/core/seq/seq_clientmgr.c:621 snd_seq_deliver_event+0x12c/0x790 sound/core/seq/seq_clientmgr.c:818 snd_seq_kernel_client_dispatch+0x11e/0x150 sound/core/seq/seq_clientmgr.c:2313 snd_seq_oss_dispatch sound/core/seq/oss/seq_oss_device.h:150 [inline] snd_seq_oss_midi_reset+0x44b/0x700 sound/core/seq/oss/seq_oss_midi.c:481 snd_seq_oss_synth_reset+0x398/0x980 sound/core/seq/oss/seq_oss_synth.c:416 snd_seq_oss_reset+0x6c/0x260 sound/core/seq/oss/seq_oss_init.c:448 snd_seq_oss_release+0x71/0x120 sound/core/seq/oss/seq_oss_init.c:425 odev_release+0x52/0x70 sound/core/seq/oss/seq_oss.c:153 __fput+0x327/0x7e0 fs/file_table.c:210 ____fput+0x15/0x20 fs/file_table.c:244 task_work_run+0x199/0x270 kernel/task_work.c:112 exit_task_work include/linux/task_work.h:21 [inline] do_exit+0x9b5/0x1ad0 kernel/exit.c:865 do_group_exit+0x149/0x400 kernel/exit.c:968 SYSC_exit_group kernel/exit.c:979 [inline] SyS_exit_group+0x1d/0x20 kernel/exit.c:977 entry_SYSCALL_64_fastpath+0x1f/0xbe RIP: 0033:0x437b99 RSP: 002b:00007ffe1b782328 EFLAGS: 00000246 ORIG_RAX: 00000000000000e7 RAX: ffffffffffffffda RBX: 0000000000000000 RCX: 0000000000437b99 RDX: 0000000000000000 RSI: 0000000000000000 RDI: 0000000000000000 RBP: 0000000000000082 R08: 000000000000003c R09: 00000000000000e7 R10: ffffffffffffffc0 R11: 0000000000000246 R12: 0000000000000000 R13: 0000000000401c00 R14: 0000000000401c90 R15: 0000000000000000 > --- > This bug is generated by a dumb bot. It may contain errors. > See https://goo.gl/tpsmEJ for details. > Direct all questions to syzkaller(a)googlegroups.com. > > syzbot will keep track of this bug report. > Once a fix for this bug is committed, please reply to this email with: > #syz fix: exact-commit-title > To mark this as a duplicate of another syzbot report, please reply with: > #syz dup: exact-subject-of-another-report > If it's a one-off invalid bug report, please reply with: > #syz invalid > Note: if the crash happens again, it will cause creation of a new bug > report. > > -- > You received this message because you are subscribed to the Google Groups > "syzkaller-bugs" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to syzkaller-bugs+unsubscribe(a)googlegroups.com. > To view this discussion on the web visit > https://groups.google.com/d/msgid/syzkaller-bugs/001a114089d614a0f4055c82d0…. > For more options, visit https://groups.google.com/d/optout.

2 5

[alsa-devel] sound tree breaks make clean
by Daniel Vetter 31 Oct '17

31 Oct '17

Hi all, The following commit commit 60d4981ccf3603669c8de304619048ad5da707bd Author: Takashi Iwai <tiwai(a)suse.de> Date: Tue Oct 24 09:15:23 2017 +0200 sound: Retire OSS breaks $ make defconfig && make clean (just make clean in an already clean tree seems to work). We've taken the sound tree out of drm-tip and our CI for now to work around this. Thanks, Daniel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch

2 1

[alsa-devel] [PATCH v2] ASoC: wm8741: Add digital mute callback
by Sergej Sawazki 31 Oct '17

31 Oct '17

Signed-off-by: Sergej Sawazki <sergej(a)taudac.com> --- Changes in v2: * Refactored debug message. sound/soc/codecs/wm8741.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/sound/soc/codecs/wm8741.c b/sound/soc/codecs/wm8741.c index b8c1940..5571882 100644 --- a/sound/soc/codecs/wm8741.c +++ b/sound/soc/codecs/wm8741.c @@ -351,6 +351,17 @@ static int wm8741_set_dai_fmt(struct snd_soc_dai *codec_dai, return 0; } +int wm8741_mute(struct snd_soc_dai *codec_dai, int mute) +{ + struct snd_soc_codec *codec = codec_dai->codec; + + dev_dbg(codec->dev, "wm8741_mute: mute = %d\n", mute); + + snd_soc_update_bits(codec, WM8741_VOLUME_CONTROL, + WM8741_SOFT_MASK, !!mute << WM8741_SOFT_SHIFT); + return 0; +} + #define WM8741_RATES (SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 | \ SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_88200 | \ SNDRV_PCM_RATE_96000 | SNDRV_PCM_RATE_176400 | \ @@ -364,6 +375,7 @@ static const struct snd_soc_dai_ops wm8741_dai_ops = { .hw_params = wm8741_hw_params, .set_sysclk = wm8741_set_dai_sysclk, .set_fmt = wm8741_set_dai_fmt, + .digital_mute = wm8741_mute, }; static struct snd_soc_dai_driver wm8741_dai = { -- 2.7.4

3 3

[alsa-devel] [GIT PULL] ASoC fixes for v4.14
by Mark Brown 31 Oct '17

31 Oct '17

The following changes since commit bb176f67090ca54869fc1262c913aa69d2ede070: Linux 4.14-rc6 (2017-10-23 06:49:47 -0400) are available in the git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-fix-v4.14-rc6 for you to fetch changes up to 0bebd2f1bfcbf954a93b65d4b2848488fd049c78: Merge remote-tracking branches 'asoc/fix/topology' and 'asoc/fix/wm8998' into asoc-linus (2017-10-26 09:45:52 +0200) ---------------------------------------------------------------- ASoC: Fixes for v4.14 I've been quite lax in sending these due to conference season but here's a fairly large collection of ASoC updates. The one thing that's not device specific is Takashi's fix for races between delayed work and PCM destruction, otherwise everything is specific to an individual device. ---------------------------------------------------------------- Bard Liao (3): ASoC: rt5659: register power bit of LOUT Amp ASoC: rt5659: connect LOUT Amp with Charge Pump ASoC: rt5616: fix 0x91 default value Charles Keepax (1): ASoC: wm8998: Correct handling of input muxes Chintan Patel (1): ASoC: Intel: Skylake: Fix jack name format substitution Christophe JAILLET (2): ASoC: topology: Fix a potential NULL pointer dereference in 'soc_tplg_dapm_widget_denum_create()' ASoC: topology: Fix a potential memory leak in 'soc_tplg_dapm_widget_denum_create()' Christophe Jaillet (2): ASoC: samsung: i2s: Fix error handling path in i2s_set_sysclk() ASoC: davinci-mcasp: Fix an error handling path in 'davinci_mcasp_probe()' Colin Ian King (1): ASoC: Intel: Skylake: fix swapped order of function arguments dir and pin_index Hsin-Yu Chao (2): ASoC: rt5514-spi: check irq status to schedule data copy ASoC: rt5514: Revert Hotword Model control Jean-François Têtu (2): ASoC: msm8916-wcd-digital: fix RX2 MIX1 and RX3 MIX1 ASoC: codecs: msm8916-wcd-analog: fix micbias level John Keeping (1): ASoC: rockchip: i2s: fix unbalanced clk_disable Kuninori Morimoto (2): ASoC: rsnd: fix ADG flags ASoC: rcar: skip disabled-SSI nodes Marek Szyprowski (1): ASoC: samsung: i2s: disable secondary DAI until it gets fixed Mark Brown (8): Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus Merge remote-tracking branch 'asoc/fix/msm8916' into asoc-linus Merge remote-tracking branch 'asoc/fix/pcm' into asoc-linus Merge remote-tracking branch 'asoc/fix/rcar' into asoc-linus Merge remote-tracking branch 'asoc/fix/rockchip' into asoc-linus Merge remote-tracking branches 'asoc/fix/adau17x1', 'asoc/fix/davinci' and 'asoc/fix/max98090' into asoc-linus Merge remote-tracking branches 'asoc/fix/rt5514', 'asoc/fix/rt5616', 'asoc/fix/rt5659', 'asoc/fix/rt5663', 'asoc/fix/samsung' and 'asoc/fix/stm32' into asoc-linus Merge remote-tracking branches 'asoc/fix/topology' and 'asoc/fix/wm8998' into asoc-linus Olivier Moysan (3): ASoC: stm32: sai: fix stop management in isr ASoC: stm32: sai: Fix DMA burst size ASoC: stm32: sai: Fix get reset controller Pierre-Louis Bossart (2): ASoC: max98090: reduce verbosity on PLL unlock ASoC: Intel: cht_bsw_max98090: Fix I2S config + unused code Ricard Wanderlof (1): ASoC: adau17x1: Workaround for noise bug in ADC Takashi Iwai (1): ASoC: pcm: Sync delayed work before releasing resources oder_chiou(a)realtek.com (1): ASoC: rt5663: Change the dev getting function in rt5663_irq sound/soc/codecs/adau17x1.c | 24 ++++++- sound/soc/codecs/adau17x1.h | 2 + sound/soc/codecs/max98090.c | 2 +- sound/soc/codecs/msm8916-wcd-analog.c | 7 +- sound/soc/codecs/msm8916-wcd-digital.c | 4 +- sound/soc/codecs/rt5514-spi.c | 17 ++++- sound/soc/codecs/rt5514-spi.h | 3 + sound/soc/codecs/rt5514.c | 63 ---------------- sound/soc/codecs/rt5514.h | 3 - sound/soc/codecs/rt5616.c | 2 +- sound/soc/codecs/rt5659.c | 4 +- sound/soc/codecs/rt5663.c | 3 +- sound/soc/codecs/wm8998.c | 84 +++++----------------- sound/soc/davinci/davinci-mcasp.c | 6 +- sound/soc/intel/boards/cht_bsw_max98090_ti.c | 6 +- .../soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 2 + sound/soc/intel/skylake/skl-topology.c | 2 +- sound/soc/rockchip/rockchip_i2s.c | 1 - sound/soc/samsung/i2s.c | 6 +- sound/soc/sh/rcar/adg.c | 4 +- sound/soc/sh/rcar/ssi.c | 5 +- sound/soc/soc-pcm.c | 13 +++- sound/soc/soc-topology.c | 5 +- sound/soc/stm/stm32_sai.c | 2 +- sound/soc/stm/stm32_sai_sub.c | 33 +++++---- 25 files changed, 134 insertions(+), 169 deletions(-)

3 3

[alsa-devel] "PM / QoS: Fix device resume latency PM QoS" breaks sound
by Chris Clayton 31 Oct '17

31 Oct '17

Hi, I pulled the latestchanges from Linus' tree this evening and have found that with the new kernel, sound is not working on my laptop. More precisely, the built-in speakers don't produce any sound. Sound does work when I use ear-plugs in the headphone socket. It also works via a bluetooth speaker. I've bisected the problem and ended up at: 0cc2b4e5a020fc7f4d1795741c116c983e9467d7 is the first bad commit commit 0cc2b4e5a020fc7f4d1795741c116c983e9467d7 Author: Rafael J. Wysocki <rafael.j.wysocki(a)intel.com> Date: Tue Oct 24 15:20:45 2017 +0200 PM / QoS: Fix device resume latency PM QoS The special value of 0 for device resume latency PM QoS means "no restriction", but there are two problems with that. First, device resume latency PM QoS requests with 0 as the value are always put in front of requests with positive values in the priority lists used internally by the PM QoS framework, causing 0 to be chosen as an effective constraint value. However, that 0 is then interpreted as "no restriction" effectively overriding the other requests with specific restrictions which is incorrect. Second, the users of device resume latency PM QoS have no way to specify that *any* resume latency at all should be avoided, which is an artificial limitation in general. To address these issues, modify device resume latency PM QoS to use S32_MAX as the "no constraint" value and 0 as the "no latency at all" one and rework its users (the cpuidle menu governor, the genpd QoS governor and the runtime PM framework) to follow these changes. Also add a special "n/a" value to the corresponding user space I/F to allow user space to indicate that it cannot accept any resume latencies at all for the given device. Fixes: 85dc0b8a4019 (PM / QoS: Make it possible to expose PM QoS latency constraints) Link: https://bugzilla.kernel.org/show_bug.cgi?id=197323 Reported-by: Reinette Chatre <reinette.chatre(a)intel.com> Tested-by: Reinette Chatre <reinette.chatre(a)intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki(a)intel.com> Acked-by: Alex Shi <alex.shi(a)linaro.org> Cc: All applicable <stable(a)vger.kernel.org> :040000 040000 f0c128ec799bb9894cfc5c341f88ad7bdfb15bac 9a2e8171ca47f864bd534cd9c160cce58449a889 M Documentation :040000 040000 0028ffec81675e686bdd621c0445d3e814d7980c 29db53c6356a6fed9c8bdbc2d6bc7bd56a96e529 M drivers :040000 040000 2e66b79bd2ffb4fcb00f04a69a0afe5c80d1d3f3 dd6d8e90b59389cd2bd8a0c92716d79d2eeb8268 M include With that change reverted, the speakers emit sound again. The audio devices identified by "lspci -vv" are as follows: 00:03.0 Audio device: Intel Corporation Xeon E3-1200 v3/4th Gen Core Processor HD Audio Controller (rev 06) Subsystem: CLEVO/KAPOK Computer Xeon E3-1200 v3/4th Gen Core Processor HD Audio Controller Control: I/O- Mem+ BusMaster+ SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR- FastB2B- DisINTx- Status: Cap+ 66MHz- UDF- FastB2B- ParErr- DEVSEL=fast >TAbort- <TAbort- <MAbort- >SERR- <PERR- INTx- Latency: 0, Cache Line Size: 64 bytes Interrupt: pin A routed to IRQ 16 Region 0: Memory at f7f14000 (64-bit, non-prefetchable) [size=16K] Capabilities: [50] Power Management version 2 Flags: PMEClk- DSI- D1- D2- AuxCurrent=0mA PME(D0-,D1-,D2-,D3hot-,D3cold-) Status: D0 NoSoftRst- PME-Enable- DSel=0 DScale=0 PME- Capabilities: [60] MSI: Enable- Count=1/1 Maskable- 64bit- Address: 00000000 Data: 0000 Capabilities: [70] Express (v1) Root Complex Integrated Endpoint, MSI 00 DevCap: MaxPayload 128 bytes, PhantFunc 0 ExtTag- RBE- DevCtl: Report errors: Correctable- Non-Fatal- Fatal- Unsupported- RlxdOrd- ExtTag- PhantFunc- AuxPwr- NoSnoop- MaxPayload 128 bytes, MaxReadReq 128 bytes DevSta: CorrErr- UncorrErr- FatalErr- UnsuppReq- AuxPwr- TransPend- Kernel driver in use: snd_hda_intel Kernel modules: snd_hda_intel 00:1b.0 Audio device: Intel Corporation 8 Series/C220 Series Chipset High Definition Audio Controller (rev 05) Subsystem: CLEVO/KAPOK Computer 8 Series/C220 Series Chipset High Definition Audio Controller Control: I/O- Mem+ BusMaster+ SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR- FastB2B- DisINTx- Status: Cap+ 66MHz- UDF- FastB2B- ParErr- DEVSEL=fast >TAbort- <TAbort- <MAbort- >SERR- <PERR- INTx- Latency: 0, Cache Line Size: 64 bytes Interrupt: pin A routed to IRQ 22 Region 0: Memory at f7f10000 (64-bit, non-prefetchable) [size=16K] Capabilities: [50] Power Management version 2 Flags: PMEClk- DSI- D1- D2- AuxCurrent=55mA PME(D0+,D1-,D2-,D3hot+,D3cold+) Status: D0 NoSoftRst- PME-Enable- DSel=0 DScale=0 PME- Capabilities: [60] MSI: Enable- Count=1/1 Maskable- 64bit+ Address: 0000000000000000 Data: 0000 Capabilities: [70] Express (v1) Root Complex Integrated Endpoint, MSI 00 DevCap: MaxPayload 128 bytes, PhantFunc 0 ExtTag- RBE- DevCtl: Report errors: Correctable- Non-Fatal- Fatal- Unsupported- RlxdOrd- ExtTag- PhantFunc- AuxPwr- NoSnoop- MaxPayload 128 bytes, MaxReadReq 128 bytes DevSta: CorrErr- UncorrErr- FatalErr- UnsuppReq- AuxPwr+ TransPend- Kernel driver in use: snd_hda_intel Kernel modules: snd_hda_intel Let me know if I can provide any additional diagnostics, but please cc me because I'm not subscribed. Thanks Chris

2 1

[alsa-devel] [asoc:topic/intel 41/42] sound/soc/intel/boards/bytcr_rt5651.c:325:2: error: implicit declaration of function 'rt5651_set_jack_detect'
by kbuild test robot 30 Oct '17

30 Oct '17

tree: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git topic/intel head: 2fe30129b0a6a8ddf71c46c8fb4524cb89739bc0 commit: d9f8f9b2f3e2b95875cd59ae5c3276e4662e7513 [41/42] ASoC: intel: byt: Add headset jack config: i386-allmodconfig (attached as .config) compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901 reproduce: git checkout d9f8f9b2f3e2b95875cd59ae5c3276e4662e7513 # save the attached .config to linux build tree make ARCH=i386 All errors (new ones prefixed by >>): sound/soc/intel/boards/bytcr_rt5651.c: In function 'byt_rt5651_init': >> sound/soc/intel/boards/bytcr_rt5651.c:325:2: error: implicit declaration of function 'rt5651_set_jack_detect' [-Werror=implicit-function-declaration] rt5651_set_jack_detect(codec, &priv->jack); ^~~~~~~~~~~~~~~~~~~~~~ cc1: some warnings being treated as errors vim +/rt5651_set_jack_detect +325 sound/soc/intel/boards/bytcr_rt5651.c 255 256 static int byt_rt5651_init(struct snd_soc_pcm_runtime *runtime) 257 { 258 struct snd_soc_card *card = runtime->card; 259 struct snd_soc_codec *codec = runtime->codec; 260 struct byt_rt5651_private *priv = snd_soc_card_get_drvdata(card); 261 const struct snd_soc_dapm_route *custom_map; 262 int num_routes; 263 int ret; 264 265 card->dapm.idle_bias_off = true; 266 267 switch (BYT_RT5651_MAP(byt_rt5651_quirk)) { 268 case BYT_RT5651_IN1_MAP: 269 custom_map = byt_rt5651_intmic_in1_map; 270 num_routes = ARRAY_SIZE(byt_rt5651_intmic_in1_map); 271 break; 272 case BYT_RT5651_IN2_MAP: 273 custom_map = byt_rt5651_intmic_in2_map; 274 num_routes = ARRAY_SIZE(byt_rt5651_intmic_in2_map); 275 break; 276 default: 277 custom_map = byt_rt5651_intmic_dmic_map; 278 num_routes = ARRAY_SIZE(byt_rt5651_intmic_dmic_map); 279 } 280 ret = snd_soc_dapm_add_routes(&card->dapm, custom_map, num_routes); 281 if (ret) 282 return ret; 283 284 ret = snd_soc_add_card_controls(card, byt_rt5651_controls, 285 ARRAY_SIZE(byt_rt5651_controls)); 286 if (ret) { 287 dev_err(card->dev, "unable to add card controls\n"); 288 return ret; 289 } 290 snd_soc_dapm_ignore_suspend(&card->dapm, "Headphone"); 291 snd_soc_dapm_ignore_suspend(&card->dapm, "Speaker"); 292 293 if (byt_rt5651_quirk & BYT_RT5651_MCLK_EN) { 294 /* 295 * The firmware might enable the clock at 296 * boot (this information may or may not 297 * be reflected in the enable clock register). 298 * To change the rate we must disable the clock 299 * first to cover these cases. Due to common 300 * clock framework restrictions that do not allow 301 * to disable a clock that has not been enabled, 302 * we need to enable the clock first. 303 */ 304 ret = clk_prepare_enable(priv->mclk); 305 if (!ret) 306 clk_disable_unprepare(priv->mclk); 307 308 if (byt_rt5651_quirk & BYT_RT5651_MCLK_25MHZ) 309 ret = clk_set_rate(priv->mclk, 25000000); 310 else 311 ret = clk_set_rate(priv->mclk, 19200000); 312 313 if (ret) 314 dev_err(card->dev, "unable to set MCLK rate\n"); 315 } 316 317 ret = snd_soc_card_jack_new(runtime->card, "Headset", 318 SND_JACK_HEADSET, &priv->jack, 319 bytcr_jack_pins, ARRAY_SIZE(bytcr_jack_pins)); 320 if (ret) { 321 dev_err(runtime->dev, "Headset jack creation failed %d\n", ret); 322 return ret; 323 } 324 > 325 rt5651_set_jack_detect(codec, &priv->jack); 326 327 return ret; 328 } 329 --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

3 2

[alsa-devel] timestamp update when no hw delta
by Henrik Eriksson 30 Oct '17

30 Oct '17

Hi I am looking into commit 3179f62001880e588e229db3006a59ad87b7792a ("ALSA: core: add .get_time_info"), which, if I understand the code correctly, changed the behaviour of timestamps. Before this change, snd_pcm_update_hw_ptr0() just returned if the no_delta_check showed that the hw_ptr had not changed. With this change it will update the timestamps before returning. Was this intended, and if so does anyone have any insights to why? The original behaviour to not update the timestamps when the hw position has not changed seems more correct to me, but I am new to this code. Regards, /henrik

2 2

[alsa-devel] [PATCH 0/3] ASoC: wm8741: Varios enhancements
by Sergej Sawazki 30 Oct '17

30 Oct '17

This patch series contains the following 3 patches for the WM8741 codec driver. 1) Adds digital mute callback. 2) Sets oversampling rate mode (OSR), required for sampling rates > 48kHz. 3) Sets MCLK/LRCLK sampling rate ratio (SR), avoids relying on auto-detection. Sergej Sawazki (3): ASoC: wm8741: Add digital mute callback ASoC: wm8741: Set OSR mode in hw_params() ASoC: wm8741: Set SR mode in hw_params() sound/soc/codecs/wm8741.c | 49 +++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 41 insertions(+), 8 deletions(-) -- 2.7.4

3 15

[alsa-devel] [PATCH linux-next 1/1] ASoC: rsnd: ssiu: reset SSI_MODE register
by jiada_wang＠mentor.com 30 Oct '17

30 Oct '17

From: Jiada Wang <jiada_wang(a)mentor.com> register SSI_MODE is set when SSI works in TDM Extended or TDM (Ex-)Split mode, but it isn't reset after SSI stops. this will cause issue, if SSI starts to work in other modes which requie SSI_MODE to have different value. This patch resets SSI_MODE register in .stop callback, when last stream calls .stop. Fixes: 186fadc132f0 ("ASoC: rsnd: add TDM Extend Mode support") Signed-off-by: Jiada Wang <jiada_wang(a)mentor.com> --- sound/soc/sh/rcar/ssiu.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/soc/sh/rcar/ssiu.c b/sound/soc/sh/rcar/ssiu.c index 4d94875..eff9f3b 100644 --- a/sound/soc/sh/rcar/ssiu.c +++ b/sound/soc/sh/rcar/ssiu.c @@ -217,6 +217,8 @@ static int rsnd_ssiu_stop_gen2(struct rsnd_mod *mod, if (rsnd_ssi_multi_slaves_runtime(io)) rsnd_mod_write(mod, SSI_CONTROL, 0); + rsnd_mod_write(mod, SSI_MODE, 0); + return 0; } -- 1.7.9.5

3 3

[alsa-devel] [PATCH] sound: fix kernel-doc build warning
by Randy Dunlap 30 Oct '17

30 Oct '17

From: Randy Dunlap <rdunlap(a)infradead.org> Fix kernel-doc build error. A symbol that ends with an underscore character ('_') has special meaning in reST (reStructuredText), so add a '*' to prevent this error and to indicate that there are several of these values to choose from. ../sound/core/jack.c:312: ERROR: Unknown target name: "snd_jack_btn". Signed-off-by: Randy Dunlap <rdunlap(a)infradead.org> Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Takashi Iwai <tiwai(a)suse.com> Cc: alsa-devel(a)alsa-project.org --- sound/core/jack.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- lnx-414-rc7.orig/sound/core/jack.c +++ lnx-414-rc7/sound/core/jack.c @@ -310,7 +310,7 @@ EXPORT_SYMBOL(snd_jack_set_parent); * @type: Jack report type for this key * @keytype: Input layer key type to be reported * - * Map a SND_JACK_BTN_ button type to an input layer key, allowing + * Map a SND_JACK_BTN_* button type to an input layer key, allowing * reporting of keys on accessories via the jack abstraction. If no * mapping is provided but keys are enabled in the jack type then * BTN_n numeric buttons will be reported.

2 1

[alsa-devel] message size limit
by Jaroslav Kysela 29 Oct '17

29 Oct '17

Hello all, I increased the maximal message size for this alsa-devel list to 200kB (as we discussed with Takashi to allow bigger patches for review). Anyway, if you like to send something big, it's better to upload the data to a public place and provide only URL. Jaroslav -- Jaroslav Kysela <perex(a)perex.cz> Linux Sound Maintainer; ALSA Project; Red Hat, Inc.

2 1

[alsa-devel] [PATCH RESEND 0/2] Enable TDM slot and fix SSP params for kabylake machine driver
by Harsha Priya 27 Oct '17

27 Oct '17

Hi Mark, These are resend of an already acked patch series. I posted it a few weeks ago but there has been update on the base branch. I want to resend these. Kindly review and merge. This patch series includes 2 patches for kabylake machine driver using max98927 and rt5663 codecs. The changes are: 1. Enable 4 tdm slots for IV feedback and 2 tdm slots for playback on max98927 2. Fix setting of SSP parameters to be based on FE and BE dai links. Harsha Priya (2): ASoC: Intel: Enable tdm slots for max98927 ASoC: Intel: Fix setting of SSP parameters in Kabylake machine driver sound/soc/intel/boards/kbl_rt5663_max98927.c | 67 +++++++++++++++++++++++++--- 1 file changed, 60 insertions(+), 7 deletions(-) -- 1.9.1

2 3

[alsa-devel] [PATCH] conf/ucm: rt5651: Fix HiFi file name
by Carlo Caione 26 Oct '17

26 Oct '17

From: Carlo Caione <carlo(a)endlessm.com> The conf HiFi file name is HiFi.conf, fix the name in the main configuration file. Signed-off-by: Carlo Caione <carlo(a)endlessm.com> --- src/conf/ucm/bytcr-rt5651/bytcr-rt5651.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/ucm/bytcr-rt5651/bytcr-rt5651.conf b/src/conf/ucm/bytcr-rt5651/bytcr-rt5651.conf index 2dcc72cc..60798ce7 100644 --- a/src/conf/ucm/bytcr-rt5651/bytcr-rt5651.conf +++ b/src/conf/ucm/bytcr-rt5651/bytcr-rt5651.conf @@ -1,7 +1,7 @@ # Adapted from https://github.com/plbossart/UCM/tree/master/bytcr-rt5651 SectionUseCase."HiFi" { - File "HiFi" + File "HiFi.conf" Comment "Play HiFi quality Music" } -- 2.14.2

2 1

[alsa-devel] [asoc:for-next 16/17] sound/soc/codecs/rt5651.c:1874:20: error: redefinition of 'rt5651_irq'
by kbuild test robot 26 Oct '17

26 Oct '17

tree: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next head: 2708a8339e928912307fe5cd1ae66d959caa7279 commit: b16351eba5e00bd7957fb16b98a152e5425ceb74 [16/17] Merge remote-tracking branches 'asoc/topic/sgtl5000', 'asoc/topic/stm32', 'asoc/topic/tas571x', 'asoc/topic/tfa9879' and 'asoc/topic/ts3a277e' into asoc-next config: xtensa-allyesconfig (attached as .config) compiler: xtensa-linux-gcc (GCC) 4.9.0 reproduce: wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross git checkout b16351eba5e00bd7957fb16b98a152e5425ceb74 # save the attached .config to linux build tree make.cross ARCH=xtensa All error/warnings (new ones prefixed by >>): >> sound/soc/codecs/rt5651.c:1874:20: error: redefinition of 'rt5651_irq' static irqreturn_t rt5651_irq(int irq, void *data) ^ sound/soc/codecs/rt5651.c:1787:20: note: previous definition of 'rt5651_irq' was here static irqreturn_t rt5651_irq(int irq, void *data) ^ >> sound/soc/codecs/rt5651.c:1884:12: error: redefinition of 'rt5651_jack_detect' static int rt5651_jack_detect(struct snd_soc_codec *codec, int jack_insert) ^ sound/soc/codecs/rt5651.c:1797:12: note: previous definition of 'rt5651_jack_detect' was here static int rt5651_jack_detect(struct snd_soc_codec *codec, int jack_insert) ^ >> sound/soc/codecs/rt5651.c:1920:13: error: redefinition of 'rt5651_jack_detect_work' static void rt5651_jack_detect_work(struct work_struct *work) ^ sound/soc/codecs/rt5651.c:1833:13: note: previous definition of 'rt5651_jack_detect_work' was here static void rt5651_jack_detect_work(struct work_struct *work) ^ >> sound/soc/codecs/rt5651.c:1949:5: error: redefinition of 'rt5651_set_jack_detect' int rt5651_set_jack_detect(struct snd_soc_codec *codec, ^ sound/soc/codecs/rt5651.c:1862:5: note: previous definition of 'rt5651_set_jack_detect' was here int rt5651_set_jack_detect(struct snd_soc_codec *codec, ^ In file included from include/linux/linkage.h:6:0, from include/linux/kernel.h:6, from include/linux/list.h:8, from include/linux/module.h:9, from sound/soc/codecs/rt5651.c:12: >> include/linux/export.h:67:20: error: redefinition of '__kstrtab_rt5651_set_jack_detect' static const char __kstrtab_##sym[] \ ^ include/linux/export.h:100:25: note: in expansion of macro '___EXPORT_SYMBOL' #define __EXPORT_SYMBOL ___EXPORT_SYMBOL ^ include/linux/export.h:107:2: note: in expansion of macro '__EXPORT_SYMBOL' __EXPORT_SYMBOL(sym, "_gpl") ^ >> sound/soc/codecs/rt5651.c:1959:1: note: in expansion of macro 'EXPORT_SYMBOL_GPL' EXPORT_SYMBOL_GPL(rt5651_set_jack_detect); ^ include/linux/export.h:67:20: note: previous definition of '__kstrtab_rt5651_set_jack_detect' was here static const char __kstrtab_##sym[] \ ^ include/linux/export.h:100:25: note: in expansion of macro '___EXPORT_SYMBOL' #define __EXPORT_SYMBOL ___EXPORT_SYMBOL ^ include/linux/export.h:107:2: note: in expansion of macro '__EXPORT_SYMBOL' __EXPORT_SYMBOL(sym, "_gpl") ^ sound/soc/codecs/rt5651.c:1872:1: note: in expansion of macro 'EXPORT_SYMBOL_GPL' EXPORT_SYMBOL_GPL(rt5651_set_jack_detect); ^ include/linux/export.h:70:36: error: redefinition of '__ksymtab_rt5651_set_jack_detect' static const struct kernel_symbol __ksymtab_##sym \ ^ include/linux/export.h:100:25: note: in expansion of macro '___EXPORT_SYMBOL' #define __EXPORT_SYMBOL ___EXPORT_SYMBOL ^ include/linux/export.h:107:2: note: in expansion of macro '__EXPORT_SYMBOL' __EXPORT_SYMBOL(sym, "_gpl") ^ >> sound/soc/codecs/rt5651.c:1959:1: note: in expansion of macro 'EXPORT_SYMBOL_GPL' EXPORT_SYMBOL_GPL(rt5651_set_jack_detect); ^ include/linux/export.h:70:36: note: previous definition of '__ksymtab_rt5651_set_jack_detect' was here static const struct kernel_symbol __ksymtab_##sym \ ^ include/linux/export.h:100:25: note: in expansion of macro '___EXPORT_SYMBOL' #define __EXPORT_SYMBOL ___EXPORT_SYMBOL ^ include/linux/export.h:107:2: note: in expansion of macro '__EXPORT_SYMBOL' __EXPORT_SYMBOL(sym, "_gpl") ^ sound/soc/codecs/rt5651.c:1872:1: note: in expansion of macro 'EXPORT_SYMBOL_GPL' EXPORT_SYMBOL_GPL(rt5651_set_jack_detect); ^ sound/soc/codecs/rt5651.c:1833:13: warning: 'rt5651_jack_detect_work' defined but not used [-Wunused-function] static void rt5651_jack_detect_work(struct work_struct *work) ^ -- sound/soc//codecs/rt5651.c:1874:20: error: redefinition of 'rt5651_irq' static irqreturn_t rt5651_irq(int irq, void *data) ^ sound/soc//codecs/rt5651.c:1787:20: note: previous definition of 'rt5651_irq' was here static irqreturn_t rt5651_irq(int irq, void *data) ^ sound/soc//codecs/rt5651.c:1884:12: error: redefinition of 'rt5651_jack_detect' static int rt5651_jack_detect(struct snd_soc_codec *codec, int jack_insert) ^ sound/soc//codecs/rt5651.c:1797:12: note: previous definition of 'rt5651_jack_detect' was here static int rt5651_jack_detect(struct snd_soc_codec *codec, int jack_insert) ^ sound/soc//codecs/rt5651.c:1920:13: error: redefinition of 'rt5651_jack_detect_work' static void rt5651_jack_detect_work(struct work_struct *work) ^ sound/soc//codecs/rt5651.c:1833:13: note: previous definition of 'rt5651_jack_detect_work' was here static void rt5651_jack_detect_work(struct work_struct *work) ^ sound/soc//codecs/rt5651.c:1949:5: error: redefinition of 'rt5651_set_jack_detect' int rt5651_set_jack_detect(struct snd_soc_codec *codec, ^ sound/soc//codecs/rt5651.c:1862:5: note: previous definition of 'rt5651_set_jack_detect' was here int rt5651_set_jack_detect(struct snd_soc_codec *codec, ^ In file included from include/linux/linkage.h:6:0, from include/linux/kernel.h:6, from include/linux/list.h:8, from include/linux/module.h:9, from sound/soc//codecs/rt5651.c:12: >> include/linux/export.h:67:20: error: redefinition of '__kstrtab_rt5651_set_jack_detect' static const char __kstrtab_##sym[] \ ^ include/linux/export.h:100:25: note: in expansion of macro '___EXPORT_SYMBOL' #define __EXPORT_SYMBOL ___EXPORT_SYMBOL ^ include/linux/export.h:107:2: note: in expansion of macro '__EXPORT_SYMBOL' __EXPORT_SYMBOL(sym, "_gpl") ^ sound/soc//codecs/rt5651.c:1959:1: note: in expansion of macro 'EXPORT_SYMBOL_GPL' EXPORT_SYMBOL_GPL(rt5651_set_jack_detect); ^ include/linux/export.h:67:20: note: previous definition of '__kstrtab_rt5651_set_jack_detect' was here static const char __kstrtab_##sym[] \ ^ include/linux/export.h:100:25: note: in expansion of macro '___EXPORT_SYMBOL' #define __EXPORT_SYMBOL ___EXPORT_SYMBOL ^ include/linux/export.h:107:2: note: in expansion of macro '__EXPORT_SYMBOL' __EXPORT_SYMBOL(sym, "_gpl") ^ sound/soc//codecs/rt5651.c:1872:1: note: in expansion of macro 'EXPORT_SYMBOL_GPL' EXPORT_SYMBOL_GPL(rt5651_set_jack_detect); ^ include/linux/export.h:70:36: error: redefinition of '__ksymtab_rt5651_set_jack_detect' static const struct kernel_symbol __ksymtab_##sym \ ^ include/linux/export.h:100:25: note: in expansion of macro '___EXPORT_SYMBOL' #define __EXPORT_SYMBOL ___EXPORT_SYMBOL ^ include/linux/export.h:107:2: note: in expansion of macro '__EXPORT_SYMBOL' __EXPORT_SYMBOL(sym, "_gpl") ^ sound/soc//codecs/rt5651.c:1959:1: note: in expansion of macro 'EXPORT_SYMBOL_GPL' EXPORT_SYMBOL_GPL(rt5651_set_jack_detect); ^ include/linux/export.h:70:36: note: previous definition of '__ksymtab_rt5651_set_jack_detect' was here static const struct kernel_symbol __ksymtab_##sym \ ^ include/linux/export.h:100:25: note: in expansion of macro '___EXPORT_SYMBOL' #define __EXPORT_SYMBOL ___EXPORT_SYMBOL ^ include/linux/export.h:107:2: note: in expansion of macro '__EXPORT_SYMBOL' __EXPORT_SYMBOL(sym, "_gpl") ^ sound/soc//codecs/rt5651.c:1872:1: note: in expansion of macro 'EXPORT_SYMBOL_GPL' EXPORT_SYMBOL_GPL(rt5651_set_jack_detect); ^ sound/soc//codecs/rt5651.c:1833:13: warning: 'rt5651_jack_detect_work' defined but not used [-Wunused-function] static void rt5651_jack_detect_work(struct work_struct *work) ^ vim +/rt5651_irq +1874 sound/soc/codecs/rt5651.c b4435130 Carlo Caione 2017-10-20 1786 80bbe4a3 Carlo Caione 2017-10-20 @1787 static irqreturn_t rt5651_irq(int irq, void *data) 80bbe4a3 Carlo Caione 2017-10-20 1788 { 80bbe4a3 Carlo Caione 2017-10-20 1789 struct rt5651_priv *rt5651 = data; 80bbe4a3 Carlo Caione 2017-10-20 1790 80bbe4a3 Carlo Caione 2017-10-20 1791 queue_delayed_work(system_power_efficient_wq, 80bbe4a3 Carlo Caione 2017-10-20 1792 &rt5651->jack_detect_work, msecs_to_jiffies(250)); 80bbe4a3 Carlo Caione 2017-10-20 1793 80bbe4a3 Carlo Caione 2017-10-20 1794 return IRQ_HANDLED; 80bbe4a3 Carlo Caione 2017-10-20 1795 } 80bbe4a3 Carlo Caione 2017-10-20 1796 80bbe4a3 Carlo Caione 2017-10-20 @1797 static int rt5651_jack_detect(struct snd_soc_codec *codec, int jack_insert) 80bbe4a3 Carlo Caione 2017-10-20 1798 { 80bbe4a3 Carlo Caione 2017-10-20 1799 struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec); 80bbe4a3 Carlo Caione 2017-10-20 1800 int jack_type; 80bbe4a3 Carlo Caione 2017-10-20 1801 80bbe4a3 Carlo Caione 2017-10-20 1802 if (jack_insert) { 80bbe4a3 Carlo Caione 2017-10-20 1803 snd_soc_dapm_force_enable_pin(dapm, "LDO"); 80bbe4a3 Carlo Caione 2017-10-20 1804 snd_soc_dapm_sync(dapm); 80bbe4a3 Carlo Caione 2017-10-20 1805 80bbe4a3 Carlo Caione 2017-10-20 1806 snd_soc_update_bits(codec, RT5651_MICBIAS, 80bbe4a3 Carlo Caione 2017-10-20 1807 RT5651_MIC1_OVCD_MASK | 80bbe4a3 Carlo Caione 2017-10-20 1808 RT5651_MIC1_OVTH_MASK | 80bbe4a3 Carlo Caione 2017-10-20 1809 RT5651_PWR_CLK12M_MASK | 80bbe4a3 Carlo Caione 2017-10-20 1810 RT5651_PWR_MB_MASK, 80bbe4a3 Carlo Caione 2017-10-20 1811 RT5651_MIC1_OVCD_EN | 80bbe4a3 Carlo Caione 2017-10-20 1812 RT5651_MIC1_OVTH_600UA | b16351eb Mark Brown 2017-10-26 1813 RT5651_PWR_MB_PU | b16351eb Mark Brown 2017-10-26 1814 RT5651_PWR_CLK12M_PU); b16351eb Mark Brown 2017-10-26 1815 msleep(100); b16351eb Mark Brown 2017-10-26 1816 if (snd_soc_read(codec, RT5651_IRQ_CTRL2) & RT5651_MB1_OC_CLR) b16351eb Mark Brown 2017-10-26 1817 jack_type = SND_JACK_HEADPHONE; b16351eb Mark Brown 2017-10-26 1818 else b16351eb Mark Brown 2017-10-26 1819 jack_type = SND_JACK_HEADSET; b16351eb Mark Brown 2017-10-26 1820 snd_soc_update_bits(codec, RT5651_IRQ_CTRL2, b16351eb Mark Brown 2017-10-26 1821 RT5651_MB1_OC_CLR, 0); b16351eb Mark Brown 2017-10-26 1822 } else { /* jack out */ b16351eb Mark Brown 2017-10-26 1823 jack_type = 0; b16351eb Mark Brown 2017-10-26 1824 b16351eb Mark Brown 2017-10-26 1825 snd_soc_update_bits(codec, RT5651_MICBIAS, b16351eb Mark Brown 2017-10-26 1826 RT5651_MIC1_OVCD_MASK, b16351eb Mark Brown 2017-10-26 1827 RT5651_MIC1_OVCD_DIS); b16351eb Mark Brown 2017-10-26 1828 } b16351eb Mark Brown 2017-10-26 1829 b16351eb Mark Brown 2017-10-26 1830 return jack_type; b16351eb Mark Brown 2017-10-26 1831 } b16351eb Mark Brown 2017-10-26 1832 b16351eb Mark Brown 2017-10-26 1833 static void rt5651_jack_detect_work(struct work_struct *work) b16351eb Mark Brown 2017-10-26 1834 { b16351eb Mark Brown 2017-10-26 1835 struct rt5651_priv *rt5651 = b16351eb Mark Brown 2017-10-26 1836 container_of(work, struct rt5651_priv, jack_detect_work.work); b16351eb Mark Brown 2017-10-26 1837 b16351eb Mark Brown 2017-10-26 1838 int report, val = 0; b16351eb Mark Brown 2017-10-26 1839 b16351eb Mark Brown 2017-10-26 1840 if (!rt5651->codec) b16351eb Mark Brown 2017-10-26 1841 return; b16351eb Mark Brown 2017-10-26 1842 b16351eb Mark Brown 2017-10-26 1843 switch (rt5651->pdata.jd_src) { b16351eb Mark Brown 2017-10-26 1844 case RT5651_JD1_1: b16351eb Mark Brown 2017-10-26 1845 val = snd_soc_read(rt5651->codec, RT5651_INT_IRQ_ST) & 0x1000; b16351eb Mark Brown 2017-10-26 1846 break; b16351eb Mark Brown 2017-10-26 1847 case RT5651_JD1_2: b16351eb Mark Brown 2017-10-26 1848 val = snd_soc_read(rt5651->codec, RT5651_INT_IRQ_ST) & 0x2000; b16351eb Mark Brown 2017-10-26 1849 break; b16351eb Mark Brown 2017-10-26 1850 case RT5651_JD2: b16351eb Mark Brown 2017-10-26 1851 val = snd_soc_read(rt5651->codec, RT5651_INT_IRQ_ST) & 0x4000; b16351eb Mark Brown 2017-10-26 1852 break; b16351eb Mark Brown 2017-10-26 1853 default: b16351eb Mark Brown 2017-10-26 1854 break; b16351eb Mark Brown 2017-10-26 1855 } b16351eb Mark Brown 2017-10-26 1856 b16351eb Mark Brown 2017-10-26 1857 report = rt5651_jack_detect(rt5651->codec, !val); b16351eb Mark Brown 2017-10-26 1858 b16351eb Mark Brown 2017-10-26 1859 snd_soc_jack_report(rt5651->hp_jack, report, SND_JACK_HEADSET); b16351eb Mark Brown 2017-10-26 1860 } b16351eb Mark Brown 2017-10-26 1861 b16351eb Mark Brown 2017-10-26 1862 int rt5651_set_jack_detect(struct snd_soc_codec *codec, b16351eb Mark Brown 2017-10-26 1863 struct snd_soc_jack *hp_jack) b16351eb Mark Brown 2017-10-26 1864 { b16351eb Mark Brown 2017-10-26 1865 struct rt5651_priv *rt5651 = snd_soc_codec_get_drvdata(codec); b16351eb Mark Brown 2017-10-26 1866 b16351eb Mark Brown 2017-10-26 1867 rt5651->hp_jack = hp_jack; b16351eb Mark Brown 2017-10-26 1868 rt5651_irq(0, rt5651); 3ae08dc0 Bard Liao 2015-12-23 1869 3ae08dc0 Bard Liao 2015-12-23 1870 return 0; 3ae08dc0 Bard Liao 2015-12-23 1871 } b16351eb Mark Brown 2017-10-26 1872 EXPORT_SYMBOL_GPL(rt5651_set_jack_detect); 3ae08dc0 Bard Liao 2015-12-23 1873 60d5a1a4 Carlo Caione 2017-10-20 @1874 static irqreturn_t rt5651_irq(int irq, void *data) 60d5a1a4 Carlo Caione 2017-10-20 1875 { 60d5a1a4 Carlo Caione 2017-10-20 1876 struct rt5651_priv *rt5651 = data; 60d5a1a4 Carlo Caione 2017-10-20 1877 60d5a1a4 Carlo Caione 2017-10-20 1878 queue_delayed_work(system_power_efficient_wq, 60d5a1a4 Carlo Caione 2017-10-20 1879 &rt5651->jack_detect_work, msecs_to_jiffies(250)); 60d5a1a4 Carlo Caione 2017-10-20 1880 60d5a1a4 Carlo Caione 2017-10-20 1881 return IRQ_HANDLED; 60d5a1a4 Carlo Caione 2017-10-20 1882 } 60d5a1a4 Carlo Caione 2017-10-20 1883 60d5a1a4 Carlo Caione 2017-10-20 @1884 static int rt5651_jack_detect(struct snd_soc_codec *codec, int jack_insert) 60d5a1a4 Carlo Caione 2017-10-20 1885 { 60d5a1a4 Carlo Caione 2017-10-20 1886 struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec); 60d5a1a4 Carlo Caione 2017-10-20 1887 int jack_type; 60d5a1a4 Carlo Caione 2017-10-20 1888 60d5a1a4 Carlo Caione 2017-10-20 1889 if (jack_insert) { 60d5a1a4 Carlo Caione 2017-10-20 1890 snd_soc_dapm_force_enable_pin(dapm, "LDO"); 60d5a1a4 Carlo Caione 2017-10-20 1891 snd_soc_dapm_sync(dapm); 60d5a1a4 Carlo Caione 2017-10-20 1892 60d5a1a4 Carlo Caione 2017-10-20 1893 snd_soc_update_bits(codec, RT5651_MICBIAS, 60d5a1a4 Carlo Caione 2017-10-20 1894 RT5651_MIC1_OVCD_MASK | 60d5a1a4 Carlo Caione 2017-10-20 1895 RT5651_MIC1_OVTH_MASK | 60d5a1a4 Carlo Caione 2017-10-20 1896 RT5651_PWR_CLK12M_MASK | 60d5a1a4 Carlo Caione 2017-10-20 1897 RT5651_PWR_MB_MASK, 60d5a1a4 Carlo Caione 2017-10-20 1898 RT5651_MIC1_OVCD_EN | 60d5a1a4 Carlo Caione 2017-10-20 1899 RT5651_MIC1_OVTH_600UA | 80bbe4a3 Carlo Caione 2017-10-20 1900 RT5651_PWR_MB_PU | 80bbe4a3 Carlo Caione 2017-10-20 1901 RT5651_PWR_CLK12M_PU); 80bbe4a3 Carlo Caione 2017-10-20 1902 msleep(100); 80bbe4a3 Carlo Caione 2017-10-20 1903 if (snd_soc_read(codec, RT5651_IRQ_CTRL2) & RT5651_MB1_OC_CLR) 80bbe4a3 Carlo Caione 2017-10-20 1904 jack_type = SND_JACK_HEADPHONE; 80bbe4a3 Carlo Caione 2017-10-20 1905 else 80bbe4a3 Carlo Caione 2017-10-20 1906 jack_type = SND_JACK_HEADSET; 80bbe4a3 Carlo Caione 2017-10-20 1907 snd_soc_update_bits(codec, RT5651_IRQ_CTRL2, 80bbe4a3 Carlo Caione 2017-10-20 1908 RT5651_MB1_OC_CLR, 0); 80bbe4a3 Carlo Caione 2017-10-20 1909 } else { /* jack out */ 80bbe4a3 Carlo Caione 2017-10-20 1910 jack_type = 0; 80bbe4a3 Carlo Caione 2017-10-20 1911 80bbe4a3 Carlo Caione 2017-10-20 1912 snd_soc_update_bits(codec, RT5651_MICBIAS, 80bbe4a3 Carlo Caione 2017-10-20 1913 RT5651_MIC1_OVCD_MASK, 80bbe4a3 Carlo Caione 2017-10-20 1914 RT5651_MIC1_OVCD_DIS); 80bbe4a3 Carlo Caione 2017-10-20 1915 } 80bbe4a3 Carlo Caione 2017-10-20 1916 80bbe4a3 Carlo Caione 2017-10-20 1917 return jack_type; 80bbe4a3 Carlo Caione 2017-10-20 1918 } 80bbe4a3 Carlo Caione 2017-10-20 1919 80bbe4a3 Carlo Caione 2017-10-20 @1920 static void rt5651_jack_detect_work(struct work_struct *work) 80bbe4a3 Carlo Caione 2017-10-20 1921 { 80bbe4a3 Carlo Caione 2017-10-20 1922 struct rt5651_priv *rt5651 = 80bbe4a3 Carlo Caione 2017-10-20 1923 container_of(work, struct rt5651_priv, jack_detect_work.work); 80bbe4a3 Carlo Caione 2017-10-20 1924 80bbe4a3 Carlo Caione 2017-10-20 1925 int report, val = 0; 80bbe4a3 Carlo Caione 2017-10-20 1926 80bbe4a3 Carlo Caione 2017-10-20 1927 if (!rt5651->codec) 80bbe4a3 Carlo Caione 2017-10-20 1928 return; 80bbe4a3 Carlo Caione 2017-10-20 1929 80bbe4a3 Carlo Caione 2017-10-20 1930 switch (rt5651->pdata.jd_src) { 80bbe4a3 Carlo Caione 2017-10-20 1931 case RT5651_JD1_1: 80bbe4a3 Carlo Caione 2017-10-20 1932 val = snd_soc_read(rt5651->codec, RT5651_INT_IRQ_ST) & 0x1000; 80bbe4a3 Carlo Caione 2017-10-20 1933 break; 80bbe4a3 Carlo Caione 2017-10-20 1934 case RT5651_JD1_2: 80bbe4a3 Carlo Caione 2017-10-20 1935 val = snd_soc_read(rt5651->codec, RT5651_INT_IRQ_ST) & 0x2000; 80bbe4a3 Carlo Caione 2017-10-20 1936 break; 80bbe4a3 Carlo Caione 2017-10-20 1937 case RT5651_JD2: 80bbe4a3 Carlo Caione 2017-10-20 1938 val = snd_soc_read(rt5651->codec, RT5651_INT_IRQ_ST) & 0x4000; 80bbe4a3 Carlo Caione 2017-10-20 1939 break; 80bbe4a3 Carlo Caione 2017-10-20 1940 default: 80bbe4a3 Carlo Caione 2017-10-20 1941 break; 80bbe4a3 Carlo Caione 2017-10-20 1942 } 80bbe4a3 Carlo Caione 2017-10-20 1943 80bbe4a3 Carlo Caione 2017-10-20 1944 report = rt5651_jack_detect(rt5651->codec, !val); 80bbe4a3 Carlo Caione 2017-10-20 1945 80bbe4a3 Carlo Caione 2017-10-20 1946 snd_soc_jack_report(rt5651->hp_jack, report, SND_JACK_HEADSET); 80bbe4a3 Carlo Caione 2017-10-20 1947 } 80bbe4a3 Carlo Caione 2017-10-20 1948 80bbe4a3 Carlo Caione 2017-10-20 @1949 int rt5651_set_jack_detect(struct snd_soc_codec *codec, 80bbe4a3 Carlo Caione 2017-10-20 1950 struct snd_soc_jack *hp_jack) 80bbe4a3 Carlo Caione 2017-10-20 1951 { 80bbe4a3 Carlo Caione 2017-10-20 1952 struct rt5651_priv *rt5651 = snd_soc_codec_get_drvdata(codec); 80bbe4a3 Carlo Caione 2017-10-20 1953 80bbe4a3 Carlo Caione 2017-10-20 1954 rt5651->hp_jack = hp_jack; 80bbe4a3 Carlo Caione 2017-10-20 1955 rt5651_irq(0, rt5651); 80bbe4a3 Carlo Caione 2017-10-20 1956 80bbe4a3 Carlo Caione 2017-10-20 1957 return 0; 80bbe4a3 Carlo Caione 2017-10-20 1958 } 80bbe4a3 Carlo Caione 2017-10-20 @1959 EXPORT_SYMBOL_GPL(rt5651_set_jack_detect); 80bbe4a3 Carlo Caione 2017-10-20 1960 :::::: The code at line 1874 was first introduced by commit :::::: 60d5a1a47b9a8381c08d2263b11ac9c757c87746 ASoC: rt5651: Enable jack detection on JD* pins :::::: TO: Carlo Caione <carlo(a)endlessm.com> :::::: CC: Mark Brown <broonie(a)kernel.org> --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

1 0

[alsa-devel] [PATCH v2 0/5] rt5651: Enable jack detection
by Carlo Caione 26 Oct '17

26 Oct '17

From: Carlo Caione <carlo(a)endlessm.com> Patchset to support jack detection for the rt5651 codec on the JD* pins and enable it on the KIANO cherry-trail laptop. Changelog: v2: - Added quirks for the KIANO laptop - Extended support to JD1_2 and JD2 pins - Reworked quirk logic in the codec driver - Codec driver can now differentiate between headphone and headset (thank you Bard Liao) Carlo Caione (5): ASoC: rt5651: Enable jack detection on JD* pins ASoC: intel: byt: Add headset jack ASoC: intel: byt: Enable IN2 map quirk for a KIANO laptop ASoC: rt5651: Rework quirk logic ASoC: rt5651: Enable JD1_1 quirk for KIANO laptopt include/sound/rt5651.h | 8 ++ sound/soc/codecs/rt5651.c | 215 +++++++++++++++++++++++++++++++++- sound/soc/codecs/rt5651.h | 4 + sound/soc/intel/boards/bytcr_rt5651.c | 31 +++++ 4 files changed, 252 insertions(+), 6 deletions(-) -- 2.14.2

2 11

[alsa-devel] [PATCH] dt-bindings: sgtl5000: Remove leading zero from '@0a' notation
by Marco Franchi 26 Oct '17

26 Oct '17

Improve the binding example by removing the leading 0 from '@0a' notation, which fixes the following build warning: Warning (unit_address_format): Node /sgtl5000@0a unit name should not have leading 0s Signed-off-by: Marco Franchi <marco.franchi(a)nxp.com> --- Documentation/devicetree/bindings/sound/sgtl5000.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/sound/sgtl5000.txt b/Documentation/devicetree/bindings/sound/sgtl5000.txt index 7a73a9d..060cb4a 100644 --- a/Documentation/devicetree/bindings/sound/sgtl5000.txt +++ b/Documentation/devicetree/bindings/sound/sgtl5000.txt @@ -37,7 +37,7 @@ VDDIO 1.8V 2.5V 3.3V Example: -codec: sgtl5000@0a { +codec: sgtl5000@a { compatible = "fsl,sgtl5000"; reg = <0x0a>; clocks = <&clks 150>; -- 2.7.4

2 2