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

[alsa-devel] [asoc:for-4.20 519/526] sound/soc/stm/stm32_sai_sub.c:343 stm32_sai_mclk_set_rate() warn: unsigned 'div' is never less than zero.
by kbuild test robot 23 Oct '18

23 Oct '18

tree: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-4.20 head: 7f91e2af1a4a2c34fc2e8fb046c722e1a9c85399 commit: 8307b2afd386ccce369821daa2196068c47fe8cd [519/526] ASoC: stm32: sai: set sai as mclk clock provider smatch warnings: sound/soc/stm/stm32_sai_sub.c:343 stm32_sai_mclk_set_rate() warn: unsigned 'div' is never less than zero. vim +/div +343 sound/soc/stm/stm32_sai_sub.c 333 334 static int stm32_sai_mclk_set_rate(struct clk_hw *hw, unsigned long rate, 335 unsigned long parent_rate) 336 { 337 struct stm32_sai_mclk_data *mclk = to_mclk_data(hw); 338 struct stm32_sai_sub_data *sai = mclk->sai_data; 339 unsigned int div; 340 int ret; 341 342 div = stm32_sai_get_clk_div(sai, parent_rate, rate); > 343 if (div < 0) 344 return div; 345 346 ret = stm32_sai_set_clk_div(sai, div); 347 if (ret) 348 return ret; 349 350 mclk->freq = rate; 351 352 return 0; 353 } 354 --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

1 0

[alsa-devel] [GIT PULL] ASoC updates for v5.0
by Mark Brown 23 Oct '18

23 Oct '18

The following changes since commit 35a7f35ad1b150ddf59a41dcac7b2fa32982be0e: Linux 4.19-rc8 (2018-10-15 07:20:24 +0200) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-v5.0 for you to fetch changes up to 65dfb6d6dd2850f3f99f08536d2b14190350c854: Merge branch 'asoc-4.20' into asoc-next (2018-10-21 16:59:23 +0100) ---------------------------------------------------------------- ASoC: Updates for v5.0/v4.20 As ever there's a lot of small and driver specific changes going on here, but we do also have some relatively large changes in the core thanks to the hard work of Charles and Morimoto-san: - More component transitions from Morimoto-san, I think we're about finished with this. Thanks for all the hard work! - Morimoto-san also added a bunch of for_each_foo macros - A bunch of cleanups and fixes for DAPM from Charles. - MCLK support for several different devices, including CS42L51, STM32 SAI, and MAX98373. - Support for Allwinner A64 CODEC analog, Intel boards with DA7219 and MAX98927, Meson AXG PDM inputs, Nuvoton NAU8822, Renesas R8A7744 and TI PCM3060. ---------------------------------------------------------------- Akshu Agrawal (5): ASoC: AMD: Set constraints for DMIC and MAX98357a codec ASoC: AMD: Change MCLK to 48Mhz ASoC: AMD: Fix simultaneous playback and capture on different channel ASoC: AMD: Fix capture unstable in beginning for some runs ASoC: AMD: Add SND_JACK_LINEOUT jack type Alexandru Ardelean (1): ASoC: dt-bindings: add dt bindings for adau1977 audio codec Andreas Dannenberg (2): ASoC: codecs: tas5720: add TAS5722 specific volume control ASoC: codecs: tas5720: add TAS5722 TDM slot width setting support Andreas Färber (3): ASoC: dt-bindings: add max98088 audio codec ASoC: max98088: add OF support ASoC: max98088: Add master clock handling Andrew F. Davis (4): ASoC: tas6424: Print full register name in error message ASoC: tas6424: Add channel fault reporting ASoC: tlv320aic31xx: Add short circuit detection support ASoC: tlv320aic31xx: Add overflow detection support Arnd Bergmann (4): ASoC: pxa: avoid AC97_BUS build warning ASoC: atmel: add SND_SOC_I2C_AND_SPI dependency ASoC: wm9712: fix unused variable warning ASoC: max98988: add I2C dependency Biju Das (1): ASoC: rsnd: Add r8a7744 support Charles Keepax (11): ASoC: dapm: Remove clock framework ifdefs ASoC: dapm: Don't fail creating new DAPM control on NULL pinctrl ASoC: dpcm: Properly initialise hw->rate_max ASoC: dapm: Move error handling to snd_soc_dapm_new_control_unlocked ASoC: dapm: Cosmetic tidy up of snd_soc_dapm_new_control ASoC: dapm: Move connection of CODEC to CODEC DAIs ASoC: dapm: Add support for multi-CODEC CODEC to CODEC links ASoC: dapm: Move CODEC to CODEC params from the widget to the runtime ASoC: dapm: Avoid uninitialised variable warning ASoC: dapm: Add missing return value check for snd_soc_dapm_new_dai ASoC: dapm: Add support for hw_free on CODEC to CODEC links Christoph Hellwig (1): ASoC: intel: don't pass GFP_DMA32 to dma_alloc_coherent Codrin Ciubotariu (2): ASoC: Add driver for PROTO Audio CODEC (with a WM8731) ASoC: mikroe-proto: dt-bindings: add DT bindings for PROTO board Colin Ian King (2): ASoC: hdac_hdmi: remove redundant check for !port condition ASoC: sgtl5000: avoid division by zero if lo_vag is zero Dan Carpenter (4): ASoC: dapm: Fix a couple uninitialized ret variables ASoC: qdsp6: q6asm-dai: clean up a return ASoC: qdsp6: q6asm-dai: checking NULL vs IS_ERR() ASoC: Intel: kbl_da7219_max98927: minor white space clean up Daniel Mack (6): ASoC: pxa-ssp: enable and disable extclk if given ASoC: add fault detect recovery property to DT bindings ASoC: Add device tree documentation file for wm8782 stereo DAC ASoC: wm8782: add support for regulators ASoC: sta32x: set ->component pointer in private struct ASoC: sta32x: Add support for XTI clock Danny Smith (1): ASoC: adau17x1: Implemented safeload support David Lin (1): ASoC: nau8822: new codec driver Dmytro Prokopchuk (1): ASoC: rsnd: fixup SSI clock during suspend/resume modes Dragos Tarcatu (3): ASoC: rsnd: add support for 16/24 bit slot widths ASoC: rsnd: add support for the DSP_A/DSP_B formats ASoC: rsnd: add support for 8 bit S8 format Fabrizio Castro (1): ASoC: rsnd: Add r8a774a1 support Grant Grundler (1): ASoC: max98373: usleep_range() needs include/delay.h Gustavo A. R. Silva (2): ASoC: es8328: Fix fall-through annotations ASoC: hisilicon: fix fall-through annotations Hans de Goede (3): ASoC: rt5670: Add quirk for Thinkpad 8 tablet ASoC: Intel: common: Add quirk for Thinkpad 8 tablet ASoC: Intel: cht-bsw-rt5672: Add key-mappings for the headset buttons Hiroyuki Yokoyama (1): ASoC: rsnd: Add device tree binding for r8a77990 Jerome Brunet (7): ASoC: meson: imply clock and reset controllers ASoC: meson: axg-fifo: report interrupt request failure ASoC: meson: axg-tdm: restrict formats depending on slot width ASoC: dmic: add Kconfig prompt for the generic dmic codec. ASoC: dmic: add DT module alias ASoC: meson: add axg pdm input DT binding documentation ASoC: meson: add axg pdm input Jiada Wang (8): ASoC: rsnd: add warning message to rsnd_kctrl_accept_runtime() ASoC: rsnd: remove is_play parameter from hw_rule function ASoC: rsnd: ssi: Fix issue in dma data address assignment ASoC: rsnd: ssi: Check runtime channel number rather than hw_params ASoc: rsnd: dma: Calculate dma address with consider of BUSIF ASoc: rsnd: dma: Calculate PDMACHCRE with consider of BUSIF ASoC: rsnd: ssiu: Support BUSIF other than BUSIF0 ASoC: rsnd: ssiu: Support to init different BUSIF instance Jon Hunter (1): ASoC: core: Don't schedule DAPM work if already in target state Katsuhiro Suzuki (1): ASoC: rockchip: add missing INTERLEAVED PCM attribute Kirill Marinushkin (3): ASoC: pcm3060: Add codec driver ASoC: pcm3060: Improve stylistics of file comments ASoC: pcm3060: Improve legibility of if-statements Kuninori Morimoto (55): ASoC: simple_card_utils: support snd_soc_dai_link_component style for codec ASoC: simple-card: support snd_soc_dai_link_component style for codec ASoC: simple-scu-card: use simple_dai_props ASoC: simple-scu-card: support snd_soc_dai_link_component style for codec ASoC: audio-graph-card: support snd_soc_dai_link_component style for codec ASoC: audio-graph-scu-card: use simple_dai_props ASoC: audio-graph-scu-card: support snd_soc_dai_link_component style for codec ASoC: simple-card-util: remove dai_link compatible code for codec ASoC: soc-core: use snd_soc_dai_link_component for platform ASoC: simple-card-util: support snd_soc_dai_link_component style for platform ASoC: simple-card: support snd_soc_dai_link_component style for platform ASoC: simple-scu-card: support snd_soc_dai_link_component style for platform ASoC: audio-graph-card: support snd_soc_dai_link_component style for platform ASoC: audio-graph-scu-card: support snd_soc_dai_link_component style for platform ASoC: simple-card-util: remove dai_link compatible code for platform ASoC: rsnd: merge .nolock_start and .prepare ASoC: add for_each_link_codecs() macro ASoC: add for_each_rtd_codec_dai() macro ASoC: rsnd: gen: use tab instead of white-space ASoC: rsnd: don't use %p for dev_dbg() ASoC: atmel_ssc_dai: use devm_snd_soc_register_component() ASoC: bcm: use devm_snd_soc_register_component() ASoC: hdac_hda: use devm_snd_soc_register_component() ASoC: rt5668: use devm_snd_soc_register_component() ASoC: tscs454: use devm_snd_soc_register_component() ASoC: nuc900: use devm_snd_soc_register_component() ASoC: omap: use devm_snd_soc_register_component() ASoC: sh: use devm_snd_soc_register_component() ASoC: txx9: use devm_snd_soc_register_component() ASoC: rt5668: remove empty rt5668_i2c_remove() ASoC: soc-core: avoid nested code on soc_remove_dai() ASoC: soc-core: remove unused num_dai_links ASoC: soc-core: remove dai->driver NULL check ASoC: soc-core: manage platform name under snd_soc_init_platform() ASoC: soc-core: add snd_soc_is_matching_component() ASoC: convert for_each_rtd_codec_dai() for missing part ASoC: rename for_each_rtd_codec_dai_reverse to rollback ASoC: add for_each_card_prelinks() macro ASoC: add for_each_card_links() macro ASoC: add for_each_card_rtds() macro ASoC: add for_each_card_components() macro ASoC: add for_each_comp_order() macro ASoC: add for_each_dpcm_fe() macro ASoC: add for_each_dpcm_be() macro ASoC: tidyup for_each_card_prelinks() dai_link ASoC: add for_each_component() macro ASoC: add for_each_component_dais() macro ASoC: rsnd: use 32bit TDM width as default ASoC: audio-graph-card: enable mclk-fs on codec node ASoC: pcm3168a: add HW constraint for non RIGHT_J ASoC: pcm3168a: add hw constraint for channel ASoC: pcm3168a: add I2S/Left_J TDM support ASoC: pcm3168a: add hw constraint for capture channel ASoC: rsnd: enable TDM settings for SSI parent ASoC: rsnd: tidyup SSICR::SWSP for TDM Linus Walleij (1): ASoC: rt5677-spi: Drop unused GPIO include Lucas Tanure (1): ASoC: wm2000: Remove wm2000_read helper function Mac Chiang (2): ASoC: Intel: Boards: Add KBL Dialog Maxim I2S machine driver ASoC: Intel: common: Add Kabylake Dialog+Maxim machine driver entry Marcel Ziswiler (2): ASoC: tegra_sgtl5000: fix device_node refcounting ASoC: soc-core: fix trivial checkpatch issues Marco Felsch (2): ASoC: dt-bindings: max98088: add external clock binding ASoC: max98988: make it selectable Marcus Cooper (1): ASoC: sun4i-i2s: Add compatibility with A64 codec I2S Mark Brown (10): Merge tag 'v4.19-rc1' into asoc-4.19 Merge tag 'hda-codec-h-move' into asoc-4.20 Merge branch 'asoc-4.19' into asoc-4.20 tas dependency Merge branch 'asoc-4.19' into asoc-4.20 for rcar dep Merge branch 'asoc-4.19' into asoc-4.20 Cirrus conflict ALSA: hda: Fix implicit definition of pci_iomap() on SH Merge branch 'asoc-4.19' into asoc-4.20 for rt5682 deps. Merge remote-tracking branch 'asoc/for-4.19' into asoc-4.20 Merge branch 'asoc-4.19' into asoc-linus Merge branch 'asoc-4.20' into asoc-next Matt Flax (4): ASoC: cs4265: SOC_SINGLE register value error fix ASoC: cs4265: Add native 32bit I2S transport ASoC: cs4265: Add a S/PDIF enable switch ASoC: cs4265: Add a MIC pre. route Matthias Kaehlcke (1): ASoC: soc-utils: Rename dummy_dma_ops to snd_dummy_dma_ops Oder Chiou (2): ASoC: rt5514-spi: Get the period_bytes in the copy work to make sure the value correctly ASoC: rt5663: Remove the boost volume in the beginning of playback Olivier Moysan (5): ASoC: dt-bindings: add mclk provider support to stm32 sai ASoC: dt-bindings: add mclk support to cs42l51 ASoC: stm32: sai: set sai as mclk clock provider ASoC: cs42l51: add mclk support ASoC: cs42l51: fix mclk support Peter Rosin (1): ASoC: atmel: tse850: switch to SPDX license identifier Peter Ujfalusi (1): ASoC: davinci-mcasp: Add support for FIFO usage caused delay reporting Pierre-Louis Bossart (3): ALSA: hda: move hda_codec.h to include/sound ASoC: Intel: common: add table for HDA-based platforms ALSA: hda: move hda_codec.h to include/sound Rakesh Ughreja (5): ASoC: Intel: Boards: Machine driver for SKL+ w/ HDAudio codecs ASoC: Intel: Skylake: use HDAudio if ACPI enumeration fails ASoC: Intel: Skylake: add HDA BE DAIs ASoC: Intel: Skylake: use hda_bus instead of hdac_bus ASoC: hdac_hda: add asoc extension for legacy HDA codec drivers Randy Dunlap (1): ASoC: fix soc-core.c kernel-doc warning Richard Fitzgerald (2): ASoC: wm_adsp: Rename memory fields in wm_adsp_buffer ASoC: wm_adsp: Log addresses as 8 digits in wm_adsp_buffer_populate Rob Herring (1): ASoC: Convert to using %pOFn instead of device_node.name Robert Jarzmik (1): ASoC: pxa: switch to new ac97 bus support Robert Rosengren (1): ASoC: adau17x1: Unused exported functions changed to internal Rohit kumar (2): ASoC: Fix UBSAN warning at snd_soc_get/put_volsw_sx() ASoC: q6afe: dt-bindings: Update input range for qcom,sd-lines Ryan Lee (4): ASoC: max98373: Sort Digital Volume in reverse order ASoC: max98373: Sort BDE Limiter Thresh Volume in reverse order ASoC: max98373: Sort max98373_bde_gain_tlv in reverse order ASoC: max98373: Sort DHT Rot Pnt Volume in reverse order Shuming Fan (6): ASoC: rt5682: Update calibration function ASoC: rt5682: Improve HP performance ASoC: rt5682: Remove HP volume control ASoC: rt5682: Update calibration function ASoC: rt5682: Fix the boost volume at the begining of playback ASoC: rt5682: Minor code modification Srinivas Kandagatla (1): ASoC: core: add support to card rebind Takashi Iwai (6): ASoC: intel: skylake: Add missing break in skl_tplg_get_token() ASoC: adau1761: Use the standard fall-through annotation ASoC: pcm186x: Use the standard fall-through annotation ASoC: rt274: Add fall-through annotations ASoC: intel: skylake: Add fall-through annotation ASoC: topology: Use the standard fall-through annotations Tzung-Bi Shih (1): ASoC: ts3a227e: fix a typo in documentation Vasily Khoruzhick (6): ASoC: sun8i-codec: Don't hardcode BCLK / LRCK ratio ASoC: sun8i-codec-analog: split regmap code into separate driver ASoC: dt-binding: Add bindings for Allwinner A64 codec's analog path controls ASoC: sunxi: Add new driver for Allwinner A64 codec's analog path controls ASoC: sunxi: allow the sun8i-codec driver to be built on ARM64 ASoC: sun4i-i2s: move code from startup/shutdown hooks into pm_runtime hooks Yong Zhi (1): ASoC: Intel: hdac_hdmi: Limit sampling rates at dai creation YueHaibing (2): ASoC: qdsp6: q6asm-dai: remove duplicated include from q6asm-dai.c ASoC: qcom: qdsp6: remove duplicated include zhong jiang (5): ASoC: q6core: Use kmemdup to replace kzalloc + memcpy ASoC: skl-topology: Use kmemdup to replace kzalloc + memcpy ASoC: remove unneeded static set .owner field in platform_driver ASoC: remove redundant include ASoC: qcom: qdsp6: remove duplicated include from q6adm.c .../devicetree/bindings/sound/adi,adau1977.txt | 54 + .../devicetree/bindings/sound/amlogic,axg-pdm.txt | 24 + .../devicetree/bindings/sound/cs42l51.txt | 17 + .../devicetree/bindings/sound/maxim,max98088.txt | 23 + .../bindings/sound/mikroe,mikroe-proto.txt | 23 + .../devicetree/bindings/sound/nau8822.txt | 16 + .../devicetree/bindings/sound/pcm3060.txt | 17 + .../devicetree/bindings/sound/qcom,q6afe.txt | 18 +- .../devicetree/bindings/sound/renesas,rsnd.txt | 5 +- .../devicetree/bindings/sound/st,sta32x.txt | 9 + .../devicetree/bindings/sound/st,stm32-sai.txt | 7 + .../devicetree/bindings/sound/sun4i-i2s.txt | 2 + .../bindings/sound/sun50i-codec-analog.txt | 12 + .../devicetree/bindings/sound/ts3a227e.txt | 2 +- Documentation/devicetree/bindings/sound/wm8782.txt | 17 + .../devicetree/bindings/trivial-devices.txt | 1 - .../devicetree/bindings/vendor-prefixes.txt | 1 + MAINTAINERS | 7 + {sound/pci/hda => include/sound}/hda_codec.h | 0 include/sound/simple_card_utils.h | 27 +- include/sound/soc-acpi-intel-match.h | 6 + include/sound/soc-dapm.h | 9 - include/sound/soc-dpcm.h | 10 + include/sound/soc.h | 45 +- sound/arm/Kconfig | 1 - sound/pci/hda/hda_auto_parser.c | 2 +- sound/pci/hda/hda_beep.h | 2 +- sound/pci/hda/hda_bind.c | 14 +- sound/pci/hda/hda_codec.c | 2 +- sound/pci/hda/hda_controller.h | 2 +- sound/pci/hda/hda_eld.c | 2 +- sound/pci/hda/hda_generic.c | 2 +- sound/pci/hda/hda_hwdep.c | 2 +- sound/pci/hda/hda_intel.c | 2 +- sound/pci/hda/hda_jack.c | 2 +- sound/pci/hda/hda_proc.c | 2 +- sound/pci/hda/hda_sysfs.c | 2 +- sound/pci/hda/hda_tegra.c | 2 +- sound/pci/hda/patch_analog.c | 2 +- sound/pci/hda/patch_ca0110.c | 2 +- sound/pci/hda/patch_ca0132.c | 3 +- sound/pci/hda/patch_cirrus.c | 2 +- sound/pci/hda/patch_cmedia.c | 2 +- sound/pci/hda/patch_conexant.c | 2 +- sound/pci/hda/patch_hdmi.c | 2 +- sound/pci/hda/patch_realtek.c | 2 +- sound/pci/hda/patch_si3054.c | 2 +- sound/pci/hda/patch_sigmatel.c | 2 +- sound/pci/hda/patch_via.c | 2 +- sound/soc/amd/acp-da7219-max98357a.c | 77 +- sound/soc/amd/acp-pcm-dma.c | 30 +- sound/soc/amd/acp.h | 3 +- sound/soc/atmel/Kconfig | 12 + sound/soc/atmel/Makefile | 2 + sound/soc/atmel/atmel_ssc_dai.c | 13 +- sound/soc/atmel/mikroe-proto.c | 165 +++ sound/soc/atmel/tse850-pcm5142.c | 78 +- sound/soc/bcm/cygnus-ssp.c | 13 +- sound/soc/codecs/Kconfig | 36 +- sound/soc/codecs/Makefile | 10 + sound/soc/codecs/adau1761.c | 3 +- sound/soc/codecs/adau17x1.c | 86 +- sound/soc/codecs/adau17x1.h | 4 - sound/soc/codecs/cs4265.c | 12 +- sound/soc/codecs/cs42l51.c | 21 + sound/soc/codecs/dmic.c | 1 + sound/soc/codecs/es8328.c | 4 +- sound/soc/codecs/hdac_hda.c | 483 +++++++++ sound/soc/codecs/hdac_hda.h | 24 + sound/soc/codecs/hdac_hdmi.c | 11 +- sound/soc/codecs/max98088.c | 36 + sound/soc/codecs/max98373.c | 47 +- sound/soc/codecs/nau8822.c | 1136 ++++++++++++++++++++ sound/soc/codecs/nau8822.h | 204 ++++ sound/soc/codecs/pcm186x.c | 3 +- sound/soc/codecs/pcm3060-i2c.c | 60 ++ sound/soc/codecs/pcm3060-spi.c | 59 + sound/soc/codecs/pcm3060.c | 295 +++++ sound/soc/codecs/pcm3060.h | 88 ++ sound/soc/codecs/pcm3168a.c | 82 ++ sound/soc/codecs/rt274.c | 2 + sound/soc/codecs/rt5514-spi.c | 14 +- sound/soc/codecs/rt5651.c | 1 - sound/soc/codecs/rt5663.c | 7 +- sound/soc/codecs/rt5668.c | 10 +- sound/soc/codecs/rt5670.c | 12 + sound/soc/codecs/rt5677-spi.c | 1 - sound/soc/codecs/rt5682.c | 86 +- sound/soc/codecs/rt5682.h | 14 + sound/soc/codecs/sgtl5000.c | 2 +- sound/soc/codecs/sta32x.c | 30 + sound/soc/codecs/tas5720.c | 103 +- sound/soc/codecs/tas6424.c | 58 +- sound/soc/codecs/tas6424.h | 10 + sound/soc/codecs/tlv320aic31xx.c | 85 ++ sound/soc/codecs/tlv320aic31xx.h | 23 + sound/soc/codecs/tscs454.c | 2 +- sound/soc/codecs/wm2000.c | 54 +- sound/soc/codecs/wm8782.c | 63 ++ sound/soc/codecs/wm8904.c | 1 - sound/soc/codecs/wm8974.c | 1 - sound/soc/codecs/wm9712.c | 3 +- sound/soc/codecs/wm_adsp.c | 26 +- sound/soc/davinci/davinci-mcasp.c | 37 + sound/soc/fsl/fsl_asrc_dma.c | 2 +- sound/soc/fsl/fsl_esai.c | 2 +- sound/soc/fsl/fsl_utils.c | 4 +- sound/soc/fsl/pcm030-audio-fabric.c | 5 +- sound/soc/generic/audio-graph-card.c | 21 +- sound/soc/generic/audio-graph-scu-card.c | 55 +- sound/soc/generic/simple-card-utils.c | 53 +- sound/soc/generic/simple-card.c | 30 +- sound/soc/generic/simple-scu-card.c | 54 +- sound/soc/hisilicon/hi6210-i2s.c | 4 +- sound/soc/intel/atom/sst-mfld-platform-pcm.c | 4 +- sound/soc/intel/boards/Kconfig | 22 + sound/soc/intel/boards/Makefile | 4 + sound/soc/intel/boards/broadwell.c | 4 +- sound/soc/intel/boards/bytcr_rt5640.c | 4 +- sound/soc/intel/boards/bytcr_rt5651.c | 4 +- sound/soc/intel/boards/cht_bsw_rt5672.c | 9 +- sound/soc/intel/boards/kbl_da7219_max98927.c | 983 +++++++++++++++++ sound/soc/intel/boards/kbl_rt5663_max98927.c | 5 +- .../soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 5 +- sound/soc/intel/boards/skl_hda_dsp_common.c | 127 +++ sound/soc/intel/boards/skl_hda_dsp_common.h | 38 + sound/soc/intel/boards/skl_hda_dsp_generic.c | 183 ++++ sound/soc/intel/common/Makefile | 3 +- sound/soc/intel/common/soc-acpi-intel-byt-match.c | 7 + sound/soc/intel/common/soc-acpi-intel-hda-match.c | 40 + sound/soc/intel/common/soc-acpi-intel-kbl-match.c | 13 + sound/soc/intel/common/sst-firmware.c | 2 +- sound/soc/intel/skylake/skl-pcm.c | 71 +- sound/soc/intel/skylake/skl-topology.c | 4 +- sound/soc/intel/skylake/skl.c | 96 +- sound/soc/intel/skylake/skl.h | 12 +- sound/soc/mediatek/mt2701/mt2701-cs42448.c | 13 +- sound/soc/mediatek/mt2701/mt2701-wm8960.c | 14 +- sound/soc/mediatek/mt6797/mt6797-mt6351.c | 14 +- sound/soc/mediatek/mt8173/mt8173-max98090.c | 13 +- sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c | 12 +- sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c | 12 +- sound/soc/mediatek/mt8173/mt8173-rt5650.c | 12 +- sound/soc/meson/Kconfig | 13 + sound/soc/meson/Makefile | 2 + sound/soc/meson/axg-card.c | 16 +- sound/soc/meson/axg-fifo.c | 2 + sound/soc/meson/axg-pdm.c | 654 +++++++++++ sound/soc/meson/axg-tdm-interface.c | 50 +- sound/soc/nuc900/nuc900-ac97.c | 4 +- sound/soc/omap/omap-hdmi-audio.c | 4 +- sound/soc/pxa/Kconfig | 13 +- sound/soc/pxa/pxa-ssp.c | 6 + sound/soc/pxa/pxa2xx-ac97.c | 48 +- sound/soc/qcom/apq8096.c | 7 +- sound/soc/qcom/qdsp6/q6adm.c | 17 +- sound/soc/qcom/qdsp6/q6asm-dai.c | 8 +- sound/soc/qcom/qdsp6/q6asm.c | 1 - sound/soc/qcom/qdsp6/q6core.c | 9 +- sound/soc/qcom/sdm845.c | 7 +- sound/soc/rockchip/rk3288_hdmi_analog.c | 1 - sound/soc/rockchip/rockchip_pcm.c | 3 +- sound/soc/samsung/tm2_wm5110.c | 13 +- sound/soc/sh/hac.c | 3 +- sound/soc/sh/rcar/adg.c | 4 +- sound/soc/sh/rcar/core.c | 124 ++- sound/soc/sh/rcar/ctu.c | 2 +- sound/soc/sh/rcar/dma.c | 109 +- sound/soc/sh/rcar/gen.c | 33 +- sound/soc/sh/rcar/rsnd.h | 63 +- sound/soc/sh/rcar/src.c | 2 +- sound/soc/sh/rcar/ssi.c | 112 +- sound/soc/sh/rcar/ssiu.c | 92 +- sound/soc/soc-compress.c | 4 +- sound/soc/soc-core.c | 582 +++++----- sound/soc/soc-dapm.c | 437 ++++---- sound/soc/soc-ops.c | 4 +- sound/soc/soc-pcm.c | 253 +++-- sound/soc/soc-topology.c | 15 +- sound/soc/soc-utils.c | 4 +- sound/soc/stm/stm32_sai.c | 2 +- sound/soc/stm/stm32_sai.h | 3 + sound/soc/stm/stm32_sai_sub.c | 282 ++++- sound/soc/sunxi/Kconfig | 17 +- sound/soc/sunxi/Makefile | 2 + sound/soc/sunxi/sun4i-i2s.c | 82 +- sound/soc/sunxi/sun50i-codec-analog.c | 444 ++++++++ sound/soc/sunxi/sun8i-adda-pr-regmap.c | 102 ++ sound/soc/sunxi/sun8i-adda-pr-regmap.h | 7 + sound/soc/sunxi/sun8i-codec-analog.c | 79 +- sound/soc/sunxi/sun8i-codec.c | 22 +- sound/soc/tegra/tegra_sgtl5000.c | 17 +- sound/soc/txx9/txx9aclc-ac97.c | 3 +- 193 files changed, 8358 insertions(+), 1542 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/adi,adau1977.txt create mode 100644 Documentation/devicetree/bindings/sound/amlogic,axg-pdm.txt create mode 100644 Documentation/devicetree/bindings/sound/cs42l51.txt create mode 100644 Documentation/devicetree/bindings/sound/maxim,max98088.txt create mode 100644 Documentation/devicetree/bindings/sound/mikroe,mikroe-proto.txt create mode 100644 Documentation/devicetree/bindings/sound/nau8822.txt create mode 100644 Documentation/devicetree/bindings/sound/pcm3060.txt create mode 100644 Documentation/devicetree/bindings/sound/sun50i-codec-analog.txt create mode 100644 Documentation/devicetree/bindings/sound/wm8782.txt rename {sound/pci/hda => include/sound}/hda_codec.h (100%) create mode 100644 sound/soc/atmel/mikroe-proto.c create mode 100644 sound/soc/codecs/hdac_hda.c create mode 100644 sound/soc/codecs/hdac_hda.h create mode 100644 sound/soc/codecs/nau8822.c create mode 100644 sound/soc/codecs/nau8822.h create mode 100644 sound/soc/codecs/pcm3060-i2c.c create mode 100644 sound/soc/codecs/pcm3060-spi.c create mode 100644 sound/soc/codecs/pcm3060.c create mode 100644 sound/soc/codecs/pcm3060.h create mode 100644 sound/soc/intel/boards/kbl_da7219_max98927.c create mode 100644 sound/soc/intel/boards/skl_hda_dsp_common.c create mode 100644 sound/soc/intel/boards/skl_hda_dsp_common.h create mode 100644 sound/soc/intel/boards/skl_hda_dsp_generic.c create mode 100644 sound/soc/intel/common/soc-acpi-intel-hda-match.c create mode 100644 sound/soc/meson/axg-pdm.c create mode 100644 sound/soc/sunxi/sun50i-codec-analog.c create mode 100644 sound/soc/sunxi/sun8i-adda-pr-regmap.c create mode 100644 sound/soc/sunxi/sun8i-adda-pr-regmap.h

2 1

[alsa-devel] [PATCH] ALSA: hda/ca0132 - Actually fix microphone issue
by Connor McAdams 22 Oct '18

22 Oct '18

This patch fixes the microphone issue for all cards. The previous fix worked on the ZxR, but not on the AE-5 or Z. This patch has been tested to work for all cards. Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> --- sound/pci/hda/patch_ca0132.c | 73 ++++++++++++++++++++++---------------------- 1 file changed, 37 insertions(+), 36 deletions(-) diff --git a/sound/pci/hda/patch_ca0132.c b/sound/pci/hda/patch_ca0132.c index 1a13cea..f0ef52e 100644 --- a/sound/pci/hda/patch_ca0132.c +++ b/sound/pci/hda/patch_ca0132.c @@ -6983,37 +6983,44 @@ static void sbz_chipio_startup_data(struct hda_codec *codec) static void ca0132_alt_dsp_scp_startup(struct hda_codec *codec) { struct ca0132_spec *spec = codec->spec; - unsigned int tmp; + unsigned int tmp, i; - switch (spec->quirk) { - case QUIRK_SBZ: - case QUIRK_AE5: - tmp = 0x00000003; - dspio_set_uint_param_no_source(codec, 0x80, 0x0C, tmp); - tmp = 0x00000000; - dspio_set_uint_param_no_source(codec, 0x80, 0x0A, tmp); - tmp = 0x00000001; - dspio_set_uint_param_no_source(codec, 0x80, 0x0B, tmp); - tmp = 0x00000004; - dspio_set_uint_param_no_source(codec, 0x80, 0x0C, tmp); - tmp = 0x00000005; - dspio_set_uint_param_no_source(codec, 0x80, 0x0C, tmp); - tmp = 0x00000000; - dspio_set_uint_param_no_source(codec, 0x80, 0x0C, tmp); - break; - case QUIRK_R3D: - case QUIRK_R3DI: - tmp = 0x00000000; - dspio_set_uint_param_no_source(codec, 0x80, 0x0A, tmp); - tmp = 0x00000001; - dspio_set_uint_param_no_source(codec, 0x80, 0x0B, tmp); - tmp = 0x00000004; - dspio_set_uint_param_no_source(codec, 0x80, 0x0C, tmp); - tmp = 0x00000005; - dspio_set_uint_param_no_source(codec, 0x80, 0x0C, tmp); - tmp = 0x00000000; - dspio_set_uint_param_no_source(codec, 0x80, 0x0C, tmp); - break; + /* + * Gotta run these twice, or else mic works inconsistently. Not clear + * why this is, but multiple tests have confirmed it. + */ + for (i = 0; i < 2; i++) { + switch (spec->quirk) { + case QUIRK_SBZ: + case QUIRK_AE5: + tmp = 0x00000003; + dspio_set_uint_param_no_source(codec, 0x80, 0x0C, tmp); + tmp = 0x00000000; + dspio_set_uint_param_no_source(codec, 0x80, 0x0A, tmp); + tmp = 0x00000001; + dspio_set_uint_param_no_source(codec, 0x80, 0x0B, tmp); + tmp = 0x00000004; + dspio_set_uint_param_no_source(codec, 0x80, 0x0C, tmp); + tmp = 0x00000005; + dspio_set_uint_param_no_source(codec, 0x80, 0x0C, tmp); + tmp = 0x00000000; + dspio_set_uint_param_no_source(codec, 0x80, 0x0C, tmp); + break; + case QUIRK_R3D: + case QUIRK_R3DI: + tmp = 0x00000000; + dspio_set_uint_param_no_source(codec, 0x80, 0x0A, tmp); + tmp = 0x00000001; + dspio_set_uint_param_no_source(codec, 0x80, 0x0B, tmp); + tmp = 0x00000004; + dspio_set_uint_param_no_source(codec, 0x80, 0x0C, tmp); + tmp = 0x00000005; + dspio_set_uint_param_no_source(codec, 0x80, 0x0C, tmp); + tmp = 0x00000000; + dspio_set_uint_param_no_source(codec, 0x80, 0x0C, tmp); + break; + } + msleep(100); } } @@ -7246,8 +7253,6 @@ static void r3d_setup_defaults(struct hda_codec *codec) int num_fx; int idx, i; - msleep(100); - if (spec->dsp_state != DSP_DOWNLOADED) return; @@ -7292,8 +7297,6 @@ static void sbz_setup_defaults(struct hda_codec *codec) int num_fx; int idx, i; - msleep(100); - if (spec->dsp_state != DSP_DOWNLOADED) return; @@ -7351,8 +7354,6 @@ static void ae5_setup_defaults(struct hda_codec *codec) int num_fx; int idx, i; - msleep(100); - if (spec->dsp_state != DSP_DOWNLOADED) return; -- 2.7.4

2 1

[alsa-devel] Applied "ASoC: sun4i-i2s: move code from startup/shutdown hooks into pm_runtime hooks" to the asoc tree
by Mark Brown 21 Oct '18

21 Oct '18

The patch ASoC: sun4i-i2s: move code from startup/shutdown hooks into pm_runtime hooks has been applied to the asoc tree at https://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 7f91e2af1a4a2c34fc2e8fb046c722e1a9c85399 Mon Sep 17 00:00:00 2001 From: Vasily Khoruzhick <anarsoul(a)gmail.com> Date: Sun, 21 Oct 2018 08:39:11 -0700 Subject: [PATCH] ASoC: sun4i-i2s: move code from startup/shutdown hooks into pm_runtime hooks startup() and shutdown() hooks are called for both substreams, so stopping either substream when another is running breaks the latter. E.g. playback breaks if capture is stopped when playback is running. Move code from startup() and shutdown() to resume() and suspend() hooks respectively to fix this issue Signed-off-by: Vasily Khoruzhick <anarsoul(a)gmail.com> Acked-by: Maxime Ripard <maxime.ripard(a)bootlin.com> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- sound/soc/sunxi/sun4i-i2s.c | 61 +++++++++++++++---------------------- 1 file changed, 25 insertions(+), 36 deletions(-) diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c index c63d226e2436..d5ec1a20499d 100644 --- a/sound/soc/sunxi/sun4i-i2s.c +++ b/sound/soc/sunxi/sun4i-i2s.c @@ -644,40 +644,6 @@ static int sun4i_i2s_trigger(struct snd_pcm_substream *substream, int cmd, return 0; } -static int sun4i_i2s_startup(struct snd_pcm_substream *substream, - struct snd_soc_dai *dai) -{ - struct sun4i_i2s *i2s = snd_soc_dai_get_drvdata(dai); - - /* Enable the whole hardware block */ - regmap_update_bits(i2s->regmap, SUN4I_I2S_CTRL_REG, - SUN4I_I2S_CTRL_GL_EN, SUN4I_I2S_CTRL_GL_EN); - - /* Enable the first output line */ - regmap_update_bits(i2s->regmap, SUN4I_I2S_CTRL_REG, - SUN4I_I2S_CTRL_SDO_EN_MASK, - SUN4I_I2S_CTRL_SDO_EN(0)); - - - return clk_prepare_enable(i2s->mod_clk); -} - -static void sun4i_i2s_shutdown(struct snd_pcm_substream *substream, - struct snd_soc_dai *dai) -{ - struct sun4i_i2s *i2s = snd_soc_dai_get_drvdata(dai); - - clk_disable_unprepare(i2s->mod_clk); - - /* Disable our output lines */ - regmap_update_bits(i2s->regmap, SUN4I_I2S_CTRL_REG, - SUN4I_I2S_CTRL_SDO_EN_MASK, 0); - - /* Disable the whole hardware block */ - regmap_update_bits(i2s->regmap, SUN4I_I2S_CTRL_REG, - SUN4I_I2S_CTRL_GL_EN, 0); -} - static int sun4i_i2s_set_sysclk(struct snd_soc_dai *dai, int clk_id, unsigned int freq, int dir) { @@ -695,8 +661,6 @@ static const struct snd_soc_dai_ops sun4i_i2s_dai_ops = { .hw_params = sun4i_i2s_hw_params, .set_fmt = sun4i_i2s_set_fmt, .set_sysclk = sun4i_i2s_set_sysclk, - .shutdown = sun4i_i2s_shutdown, - .startup = sun4i_i2s_startup, .trigger = sun4i_i2s_trigger, }; @@ -869,6 +833,21 @@ static int sun4i_i2s_runtime_resume(struct device *dev) goto err_disable_clk; } + /* Enable the whole hardware block */ + regmap_update_bits(i2s->regmap, SUN4I_I2S_CTRL_REG, + SUN4I_I2S_CTRL_GL_EN, SUN4I_I2S_CTRL_GL_EN); + + /* Enable the first output line */ + regmap_update_bits(i2s->regmap, SUN4I_I2S_CTRL_REG, + SUN4I_I2S_CTRL_SDO_EN_MASK, + SUN4I_I2S_CTRL_SDO_EN(0)); + + ret = clk_prepare_enable(i2s->mod_clk); + if (ret) { + dev_err(dev, "Failed to enable module clock\n"); + goto err_disable_clk; + } + return 0; err_disable_clk: @@ -880,6 +859,16 @@ static int sun4i_i2s_runtime_suspend(struct device *dev) { struct sun4i_i2s *i2s = dev_get_drvdata(dev); + clk_disable_unprepare(i2s->mod_clk); + + /* Disable our output lines */ + regmap_update_bits(i2s->regmap, SUN4I_I2S_CTRL_REG, + SUN4I_I2S_CTRL_SDO_EN_MASK, 0); + + /* Disable the whole hardware block */ + regmap_update_bits(i2s->regmap, SUN4I_I2S_CTRL_REG, + SUN4I_I2S_CTRL_GL_EN, 0); + regcache_cache_only(i2s->regmap, true); clk_disable_unprepare(i2s->bus_clk); -- 2.19.0

1 0

[alsa-devel] [PATCH RESEND v2] ASoC: sun4i-i2s: move code from startup/shutdown hooks into pm_runtime hooks
by Vasily Khoruzhick 21 Oct '18

21 Oct '18

startup() and shutdown() hooks are called for both substreams, so stopping either substream when another is running breaks the latter. E.g. playback breaks if capture is stopped when playback is running. Move code from startup() and shutdown() to resume() and suspend() hooks respectively to fix this issue Signed-off-by: Vasily Khoruzhick <anarsoul(a)gmail.com> Acked-by: Maxime Ripard <maxime.ripard(a)bootlin.com> --- v2: - rename from "ASoC: sun4i-i2s: don't try to start up or shut down DAI if it's active" - move code from startup/shutdown hooks into pm_runtime sound/soc/sunxi/sun4i-i2s.c | 61 +++++++++++++++---------------------- 1 file changed, 25 insertions(+), 36 deletions(-) diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c index a4aa931ebfae..daa6c08cffbc 100644 --- a/sound/soc/sunxi/sun4i-i2s.c +++ b/sound/soc/sunxi/sun4i-i2s.c @@ -644,40 +644,6 @@ static int sun4i_i2s_trigger(struct snd_pcm_substream *substream, int cmd, return 0; } -static int sun4i_i2s_startup(struct snd_pcm_substream *substream, - struct snd_soc_dai *dai) -{ - struct sun4i_i2s *i2s = snd_soc_dai_get_drvdata(dai); - - /* Enable the whole hardware block */ - regmap_update_bits(i2s->regmap, SUN4I_I2S_CTRL_REG, - SUN4I_I2S_CTRL_GL_EN, SUN4I_I2S_CTRL_GL_EN); - - /* Enable the first output line */ - regmap_update_bits(i2s->regmap, SUN4I_I2S_CTRL_REG, - SUN4I_I2S_CTRL_SDO_EN_MASK, - SUN4I_I2S_CTRL_SDO_EN(0)); - - - return clk_prepare_enable(i2s->mod_clk); -} - -static void sun4i_i2s_shutdown(struct snd_pcm_substream *substream, - struct snd_soc_dai *dai) -{ - struct sun4i_i2s *i2s = snd_soc_dai_get_drvdata(dai); - - clk_disable_unprepare(i2s->mod_clk); - - /* Disable our output lines */ - regmap_update_bits(i2s->regmap, SUN4I_I2S_CTRL_REG, - SUN4I_I2S_CTRL_SDO_EN_MASK, 0); - - /* Disable the whole hardware block */ - regmap_update_bits(i2s->regmap, SUN4I_I2S_CTRL_REG, - SUN4I_I2S_CTRL_GL_EN, 0); -} - static int sun4i_i2s_set_sysclk(struct snd_soc_dai *dai, int clk_id, unsigned int freq, int dir) { @@ -695,8 +661,6 @@ static const struct snd_soc_dai_ops sun4i_i2s_dai_ops = { .hw_params = sun4i_i2s_hw_params, .set_fmt = sun4i_i2s_set_fmt, .set_sysclk = sun4i_i2s_set_sysclk, - .shutdown = sun4i_i2s_shutdown, - .startup = sun4i_i2s_startup, .trigger = sun4i_i2s_trigger, }; @@ -869,6 +833,21 @@ static int sun4i_i2s_runtime_resume(struct device *dev) goto err_disable_clk; } + /* Enable the whole hardware block */ + regmap_update_bits(i2s->regmap, SUN4I_I2S_CTRL_REG, + SUN4I_I2S_CTRL_GL_EN, SUN4I_I2S_CTRL_GL_EN); + + /* Enable the first output line */ + regmap_update_bits(i2s->regmap, SUN4I_I2S_CTRL_REG, + SUN4I_I2S_CTRL_SDO_EN_MASK, + SUN4I_I2S_CTRL_SDO_EN(0)); + + ret = clk_prepare_enable(i2s->mod_clk); + if (ret) { + dev_err(dev, "Failed to enable module clock\n"); + goto err_disable_clk; + } + return 0; err_disable_clk: @@ -880,6 +859,16 @@ static int sun4i_i2s_runtime_suspend(struct device *dev) { struct sun4i_i2s *i2s = dev_get_drvdata(dev); + clk_disable_unprepare(i2s->mod_clk); + + /* Disable our output lines */ + regmap_update_bits(i2s->regmap, SUN4I_I2S_CTRL_REG, + SUN4I_I2S_CTRL_SDO_EN_MASK, 0); + + /* Disable the whole hardware block */ + regmap_update_bits(i2s->regmap, SUN4I_I2S_CTRL_REG, + SUN4I_I2S_CTRL_GL_EN, 0); + regcache_cache_only(i2s->regmap, true); clk_disable_unprepare(i2s->bus_clk); -- 2.19.0

1 0

[alsa-devel] [PATCH v2] ASoC: sun4i-i2s: move code from startup/shutdown hooks into pm_runtime hooks
by Vasily Khoruzhick 21 Oct '18

21 Oct '18

startup() and shutdown() hooks are called for both substreams, so stopping either substream when another is running breaks the latter. E.g. playback breaks if capture is stopped when playback is running. Move code from startup() and shutdown() to resume() and suspend() hooks respectively to fix this issue Signed-off-by: Vasily Khoruzhick <anarsoul(a)gmail.com> --- v2: - rename from "ASoC: sun4i-i2s: don't try to start up or shut down DAI if it's active" - move code from startup/shutdown hooks into pm_runtime sound/soc/sunxi/sun4i-i2s.c | 61 +++++++++++++++---------------------- 1 file changed, 25 insertions(+), 36 deletions(-) diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c index a4aa931ebfae..daa6c08cffbc 100644 --- a/sound/soc/sunxi/sun4i-i2s.c +++ b/sound/soc/sunxi/sun4i-i2s.c @@ -644,40 +644,6 @@ static int sun4i_i2s_trigger(struct snd_pcm_substream *substream, int cmd, return 0; } -static int sun4i_i2s_startup(struct snd_pcm_substream *substream, - struct snd_soc_dai *dai) -{ - struct sun4i_i2s *i2s = snd_soc_dai_get_drvdata(dai); - - /* Enable the whole hardware block */ - regmap_update_bits(i2s->regmap, SUN4I_I2S_CTRL_REG, - SUN4I_I2S_CTRL_GL_EN, SUN4I_I2S_CTRL_GL_EN); - - /* Enable the first output line */ - regmap_update_bits(i2s->regmap, SUN4I_I2S_CTRL_REG, - SUN4I_I2S_CTRL_SDO_EN_MASK, - SUN4I_I2S_CTRL_SDO_EN(0)); - - - return clk_prepare_enable(i2s->mod_clk); -} - -static void sun4i_i2s_shutdown(struct snd_pcm_substream *substream, - struct snd_soc_dai *dai) -{ - struct sun4i_i2s *i2s = snd_soc_dai_get_drvdata(dai); - - clk_disable_unprepare(i2s->mod_clk); - - /* Disable our output lines */ - regmap_update_bits(i2s->regmap, SUN4I_I2S_CTRL_REG, - SUN4I_I2S_CTRL_SDO_EN_MASK, 0); - - /* Disable the whole hardware block */ - regmap_update_bits(i2s->regmap, SUN4I_I2S_CTRL_REG, - SUN4I_I2S_CTRL_GL_EN, 0); -} - static int sun4i_i2s_set_sysclk(struct snd_soc_dai *dai, int clk_id, unsigned int freq, int dir) { @@ -695,8 +661,6 @@ static const struct snd_soc_dai_ops sun4i_i2s_dai_ops = { .hw_params = sun4i_i2s_hw_params, .set_fmt = sun4i_i2s_set_fmt, .set_sysclk = sun4i_i2s_set_sysclk, - .shutdown = sun4i_i2s_shutdown, - .startup = sun4i_i2s_startup, .trigger = sun4i_i2s_trigger, }; @@ -869,6 +833,21 @@ static int sun4i_i2s_runtime_resume(struct device *dev) goto err_disable_clk; } + /* Enable the whole hardware block */ + regmap_update_bits(i2s->regmap, SUN4I_I2S_CTRL_REG, + SUN4I_I2S_CTRL_GL_EN, SUN4I_I2S_CTRL_GL_EN); + + /* Enable the first output line */ + regmap_update_bits(i2s->regmap, SUN4I_I2S_CTRL_REG, + SUN4I_I2S_CTRL_SDO_EN_MASK, + SUN4I_I2S_CTRL_SDO_EN(0)); + + ret = clk_prepare_enable(i2s->mod_clk); + if (ret) { + dev_err(dev, "Failed to enable module clock\n"); + goto err_disable_clk; + } + return 0; err_disable_clk: @@ -880,6 +859,16 @@ static int sun4i_i2s_runtime_suspend(struct device *dev) { struct sun4i_i2s *i2s = dev_get_drvdata(dev); + clk_disable_unprepare(i2s->mod_clk); + + /* Disable our output lines */ + regmap_update_bits(i2s->regmap, SUN4I_I2S_CTRL_REG, + SUN4I_I2S_CTRL_SDO_EN_MASK, 0); + + /* Disable the whole hardware block */ + regmap_update_bits(i2s->regmap, SUN4I_I2S_CTRL_REG, + SUN4I_I2S_CTRL_GL_EN, 0); + regcache_cache_only(i2s->regmap, true); clk_disable_unprepare(i2s->bus_clk); -- 2.19.0

3 9

[alsa-devel] Applied "ASoC: wm2000: Remove wm2000_read helper function" to the asoc tree
by Mark Brown 21 Oct '18

21 Oct '18

The patch ASoC: wm2000: Remove wm2000_read helper function has been applied to the asoc tree at https://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 c5d09485def41cab9e75ba23abbf87080183183c Mon Sep 17 00:00:00 2001 From: Lucas Tanure <tanureal(a)opensource.cirrus.com> Date: Fri, 19 Oct 2018 17:44:22 +0100 Subject: [PATCH] ASoC: wm2000: Remove wm2000_read helper function The return type "unsigned int" was used by the wm2000_read() function despite of the aspect that it will eventually return a negative error code. The resulting function doesn't add much to the code, so replace wm2000_read with regmap_read. Signed-off-by: Lucas Tanure <tanureal(a)opensource.cirrus.com> Acked-by: Charles Keepax <ckeepax(a)opensource.cirrus.com> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- sound/soc/codecs/wm2000.c | 54 ++++++++++++++++++++++----------------- 1 file changed, 30 insertions(+), 24 deletions(-) diff --git a/sound/soc/codecs/wm2000.c b/sound/soc/codecs/wm2000.c index c5ae07234a00..bba330e30162 100644 --- a/sound/soc/codecs/wm2000.c +++ b/sound/soc/codecs/wm2000.c @@ -88,19 +88,6 @@ static int wm2000_write(struct i2c_client *i2c, unsigned int reg, return regmap_write(wm2000->regmap, reg, value); } -static unsigned int wm2000_read(struct i2c_client *i2c, unsigned int r) -{ - struct wm2000_priv *wm2000 = i2c_get_clientdata(i2c); - unsigned int val; - int ret; - - ret = regmap_read(wm2000->regmap, r, &val); - if (ret < 0) - return -1; - - return val; -} - static void wm2000_reset(struct wm2000_priv *wm2000) { struct i2c_client *i2c = wm2000->i2c; @@ -115,14 +102,15 @@ static void wm2000_reset(struct wm2000_priv *wm2000) static int wm2000_poll_bit(struct i2c_client *i2c, unsigned int reg, u8 mask) { + struct wm2000_priv *wm2000 = i2c_get_clientdata(i2c); int timeout = 4000; - int val; + unsigned int val; - val = wm2000_read(i2c, reg); + regmap_read(wm2000->regmap, reg, &val); while (!(val & mask) && --timeout) { msleep(1); - val = wm2000_read(i2c, reg); + regmap_read(wm2000->regmap, reg, &val); } if (timeout == 0) @@ -135,6 +123,7 @@ static int wm2000_power_up(struct i2c_client *i2c, int analogue) { struct wm2000_priv *wm2000 = dev_get_drvdata(&i2c->dev); unsigned long rate; + unsigned int val; int ret; if (WARN_ON(wm2000->anc_mode != ANC_OFF)) @@ -213,12 +202,17 @@ static int wm2000_power_up(struct i2c_client *i2c, int analogue) WM2000_MODE_THERMAL_ENABLE); } - ret = wm2000_read(i2c, WM2000_REG_SPEECH_CLARITY); + ret = regmap_read(wm2000->regmap, WM2000_REG_SPEECH_CLARITY, &val); + if (ret != 0) { + dev_err(&i2c->dev, "Unable to read Speech Clarity: %d\n", ret); + regulator_bulk_disable(WM2000_NUM_SUPPLIES, wm2000->supplies); + return ret; + } if (wm2000->speech_clarity) - ret |= WM2000_SPEECH_CLARITY; + val |= WM2000_SPEECH_CLARITY; else - ret &= ~WM2000_SPEECH_CLARITY; - wm2000_write(i2c, WM2000_REG_SPEECH_CLARITY, ret); + val &= ~WM2000_SPEECH_CLARITY; + wm2000_write(i2c, WM2000_REG_SPEECH_CLARITY, val); wm2000_write(i2c, WM2000_REG_SYS_START0, 0x33); wm2000_write(i2c, WM2000_REG_SYS_START1, 0x02); @@ -824,7 +818,7 @@ static int wm2000_i2c_probe(struct i2c_client *i2c, const char *filename; const struct firmware *fw = NULL; int ret, i; - int reg; + unsigned int reg; u16 id; wm2000 = devm_kzalloc(&i2c->dev, sizeof(*wm2000), GFP_KERNEL); @@ -860,9 +854,17 @@ static int wm2000_i2c_probe(struct i2c_client *i2c, } /* Verify that this is a WM2000 */ - reg = wm2000_read(i2c, WM2000_REG_ID1); + ret = regmap_read(wm2000->regmap, WM2000_REG_ID1, &reg); + if (ret != 0) { + dev_err(&i2c->dev, "Unable to read ID1: %d\n", ret); + return ret; + } id = reg << 8; - reg = wm2000_read(i2c, WM2000_REG_ID2); + ret = regmap_read(wm2000->regmap, WM2000_REG_ID2, &reg); + if (ret != 0) { + dev_err(&i2c->dev, "Unable to read ID2: %d\n", ret); + return ret; + } id |= reg & 0xff; if (id != 0x2000) { @@ -871,7 +873,11 @@ static int wm2000_i2c_probe(struct i2c_client *i2c, goto err_supplies; } - reg = wm2000_read(i2c, WM2000_REG_REVISON); + ret = regmap_read(wm2000->regmap, WM2000_REG_REVISON, &reg); + if (ret != 0) { + dev_err(&i2c->dev, "Unable to read Revision: %d\n", ret); + return ret; + } dev_info(&i2c->dev, "revision %c\n", reg + 'A'); wm2000->mclk = devm_clk_get(&i2c->dev, "MCLK"); -- 2.19.0

1 0

Re: [alsa-devel] [PATCH] ASoC: wm2000: Remove wm2000_read helper function
by Charles Keepax 21 Oct '18

21 Oct '18

On Fri, Oct 19, 2018 at 05:44:22PM +0100, Lucas Tanure wrote: > The return type "unsigned int" was used by the wm2000_read() > function despite of the aspect that it will eventually return > a negative error code. > The resulting function doesn't add much to the code, so replace > wm2000_read with regmap_read. > > Signed-off-by: Lucas Tanure <tanureal(a)opensource.cirrus.com> > --- Acked-by: Charles Keepax <ckeepax(a)opensource.cirrus.com> Thanks, Charles

1 0

Re: [alsa-devel] Tascam FW-1884 driver
by Takashi Sakamoto 20 Oct '18

20 Oct '18

Hi, (C.C.ed to alsa-devel, ffado-devel and Scott) On Sat, 20 Oct 2018, Cédric Mialaret wrote: > I stumbled up the source code of a linux driver for the Tascam FW-1884 audio interface: > > https://elixir.bootlin.com/linux/v4.19-rc8/source/sound/firewire/tascam/tas… > > a. Does it work ? It, ALSA firewire-tascam driver, works for systems in which Linux kernel is used. It's already included in Linux kernel source since kernel v4.4. > b. Does it implement all functionalities of the FW-1884 ? As of kernel v4.19, it supports below functionalities: - data transmission for PCM frames via ALSA PCM interface - data transmission for MIDI messages via ALSA rawmidi interface Recently I got Scott's help and work to support handling control messages from faders/knobs/buttons on control surface of FW-1884/FW-1082. You can see recent patches in my remote repository: - https://github.com/takaswie/snd-firewire-improve/tree/topic/tascam-userspac… - https://github.com/takaswie/libhinawa/tree/topic/tascam-userspace-take3 You can see our discussion in list: - http://mailman.alsa-project.org/pipermail/alsa-devel/2018-October/140593.ht… > c. Is this the original code from Tascam/Frontier Design? Apparently, no. It comes from my work for reverse engineering, by sniffing packet communications over IEEE 1394 bus. > d. Do you by any chance have the source code of the Windows driver ? I have no such chance, as well as the others. Regards Takashi Sakamoto

1 0

[alsa-devel] [asoc:for-4.20 333/524] sound/pci/hda/patch_ca0132.c:7650:20: error: implicit declaration of function 'pci_iomap'; did you mean 'pcim_iomap'?
by kbuild test robot 20 Oct '18

20 Oct '18

Hi Rakesh, FYI, the error/warning still remains. tree: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-4.20 head: 318e741ee13b5a72f3051d9bb6852b1f4d02d0bb commit: 6bae5ea9498926440ffc883f3dbceb0adc65e492 [333/524] ASoC: hdac_hda: add asoc extension for legacy HDA codec drivers config: sh-allyesconfig (attached as .config) compiler: sh4-linux-gnu-gcc (Debian 7.2.0-11) 7.2.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 6bae5ea9498926440ffc883f3dbceb0adc65e492 # save the attached .config to linux build tree GCC_VERSION=7.2.0 make.cross ARCH=sh All errors (new ones prefixed by >>): sound/pci/hda/patch_ca0132.c: In function 'patch_ca0132': >> sound/pci/hda/patch_ca0132.c:7650:20: error: implicit declaration of function 'pci_iomap'; did you mean 'pcim_iomap'? [-Werror=implicit-function-declaration] spec->mem_base = pci_iomap(codec->bus->pci, 2, 0xC20); ^~~~~~~~~ pcim_iomap sound/pci/hda/patch_ca0132.c:7650:18: warning: assignment makes pointer from integer without a cast [-Wint-conversion] spec->mem_base = pci_iomap(codec->bus->pci, 2, 0xC20); ^ cc1: some warnings being treated as errors vim +7650 sound/pci/hda/patch_ca0132.c d5c016b56 Gabriele Martino 2015-05-18 7581 95c6e9cb7 Ian Minett 2011-06-15 7582 static int patch_ca0132(struct hda_codec *codec) 95c6e9cb7 Ian Minett 2011-06-15 7583 { 95c6e9cb7 Ian Minett 2011-06-15 7584 struct ca0132_spec *spec; a73d511c4 Ian Minett 2012-12-20 7585 int err; d5c016b56 Gabriele Martino 2015-05-18 7586 const struct snd_pci_quirk *quirk; 95c6e9cb7 Ian Minett 2011-06-15 7587 4e76a8833 Takashi Iwai 2014-02-25 7588 codec_dbg(codec, "patch_ca0132\n"); 95c6e9cb7 Ian Minett 2011-06-15 7589 95c6e9cb7 Ian Minett 2011-06-15 7590 spec = kzalloc(sizeof(*spec), GFP_KERNEL); 95c6e9cb7 Ian Minett 2011-06-15 7591 if (!spec) 95c6e9cb7 Ian Minett 2011-06-15 7592 return -ENOMEM; 95c6e9cb7 Ian Minett 2011-06-15 7593 codec->spec = spec; 993884f6a Chih-Chung Chang 2013-03-25 7594 spec->codec = codec; 95c6e9cb7 Ian Minett 2011-06-15 7595 225068ab2 Takashi Iwai 2015-05-29 7596 codec->patch_ops = ca0132_patch_ops; 225068ab2 Takashi Iwai 2015-05-29 7597 codec->pcm_format_first = 1; 225068ab2 Takashi Iwai 2015-05-29 7598 codec->no_sticky_stream = 1; 225068ab2 Takashi Iwai 2015-05-29 7599 d5c016b56 Gabriele Martino 2015-05-18 7600 /* Detect codec quirk */ d5c016b56 Gabriele Martino 2015-05-18 7601 quirk = snd_pci_quirk_lookup(codec->bus->pci, ca0132_quirks); d5c016b56 Gabriele Martino 2015-05-18 7602 if (quirk) d5c016b56 Gabriele Martino 2015-05-18 7603 spec->quirk = quirk->value; d5c016b56 Gabriele Martino 2015-05-18 7604 else d5c016b56 Gabriele Martino 2015-05-18 7605 spec->quirk = QUIRK_NONE; d5c016b56 Gabriele Martino 2015-05-18 7606 e24aa0a4c Takashi Iwai 2014-08-10 7607 spec->dsp_state = DSP_DOWNLOAD_INIT; a7e76271b Ian Minett 2012-12-20 7608 spec->num_mixers = 1; 017310fbe Connor McAdams 2018-05-08 7609 017310fbe Connor McAdams 2018-05-08 7610 /* Set which mixers each quirk uses. */ 017310fbe Connor McAdams 2018-05-08 7611 switch (spec->quirk) { 017310fbe Connor McAdams 2018-05-08 7612 case QUIRK_SBZ: e25e34450 Connor McAdams 2018-08-08 7613 spec->mixers[0] = desktop_mixer; 017310fbe Connor McAdams 2018-05-08 7614 snd_hda_codec_set_name(codec, "Sound Blaster Z"); 017310fbe Connor McAdams 2018-05-08 7615 break; e25e34450 Connor McAdams 2018-08-08 7616 case QUIRK_R3D: e25e34450 Connor McAdams 2018-08-08 7617 spec->mixers[0] = desktop_mixer; e25e34450 Connor McAdams 2018-08-08 7618 snd_hda_codec_set_name(codec, "Recon3D"); e25e34450 Connor McAdams 2018-08-08 7619 break; 017310fbe Connor McAdams 2018-05-08 7620 case QUIRK_R3DI: 017310fbe Connor McAdams 2018-05-08 7621 spec->mixers[0] = r3di_mixer; 017310fbe Connor McAdams 2018-05-08 7622 snd_hda_codec_set_name(codec, "Recon3Di"); 017310fbe Connor McAdams 2018-05-08 7623 break; 017310fbe Connor McAdams 2018-05-08 7624 default: a7e76271b Ian Minett 2012-12-20 7625 spec->mixers[0] = ca0132_mixer; 017310fbe Connor McAdams 2018-05-08 7626 break; 017310fbe Connor McAdams 2018-05-08 7627 } a7e76271b Ian Minett 2012-12-20 7628 08eca6b1f Connor McAdams 2018-08-08 7629 /* Setup whether or not to use alt functions/controls/pci_mmio */ 009b8f979 Connor McAdams 2018-05-08 7630 switch (spec->quirk) { 009b8f979 Connor McAdams 2018-05-08 7631 case QUIRK_SBZ: e42c7c731 Connor McAdams 2018-08-08 7632 case QUIRK_R3D: 08eca6b1f Connor McAdams 2018-08-08 7633 spec->use_alt_controls = true; 08eca6b1f Connor McAdams 2018-08-08 7634 spec->use_alt_functions = true; 08eca6b1f Connor McAdams 2018-08-08 7635 spec->use_pci_mmio = true; 08eca6b1f Connor McAdams 2018-08-08 7636 break; 009b8f979 Connor McAdams 2018-05-08 7637 case QUIRK_R3DI: 47cdf76e4 Connor McAdams 2018-05-08 7638 spec->use_alt_controls = true; 009b8f979 Connor McAdams 2018-05-08 7639 spec->use_alt_functions = true; 08eca6b1f Connor McAdams 2018-08-08 7640 spec->use_pci_mmio = false; 009b8f979 Connor McAdams 2018-05-08 7641 break; 009b8f979 Connor McAdams 2018-05-08 7642 default: 47cdf76e4 Connor McAdams 2018-05-08 7643 spec->use_alt_controls = false; 009b8f979 Connor McAdams 2018-05-08 7644 spec->use_alt_functions = false; 08eca6b1f Connor McAdams 2018-08-08 7645 spec->use_pci_mmio = false; 009b8f979 Connor McAdams 2018-05-08 7646 break; 009b8f979 Connor McAdams 2018-05-08 7647 } 009b8f979 Connor McAdams 2018-05-08 7648 08eca6b1f Connor McAdams 2018-08-08 7649 if (spec->use_pci_mmio) { 08eca6b1f Connor McAdams 2018-08-08 @7650 spec->mem_base = pci_iomap(codec->bus->pci, 2, 0xC20); 08eca6b1f Connor McAdams 2018-08-08 7651 if (spec->mem_base == NULL) { 08eca6b1f Connor McAdams 2018-08-08 7652 codec_warn(codec, "pci_iomap failed! Setting quirk to QUIRK_NONE."); 08eca6b1f Connor McAdams 2018-08-08 7653 spec->quirk = QUIRK_NONE; 08eca6b1f Connor McAdams 2018-08-08 7654 } 08eca6b1f Connor McAdams 2018-08-08 7655 } 08eca6b1f Connor McAdams 2018-08-08 7656 5aaca44d8 Ian Minett 2012-12-20 7657 spec->base_init_verbs = ca0132_base_init_verbs; 5aaca44d8 Ian Minett 2012-12-20 7658 spec->base_exit_verbs = ca0132_base_exit_verbs; 5aaca44d8 Ian Minett 2012-12-20 7659 993884f6a Chih-Chung Chang 2013-03-25 7660 INIT_DELAYED_WORK(&spec->unsol_hp_work, ca0132_unsol_hp_delayed); 993884f6a Chih-Chung Chang 2013-03-25 7661 95c6e9cb7 Ian Minett 2011-06-15 7662 ca0132_init_chip(codec); 95c6e9cb7 Ian Minett 2011-06-15 7663 95c6e9cb7 Ian Minett 2011-06-15 7664 ca0132_config(codec); 95c6e9cb7 Ian Minett 2011-06-15 7665 d5c016b56 Gabriele Martino 2015-05-18 7666 err = ca0132_prepare_verbs(codec); d5c016b56 Gabriele Martino 2015-05-18 7667 if (err < 0) cc91ceaf3 Takashi Iwai 2017-09-04 7668 goto error; d5c016b56 Gabriele Martino 2015-05-18 7669 a73d511c4 Ian Minett 2012-12-20 7670 err = snd_hda_parse_pin_def_config(codec, &spec->autocfg, NULL); a73d511c4 Ian Minett 2012-12-20 7671 if (err < 0) cc91ceaf3 Takashi Iwai 2017-09-04 7672 goto error; a73d511c4 Ian Minett 2012-12-20 7673 95c6e9cb7 Ian Minett 2011-06-15 7674 return 0; cc91ceaf3 Takashi Iwai 2017-09-04 7675 cc91ceaf3 Takashi Iwai 2017-09-04 7676 error: cc91ceaf3 Takashi Iwai 2017-09-04 7677 ca0132_free(codec); cc91ceaf3 Takashi Iwai 2017-09-04 7678 return err; 95c6e9cb7 Ian Minett 2011-06-15 7679 } 95c6e9cb7 Ian Minett 2011-06-15 7680 :::::: The code at line 7650 was first introduced by commit :::::: 08eca6b1f1468a4021bac7b3929fd3eb491e2629 ALSA: hda/ca0132 - Add bool variable to enable/disable pci region2 mmio :::::: TO: Connor McAdams <conmanx360(a)gmail.com> :::::: CC: Takashi Iwai <tiwai(a)suse.de> --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

1 0