Merge tag 'sound-5.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

3ceff4ea · Linus Torvalds <[email protected]> · 2022-01-14 14:55:38 +01:00

Pull sound updates from Takashi Iwai:
 "It's a relatively calm development cycle, but still lots of updates in
  the driver side like Intel SOF. Below are some highlights:

  ALSA / ASoC core:
   - A new kselftest for ALSA control API
   - PCM NO_REWINDS support
   - Potential race fixes around control removals
   - Unify x86 SG-buffer memory allocation code
   - Cleanups and race fixes for ASoC DPCM locking

  ASoC:
   - Refinements and cleanups around the delay() APIs
   - Wider use of dev_err_probe().
   - Continuing cleanups and improvements to the SOF code
   - Support for pin switches in simple-card derived cards
   - Support for AMD Renoir ACP, Asahi Kasei Microdevices AKM4375, Intel
     systems using NAU8825 and MAX98390, Mediatek MT8915, nVidia Tegra20
     S/PDIF, Qualcomm systems using ALC5682I-VS and Texas Instruments
     TLV320ADC3xxx

  HD-audio / USB-audio:
   - Fix deadlock at HD-audio codec unbinding
   - Fixes for Tegra194 HD-audio, new HDA support for CS35L41 codec
   - Quirks for Lenovo and HP machines, Gigabyte mobo, Bose device

  Misc:
   - Fix virmidi drain behavior

  Note that the merge of CS35L41 codec support is still half-baked, and
  at least one ACPI change is missing. Although this won't hinder the
  kernel build itself, we're going to catch up before RC1"

* tag 'sound-5.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (415 commits)
  ALSA: hda: intel-dsp-config: reorder the config table
  ALSA: hda: intel-dsp-config: add JasperLake support
  ALSA: hda: cs35l41: fix double free on error in probe()
  ALSA: hda: Fix dependencies of CS35L41 on SPI/I2C buses
  ALSA: hda: Fix dependency on ASoC cs35l41 codec
  ASoC: cs35l41: Add support for hibernate memory retention mode
  ASoC: cs35l41: Update handling of test key registers
  ALSA: intel_hdmi: Check for error num after setting mask
  ASoC: wcd9335: Keep a RX port value for each SLIM RX mux
  ASoC: amd: acp: acp-mach: Change default RT1019 amp dev id
  ALSA: virmidi: Remove duplicated code
  ALSA: seq: virmidi: Add a drain operation
  ASoC: topology: Fix typo
  ASoC: fsl_asrc: refine the check of available clock divider
  ASoC: Intel: bytcr_rt5640: Add support for external GPIO jack-detect
  ASoC: Intel: bytcr_rt5640: Support retrieving the codec IRQ from the AMCR0F28 ACPI dev
  ASoC: rt5640: Add support for boards with an external jack-detect GPIO
  ASoC: rt5640: Allow snd_soc_component_set_jack() to override the codec IRQ
  ASoC: rt5640: Change jack_work to a delayed_work
  ASoC: rt5640: Fix possible NULL pointer deref on resume
  ...

Commit: 3ceff4ea07410763d5d4cccd60349bf7691e7e61
Parents: e1a7aa25 · 081c7370

Merge commit. Changes below are compared with the first parent: e1a7aa25.

Changes

414 files changed · +17555 −5674

File	Status	Add	Del	Content
Documentation/devicetree/bindings/sound/ak4375.yaml	added	+57	−0	View file
Documentation/devicetree/bindings/sound/amlogic,aiu.yaml	modified	+5	−0	View file
Documentation/devicetree/bindings/sound/amlogic,g12a-toacodec.yaml	modified	+5	−0	View file
Documentation/devicetree/bindings/sound/amlogic,t9015.yaml	modified	+5	−0	View file
Documentation/devicetree/bindings/sound/audio-graph-port.yaml	modified	+7	−2	View file
Documentation/devicetree/bindings/sound/cirrus,cs42l42.yaml	added	+225	−0	View file
Documentation/devicetree/bindings/sound/cs42l42.txt	deleted	+0	−115	View before deletion
Documentation/devicetree/bindings/sound/linux,spdif-dit.yaml	modified	+5	−0	View file
Documentation/devicetree/bindings/sound/mt8195-afe-pcm.yaml	modified	+8	−0	View file
Documentation/devicetree/bindings/sound/mt8195-mt6359-rt1011-rt5682.yaml	modified	+4	−0	View file
Documentation/devicetree/bindings/sound/mt8195-mt6359-rt1019-rt5682.yaml	modified	+14	−0	View file
Documentation/devicetree/bindings/sound/nvidia,tegra-audio-alc5632.txt	deleted	+0	−48	View before deletion
Documentation/devicetree/bindings/sound/nvidia,tegra-audio-alc5632.yaml	added	+74	−0	View file
Documentation/devicetree/bindings/sound/nvidia,tegra-audio-common.yaml	added	+83	−0	View file
Documentation/devicetree/bindings/sound/nvidia,tegra-audio-graph-card.yaml	modified	+10	−0	View file
Documentation/devicetree/bindings/sound/nvidia,tegra-audio-max98090.txt	deleted	+0	−53	View before deletion
Documentation/devicetree/bindings/sound/nvidia,tegra-audio-max98090.yaml	added	+97	−0	View file
Documentation/devicetree/bindings/sound/nvidia,tegra-audio-rt5640.txt	deleted	+0	−52	View before deletion
Documentation/devicetree/bindings/sound/nvidia,tegra-audio-rt5640.yaml	added	+85	−0	View file
Documentation/devicetree/bindings/sound/nvidia,tegra-audio-rt5677.txt	deleted	+0	−67	View before deletion
Documentation/devicetree/bindings/sound/nvidia,tegra-audio-rt5677.yaml	added	+100	−0	View file
Documentation/devicetree/bindings/sound/nvidia,tegra-audio-sgtl5000.txt	deleted	+0	−42	View before deletion
Documentation/devicetree/bindings/sound/nvidia,tegra-audio-sgtl5000.yaml	added	+67	−0	View file
Documentation/devicetree/bindings/sound/nvidia,tegra-audio-trimslice.txt	deleted	+0	−21	View before deletion
Documentation/devicetree/bindings/sound/nvidia,tegra-audio-trimslice.yaml	added	+33	−0	View file
Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm8753.txt	deleted	+0	−40	View before deletion
Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm8753.yaml	added	+79	−0	View file
Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm8903.txt	deleted	+0	−62	View before deletion
Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm8903.yaml	added	+93	−0	View file
Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm9712.txt	deleted	+0	−60	View before deletion
Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm9712.yaml	added	+76	−0	View file
Documentation/devicetree/bindings/sound/nvidia,tegra20-i2s.txt	deleted	+0	−30	View before deletion
Documentation/devicetree/bindings/sound/nvidia,tegra20-i2s.yaml	added	+77	−0	View file
Documentation/devicetree/bindings/sound/nvidia,tegra20-spdif.yaml	added	+85	−0	View file
Documentation/devicetree/bindings/sound/nvidia,tegra30-hda.yaml	modified	+2	−0	View file
Documentation/devicetree/bindings/sound/nxp,tfa989x.yaml	modified	+41	−0	View file
Documentation/devicetree/bindings/sound/qcom,apq8016-sbc.txt	deleted	+0	−96	View before deletion
Documentation/devicetree/bindings/sound/qcom,sm8250.yaml	modified	+146	−6	View file
Documentation/devicetree/bindings/sound/realtek,rt5682s.yaml	modified	+4	−0	View file
Documentation/devicetree/bindings/sound/simple-audio-amplifier.yaml	modified	+4	−4	View file
Documentation/devicetree/bindings/sound/ti,tlv320adc3xxx.yaml	added	+137	−0	View file
Documentation/devicetree/bindings/sound/wlf,wm8903.yaml	added	+116	−0	View file
Documentation/devicetree/bindings/sound/wm8903.txt	deleted	+0	−82	View before deletion
MAINTAINERS	modified	+11	−0	View file
arch/arm64/boot/dts/nvidia/tegra194.dtsi	modified	+2	−3	View file
drivers/dma/mmp_pdma.c	modified	+0	−6	View file
drivers/dma/pxa_dma.c	modified	+0	−7	View file
drivers/dma/qcom/qcom_adm.c	modified	+49	−7	View file
drivers/dma/sh/shdma-base.c	modified	+0	−8	View file
drivers/dma/sprd-dma.c	modified	+0	−3	View file
drivers/dma/tegra20-apb-dma.c	modified	+0	−6	View file
drivers/dma/xilinx/xilinx_dpdma.c	modified	+11	−6	View file
drivers/firmware/cirrus/cs_dsp.c	modified	+115	−41	View file
drivers/gpu/drm/xlnx/zynqmp_disp.c	modified	+7	−2	View file
drivers/mmc/host/bcm2835.c	modified	+0	−2	View file
drivers/mtd/nand/raw/qcom_nandc.c	modified	+12	−2	View file
drivers/soc/mediatek/mtk-scpsys.c	modified	+11	−4	View file
drivers/soundwire/cadence_master.c	modified	+2	−34	View file
drivers/soundwire/cadence_master.h	modified	+4	−10	View file
drivers/soundwire/intel.c	modified	+124	−129	View file
drivers/soundwire/qcom.c	modified	+4	−4	View file
drivers/soundwire/stream.c	modified	+2	−2	View file
drivers/spi/spi-pic32.c	modified	+0	−2	View file
drivers/tty/serial/msm_serial.c	modified	+13	−2	View file
include/dt-bindings/sound/rt5640.h	modified	+1	−0	View file
include/dt-bindings/sound/tlv320adc3xxx.h	added	+28	−0	View file
include/linux/dma/qcom_adm.h	added	+12	−0	View file
include/linux/dma/xilinx_dpdma.h	added	+11	−0	View file
include/linux/dmaengine.h	modified	+0	−4	View file
include/linux/firmware/cirrus/cs_dsp.h	modified	+16	−5	View file
include/linux/firmware/cirrus/wmfw.h	modified	+1	−0	View file
include/linux/soundwire/sdw_intel.h	modified	+2	−2	View file
include/sound/cs35l41.h	modified	+746	−0	View file
include/sound/dmaengine_pcm.h	modified	+0	−2	View file
include/sound/hda_codec.h	modified	+5	−3	View file
include/sound/hdaudio.h	modified	+1	−0	View file
include/sound/hdaudio_ext.h	modified	+13	−14	View file
include/sound/intel-nhlt.h	modified	+29	−8	View file
include/sound/memalloc.h	modified	+7	−7	View file
include/sound/pcm.h	modified	+3	−0	View file
include/sound/rt5682s.h	modified	+1	−0	View file
include/sound/soc-component.h	modified	+4	−0	View file
include/sound/soc-dai.h	modified	+18	−18	View file
include/sound/soc-dpcm.h	modified	+2	−0	View file
include/sound/soc.h	modified	+1	−2	View file
include/sound/sof.h	modified	+22	−0	View file
include/sound/sof/dai-amd.h	added	+21	−0	View file
include/sound/sof/dai-mediatek.h	added	+23	−0	View file
include/sound/sof/dai.h	modified	+29	−6	View file
include/sound/sof/debug.h	modified	+2	−0	View file
include/sound/sof/header.h	modified	+1	−0	View file
include/uapi/sound/asound.h	modified	+6	−1	View file
include/uapi/sound/sof/tokens.h	modified	+5	−0	View file
sound/core/Makefile	modified	+0	−1	View file
sound/core/control_led.c	modified	+1	−1	View file
sound/core/info_oss.c	modified	+2	−4	View file
sound/core/jack.c	modified	+3	−0	View file
sound/core/memalloc.c	modified	+49	−4	View file
sound/core/oss/pcm_oss.c	modified	+1	−1	View file
sound/core/pcm.c	modified	+5	−1	View file
sound/core/pcm_dmaengine.c	modified	+2	−3	View file
sound/core/pcm_lib.c	modified	+17	−0	View file
sound/core/seq/seq_queue.c	modified	+12	−2	View file
sound/core/seq/seq_virmidi.c	modified	+11	−0	View file
sound/core/sgbuf.c	deleted	+0	−201	View before deletion
sound/drivers/virmidi.c	modified	+0	−3	View file
sound/hda/ext/hdac_ext_stream.c	modified	+100	−116	View file
sound/hda/hdac_stream.c	modified	+20	−10	View file
sound/hda/intel-dsp-config.c	modified	+39	−14	View file
sound/hda/intel-nhlt.c	modified	+102	−0	View file
sound/isa/gus/gus_mem.c	modified	+13	−9	View file
sound/pci/ac97/ac97_pcm.c	modified	+1	−1	View file
sound/pci/hda/Kconfig	modified	+33	−0	View file
sound/pci/hda/Makefile	modified	+10	−0	View file
sound/pci/hda/cs35l41_hda.c	added	+528	−0	View file
sound/pci/hda/cs35l41_hda.h	added	+69	−0	View file
sound/pci/hda/cs35l41_hda_i2c.c	added	+66	−0	View file
sound/pci/hda/cs35l41_hda_spi.c	added	+63	−0	View file
sound/pci/hda/hda_auto_parser.c	modified	+1	−5	View file
sound/pci/hda/hda_bind.c	modified	+7	−0	View file
sound/pci/hda/hda_codec.c	modified	+29	−16	View file
sound/pci/hda/hda_component.h	added	+20	−0	View file
sound/pci/hda/hda_controller.c	modified	+0	−1	View file
sound/pci/hda/hda_generic.h	modified	+1	−1	View file
sound/pci/hda/hda_intel.c	modified	+10	−1	View file
sound/pci/hda/hda_jack.c	modified	+11	−0	View file
sound/pci/hda/hda_jack.h	modified	+1	−0	View file
sound/pci/hda/hda_local.h	modified	+1	−0	View file
sound/pci/hda/hda_tegra.c	modified	+34	−9	View file
sound/pci/hda/patch_cs8409-tables.c	modified	+3	−0	View file
sound/pci/hda/patch_cs8409.c	modified	+6	−3	View file
sound/pci/hda/patch_cs8409.h	modified	+1	−0	View file
sound/pci/hda/patch_hdmi.c	modified	+1	−1	View file
sound/pci/hda/patch_realtek.c	modified	+195	−3	View file
sound/pci/mixart/mixart_core.c	modified	+3	−2	View file
sound/pci/mixart/mixart_core.h	modified	+9	−1	View file
sound/ppc/beep.c	modified	+1	−1	View file
sound/soc/amd/Kconfig	modified	+8	−1	View file
sound/soc/amd/Makefile	modified	+2	−0	View file
sound/soc/amd/acp-config.c	added	+124	−0	View file
sound/soc/amd/acp-da7219-max98357a.c	modified	+10	−10	View file
sound/soc/amd/acp-pcm-dma.c	modified	+14	−1	View file
sound/soc/amd/acp-rt5645.c	modified	+2	−2	View file
sound/soc/amd/acp.h	modified	+1	−0	View file
sound/soc/amd/acp/Kconfig	modified	+3	−5	View file
sound/soc/amd/acp/acp-legacy-mach.c	modified	+16	−3	View file
sound/soc/amd/acp/acp-mach-common.c	modified	+29	−4	View file
sound/soc/amd/acp/acp-mach.h	modified	+9	−1	View file
sound/soc/amd/acp/acp-sof-mach.c	modified	+18	−3	View file
sound/soc/amd/acp3x-rt5682-max9836.c	modified	+4	−4	View file
sound/soc/amd/mach-config.h	added	+28	−0	View file
sound/soc/amd/yc/acp6x-pdm-dma.c	modified	+1	−1	View file
sound/soc/atmel/mikroe-proto.c	modified	+3	−3	View file
sound/soc/atmel/tse850-pcm5142.c	modified	+12	−20	View file
sound/soc/bcm/bcm63xx-i2s.h	modified	+0	−1	View file
sound/soc/bcm/bcm63xx-pcm-whistler.c	modified	+6	−7	View file
sound/soc/codecs/Kconfig	modified	+34	−2	View file
sound/soc/codecs/Makefile	modified	+10	−2	View file
sound/soc/codecs/adau1701.c	modified	+31	−63	View file
sound/soc/codecs/ak4118.c	modified	+6	−12	View file
sound/soc/codecs/ak4375.c	added	+610	−0	View file
sound/soc/codecs/cs35l35.c	modified	+1	−1	View file
sound/soc/codecs/cs35l41-i2c.c	modified	+3	−16	View file
sound/soc/codecs/cs35l41-tables.c → sound/soc/codecs/cs35l41-lib.c	renamed	+512	−66	View file
sound/soc/codecs/cs35l41-spi.c	modified	+3	−17	View file
sound/soc/codecs/cs35l41.c	modified	+526	−367	View file
sound/soc/codecs/cs35l41.h	modified	+18	−731	View file
sound/soc/codecs/cs4265.c	modified	+13	−2	View file
sound/soc/codecs/cs42l42.c	modified	+58	−36	View file
sound/soc/codecs/cs42l42.h	modified	+5	−1	View file
sound/soc/codecs/es7241.c	modified	+9	−19	View file
sound/soc/codecs/hdac_hda.c	modified	+11	−11	View file
sound/soc/codecs/jz4770.c	modified	+9	−0	View file
sound/soc/codecs/max9759.c	modified	+9	−19	View file
sound/soc/codecs/max98373-sdw.c	modified	+1	−1	View file
sound/soc/codecs/max9860.c	modified	+4	−8	View file
sound/soc/codecs/msm8916-wcd-analog.c	modified	+4	−3	View file
sound/soc/codecs/mt6660.c	modified	+2	−3	View file
sound/soc/codecs/pcm3168a.c	modified	+7	−15	View file
sound/soc/codecs/rt1308-sdw.c	modified	+1	−1	View file
sound/soc/codecs/rt1316-sdw.c	modified	+1	−1	View file
sound/soc/codecs/rt5640.c	modified	+152	−17	View file
sound/soc/codecs/rt5640.h	modified	+10	−1	View file
sound/soc/codecs/rt5663.c	modified	+9	−3	View file
sound/soc/codecs/rt5682-sdw.c	modified	+1	−1	View file
sound/soc/codecs/rt5682.c	modified	+2	−5	View file
sound/soc/codecs/rt5682s.c	modified	+31	−3	View file
sound/soc/codecs/rt700.c	modified	+1	−1	View file
sound/soc/codecs/rt711-sdca.c	modified	+1	−1	View file
sound/soc/codecs/rt711.c	modified	+1	−1	View file
sound/soc/codecs/rt715-sdca.c	modified	+1	−1	View file
sound/soc/codecs/rt715.c	modified	+1	−1	View file
sound/soc/codecs/sdw-mockup.c	modified	+1	−1	View file
sound/soc/codecs/sgtl5000.c	modified	+2	−3	View file
sound/soc/codecs/simple-amplifier.c	modified	+3	−7	View file
sound/soc/codecs/simple-mux.c	modified	+3	−7	View file
sound/soc/codecs/ssm2305.c	modified	+3	−8	View file
sound/soc/codecs/sta350.h	modified	+1	−1	View file
sound/soc/codecs/tfa989x.c	modified	+19	−1	View file
sound/soc/codecs/tlv320adc3xxx.c	added	+1317	−0	View file
sound/soc/codecs/tlv320aic26.h	modified	+3	−3	View file
sound/soc/codecs/tlv320aic31xx.c	modified	+75	−46	View file
sound/soc/codecs/tlv320aic31xx.h	modified	+1	−1	View file
sound/soc/codecs/wcd-mbhc-v2.c	modified	+67	−9	View file
sound/soc/codecs/wcd9335.c	modified	+9	−8	View file
sound/soc/codecs/wcd934x.c	modified	+2	−4	View file
sound/soc/codecs/wcd938x.c	modified	+3	−5	View file
sound/soc/codecs/wm_adsp.c	modified	+27	−34	View file
sound/soc/codecs/wm_adsp.h	modified	+8	−0	View file
sound/soc/codecs/wsa881x.c	modified	+1	−1	View file
sound/soc/codecs/zl38060.c	modified	+1	−3	View file
sound/soc/fsl/Kconfig	modified	+1	−0	View file
sound/soc/fsl/fsl-asoc-card.c	modified	+13	−2	View file
sound/soc/fsl/fsl_asrc.c	modified	+58	−11	View file
sound/soc/fsl/fsl_mqs.c	modified	+1	−1	View file
sound/soc/fsl/imx-card.c	modified	+30	−19	View file
sound/soc/fsl/imx-hdmi.c	modified	+2	−0	View file
sound/soc/fsl/imx-sgtl5000.c	modified	+1	−3	View file
sound/soc/fsl/imx-spdif.c	modified	+2	−2	View file
sound/soc/generic/audio-graph-card.c	modified	+1	−4	View file
sound/soc/generic/audio-graph-card2.c	modified	+2	−2	View file
sound/soc/generic/simple-card-utils.c	modified	+1	−44	View file
sound/soc/generic/simple-card.c	modified	+1	−2	View file
sound/soc/generic/test-component.c	modified	+2	−3	View file
sound/soc/img/img-i2s-in.c	modified	+3	−5	View file
sound/soc/img/img-i2s-out.c	modified	+9	−15	View file
sound/soc/img/img-parallel-out.c	modified	+9	−15	View file
sound/soc/img/img-spdif-in.c	modified	+3	−5	View file
sound/soc/img/img-spdif-out.c	modified	+9	−15	View file
sound/soc/img/pistachio-internal-dac.c	modified	+3	−6	View file
sound/soc/intel/atom/sst-mfld-platform-pcm.c	modified	+13	−1	View file
sound/soc/intel/boards/Kconfig	modified	+20	−0	View file
sound/soc/intel/boards/Makefile	modified	+2	−0	View file
sound/soc/intel/boards/bytcht_cx2072x.c	modified	+1	−1	View file
sound/soc/intel/boards/bytcht_nocodec.c	modified	+1	−1	View file
sound/soc/intel/boards/bytcr_rt5640.c	modified	+80	−6	View file
sound/soc/intel/boards/hda_dsp_common.c	modified	+1	−1	View file
sound/soc/intel/boards/sof_maxim_common.c	modified	+180	−0	View file
sound/soc/intel/boards/sof_maxim_common.h	modified	+16	−0	View file
sound/soc/intel/boards/sof_nau8825.c	added	+651	−0	View file
sound/soc/intel/boards/sof_realtek_common.c	modified	+116	−3	View file
sound/soc/intel/boards/sof_realtek_common.h	modified	+7	−0	View file
sound/soc/intel/boards/sof_rt5682.c	modified	+76	−103	View file
sound/soc/intel/boards/sof_sdw.c	modified	+82	−76	View file
sound/soc/intel/boards/sof_sdw_common.h	modified	+6	−1	View file
sound/soc/intel/boards/sof_sdw_rt715.c	modified	+0	−7	View file
sound/soc/intel/boards/sof_sdw_rt715_sdca.c	modified	+0	−7	View file
sound/soc/intel/catpt/dsp.c	modified	+12	−2	View file
sound/soc/intel/catpt/pcm.c	modified	+18	−19	View file
sound/soc/intel/common/soc-acpi-intel-adl-match.c	modified	+48	−0	View file
sound/soc/intel/skylake/skl-nhlt.c	modified	+0	−102	View file
sound/soc/intel/skylake/skl-pcm.c	modified	+5	−6	View file
sound/soc/intel/skylake/skl-topology.c	modified	+17	−12	View file
sound/soc/intel/skylake/skl-topology.h	modified	+1	−0	View file
sound/soc/intel/skylake/skl.c	modified	+2	−2	View file
sound/soc/intel/skylake/skl.h	modified	+0	−4	View file
sound/soc/mediatek/Kconfig	modified	+2	−0	View file
sound/soc/mediatek/mt2701/mt2701-afe-pcm.c	modified	+0	−2	View file
sound/soc/mediatek/mt6797/mt6797-afe-pcm.c	modified	+0	−2	View file
sound/soc/mediatek/mt8173/mt8173-max98090.c	modified	+3	−5	View file
sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c	modified	+2	−5	View file
sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c	modified	+2	−5	View file
sound/soc/mediatek/mt8173/mt8173-rt5650.c	modified	+2	−5	View file
sound/soc/mediatek/mt8183/mt8183-afe-pcm.c	modified	+0	−2	View file
sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c	modified	+11	−10	View file
sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c	modified	+14	−12	View file
sound/soc/mediatek/mt8192/mt8192-afe-pcm.c	modified	+0	−2	View file
sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c	modified	+9	−8	View file
sound/soc/mediatek/mt8195/mt8195-afe-clk.c	modified	+6	−6	View file
sound/soc/mediatek/mt8195/mt8195-afe-pcm.c	modified	+8	−1	View file
sound/soc/mediatek/mt8195/mt8195-dai-pcm.c	modified	+21	−52	View file
sound/soc/mediatek/mt8195/mt8195-mt6359-rt1011-rt5682.c	modified	+95	−52	View file
sound/soc/mediatek/mt8195/mt8195-mt6359-rt1019-rt5682.c	modified	+400	−70	View file
sound/soc/mediatek/mt8195/mt8195-reg.h	modified	+1	−0	View file
sound/soc/meson/aiu.c	modified	+11	−25	View file
sound/soc/meson/axg-fifo.c	modified	+4	−12	View file
sound/soc/meson/axg-pdm.c	modified	+6	−19	View file
sound/soc/meson/axg-spdifin.c	modified	+4	−13	View file
sound/soc/meson/axg-spdifout.c	modified	+4	−13	View file
sound/soc/meson/axg-tdm-formatter.c	modified	+13	−37	View file
sound/soc/meson/axg-tdm-interface.c	modified	+7	−18	View file
sound/soc/meson/meson-card-utils.c	modified	+3	−5	View file
sound/soc/meson/t9015.c	modified	+4	−10	View file
sound/soc/mxs/mxs-sgtl5000.c	modified	+2	−6	View file
sound/soc/qcom/Kconfig	modified	+1	−0	View file
sound/soc/qcom/apq8016_sbc.c	modified	+129	−5	View file
sound/soc/qcom/common.c	modified	+14	−6	View file
sound/soc/qcom/qdsp6/q6apm.c	modified	+8	−6	View file
sound/soc/qcom/sc7180.c	modified	+19	−5	View file
sound/soc/qcom/sdm845.c	modified	+11	−3	View file
sound/soc/qcom/sm8250.c	modified	+2	−2	View file
sound/soc/rockchip/rk3288_hdmi_analog.c	modified	+3	−7	View file
sound/soc/samsung/aries_wm8994.c	modified	+7	−10	View file
sound/soc/samsung/arndale.c	modified	+2	−3	View file
sound/soc/samsung/idma.c	modified	+2	−0	View file
sound/soc/samsung/littlemill.c	modified	+2	−3	View file
sound/soc/samsung/lowland.c	modified	+2	−3	View file
sound/soc/samsung/odroid.c	modified	+1	−3	View file
sound/soc/samsung/smdk_wm8994.c	modified	+2	−2	View file
sound/soc/samsung/smdk_wm8994pcm.c	modified	+2	−2	View file
sound/soc/samsung/snow.c	modified	+3	−6	View file
sound/soc/samsung/speyside.c	modified	+2	−3	View file
sound/soc/samsung/tm2_wm5110.c	modified	+1	−2	View file
sound/soc/samsung/tobermory.c	modified	+2	−3	View file
sound/soc/sh/rz-ssi.c	modified	+6	−1	View file
sound/soc/soc-component.c	modified	+28	−0	View file
sound/soc/soc-core.c	modified	+50	−1	View file
sound/soc/soc-dai.c	modified	+28	−12	View file
sound/soc/soc-pcm.c	modified	+249	−131	View file
sound/soc/soc-topology.c	modified	+1	−1	View file
sound/soc/sof/Kconfig	modified	+15	−3	View file
sound/soc/sof/Makefile	modified	+3	−1	View file
sound/soc/sof/amd/Kconfig	added	+33	−0	View file
sound/soc/sof/amd/Makefile	added	+11	−0	View file
sound/soc/sof/amd/acp-dsp-offset.h	added	+78	−0	View file
sound/soc/sof/amd/acp-ipc.c	added	+187	−0	View file
sound/soc/sof/amd/acp-loader.c	added	+199	−0	View file
sound/soc/sof/amd/acp-pcm.c	added	+82	−0	View file
sound/soc/sof/amd/acp-stream.c	added	+181	−0	View file
sound/soc/sof/amd/acp-trace.c	added	+84	−0	View file
sound/soc/sof/amd/acp.c	added	+446	−0	View file
sound/soc/sof/amd/acp.h	added	+226	−0	View file
sound/soc/sof/amd/pci-rn.c	added	+165	−0	View file
sound/soc/sof/amd/renoir.c	added	+186	−0	View file
sound/soc/sof/control.c	modified	+17	−44	View file
sound/soc/sof/core.c	modified	+82	−53	View file
sound/soc/sof/debug.c	modified	+130	−12	View file
sound/soc/sof/imx/Kconfig	modified	+13	−33	View file
sound/soc/sof/imx/imx-common.c	modified	+26	−2	View file
sound/soc/sof/imx/imx-common.h	modified	+11	−0	View file
sound/soc/sof/imx/imx-ops.h	deleted	+0	−10	View before deletion
sound/soc/sof/imx/imx8.c	modified	+178	−42	View file
sound/soc/sof/imx/imx8m.c	modified	+220	−40	View file
sound/soc/sof/intel/apl.c	modified	+4	−3	View file
sound/soc/sof/intel/atom.c	modified	+12	−52	View file
sound/soc/sof/intel/atom.h	modified	+2	−2	View file
sound/soc/sof/intel/bdw.c	modified	+20	−51	View file
sound/soc/sof/intel/byt.c	modified	+9	−0	View file
sound/soc/sof/intel/cnl.c	modified	+28	−6	View file
sound/soc/sof/intel/hda-codec.c	modified	+2	−1	View file
sound/soc/sof/intel/hda-ctrl.c	modified	+1	−1	View file
sound/soc/sof/intel/hda-dai.c	modified	+47	−50	View file
sound/soc/sof/intel/hda-dsp.c	modified	+50	−2	View file
sound/soc/sof/intel/hda-ipc.c	modified	+19	−29	View file
sound/soc/sof/intel/hda-loader.c	modified	+28	−76	View file
sound/soc/sof/intel/hda-pcm.c	modified	+100	−27	View file
sound/soc/sof/intel/hda-stream.c	modified	+67	−42	View file
sound/soc/sof/intel/hda.c	modified	+66	−73	View file
sound/soc/sof/intel/hda.h	modified	+15	−7	View file
sound/soc/sof/intel/icl.c	modified	+68	−5	View file
sound/soc/sof/intel/pci-tng.c	modified	+9	−0	View file
sound/soc/sof/intel/shim.h	modified	+11	−0	View file
sound/soc/sof/intel/tgl.c	modified	+44	−3	View file
sound/soc/sof/ipc.c	modified	+105	−29	View file
sound/soc/sof/loader.c	modified	+8	−8	View file
sound/soc/sof/mediatek/Kconfig	added	+33	−0	View file
sound/soc/sof/mediatek/Makefile	added	+2	−0	View file
sound/soc/sof/mediatek/adsp_helper.h	added	+49	−0	View file
sound/soc/sof/mediatek/mt8195/Makefile	added	+3	−0	View file
sound/soc/sof/mediatek/mt8195/mt8195-clk.c	added	+158	−0	View file
sound/soc/sof/mediatek/mt8195/mt8195-clk.h	added	+28	−0	View file
sound/soc/sof/mediatek/mt8195/mt8195-loader.c	added	+56	−0	View file
sound/soc/sof/mediatek/mt8195/mt8195.c	added	+463	−0	View file
sound/soc/sof/mediatek/mt8195/mt8195.h	added	+158	−0	View file
sound/soc/sof/ops.c	modified	+34	−13	View file
sound/soc/sof/ops.h	modified	+69	−24	View file
sound/soc/sof/pcm.c	modified	+77	−41	View file
sound/soc/sof/pm.c	modified	+10	−0	View file
sound/soc/sof/sof-audio.c	modified	+195	−44	View file
sound/soc/sof/sof-audio.h	modified	+5	−12	View file
sound/soc/sof/sof-of-dev.c	modified	+8	−60	View file
sound/soc/sof/sof-of-dev.h	added	+17	−0	View file
sound/soc/sof/sof-pci-dev.c	modified	+10	−9	View file
sound/soc/sof/sof-priv.h	modified	+51	−31	View file
sound/soc/sof/sof-probes.c	modified	+1	−1	View file
sound/soc/sof/sof-probes.h	modified	+1	−1	View file
sound/soc/sof/topology.c	modified	+180	−112	View file
sound/soc/sof/trace.c	modified	+18	−0	View file
sound/soc/sof/xtensa/core.c	modified	+25	−19	View file
sound/soc/stm/stm32_adfsdm.c	modified	+4	−1	View file
sound/soc/stm/stm32_i2s.c	modified	+25	−41	View file
sound/soc/stm/stm32_sai.c	modified	+13	−24	View file
sound/soc/stm/stm32_sai_sub.c	modified	+10	−19	View file
sound/soc/stm/stm32_spdifrx.c	modified	+19	−29	View file
sound/soc/sunxi/sun4i-codec.c	modified	+1	−2	View file
sound/soc/sunxi/sun4i-spdif.c	modified	+115	−0	View file
sound/soc/sunxi/sun8i-codec.c	modified	+56	−0	View file
sound/soc/tegra/tegra20_i2s.c	modified	+49	−0	View file
sound/soc/tegra/tegra20_spdif.c	modified	+139	−58	View file
sound/soc/tegra/tegra20_spdif.h	modified	+1	−0	View file
sound/soc/tegra/tegra210_mvc.c	modified	+164	−45	View file
sound/soc/tegra/tegra210_mvc.h	modified	+5	−0	View file
sound/soc/tegra/tegra_pcm.c	modified	+6	−0	View file
sound/soc/tegra/tegra_pcm.h	modified	+1	−0	View file
sound/soc/ti/davinci-mcasp.c	modified	+6	−15	View file
sound/soc/ti/j721e-evm.c	modified	+3	−7	View file
sound/soc/uniphier/Kconfig	modified	+0	−2	View file
sound/soc/xilinx/xlnx_spdif.c	modified	+3	−7	View file
sound/sparc/dbri.c	modified	+3	−3	View file
sound/usb/card.c	modified	+0	−7	View file
sound/usb/format.c	modified	+1	−1	View file
sound/usb/mixer.c	modified	+1	−4	View file
sound/usb/mixer.h	modified	+0	−2	View file
sound/usb/mixer_maps.c	modified	+15	−2	View file
sound/usb/mixer_quirks.c	modified	+1	−3	View file
sound/usb/mixer_quirks.h	modified	+0	−2	View file
sound/usb/power.h	modified	+0	−10	View file
sound/usb/quirks.c	modified	+1	−1	View file
sound/usb/usx2y/usbusx2y.c	modified	+1	−1	View file
sound/x86/intel_hdmi_audio.c	modified	+3	−1	View file
tools/testing/selftests/Makefile	modified	+2	−1	View file
tools/testing/selftests/alsa/.gitignore	added	+1	−0	View file
tools/testing/selftests/alsa/Makefile	added	+9	−0	View file
tools/testing/selftests/alsa/mixer-test.c	added	+705	−0	View file

Only the first 600 diff lines are shown. Download the complete patch.

Documentation/devicetree/bindings/sound/ak4375.yaml

View file

diff --git a/Documentation/devicetree/bindings/sound/ak4375.yaml b/Documentation/devicetree/bindings/sound/ak4375.yaml
new file mode 100644
index 0000000..f1d5074
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/ak4375.yaml
@@ -0,0 +1,57 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/sound/ak4375.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: AK4375 DAC and headphones amplifier Device Tree Bindings
+
+maintainers:
+  - Vincent Knecht <[email protected]>
+
+properties:
+  compatible:
+    const: asahi-kasei,ak4375
+
+  reg:
+    maxItems: 1
+
+  '#sound-dai-cells':
+    const: 0
+
+  avdd-supply:
+    description: regulator phandle for the AVDD power supply.
+
+  tvdd-supply:
+    description: regulator phandle for the TVDD power supply.
+
+  pdn-gpios:
+    description: optional GPIO to set the PDN pin.
+
+required:
+  - compatible
+  - reg
+  - '#sound-dai-cells'
+  - avdd-supply
+  - tvdd-supply
+
+additionalProperties: false
+
+examples:
+  - |
+    #include <dt-bindings/gpio/gpio.h>
+    i2c {
+      #address-cells = <1>;
+      #size-cells = <0>;
+
+      headphones: audio-codec@10 {
+        compatible = "asahi-kasei,ak4375";
+        reg = <0x10>;
+        avdd-supply = <&reg_headphones_avdd>;
+        tvdd-supply = <&pm8916_l6>;
+        pdn-gpios = <&msmgpio 114 GPIO_ACTIVE_HIGH>;
+        pinctrl-names = "default";
+        pinctrl-0 = <&headphones_pdn_default>;
+        #sound-dai-cells = <0>;
+      };
+    };

Documentation/devicetree/bindings/sound/amlogic,aiu.yaml

View file

diff --git a/Documentation/devicetree/bindings/sound/amlogic,aiu.yaml b/Documentation/devicetree/bindings/sound/amlogic,aiu.yaml
index f50558e..0705f91 100644
--- a/Documentation/devicetree/bindings/sound/amlogic,aiu.yaml
+++ b/Documentation/devicetree/bindings/sound/amlogic,aiu.yaml
@@ -9,6 +9,9 @@ title: Amlogic AIU audio output controller
 maintainers:
   - Jerome Brunet <[email protected]>
 
+allOf:
+  - $ref: name-prefix.yaml#
+
 properties:
   $nodename:
     pattern: "^audio-controller@.*"
@@ -65,6 +68,8 @@ properties:
   resets:
     maxItems: 1
 
+  sound-name-prefix: true
+
 required:
   - "#sound-dai-cells"
   - compatible

Documentation/devicetree/bindings/sound/amlogic,g12a-toacodec.yaml

View file

diff --git a/Documentation/devicetree/bindings/sound/amlogic,g12a-toacodec.yaml b/Documentation/devicetree/bindings/sound/amlogic,g12a-toacodec.yaml
index 3c3891d..77469a4 100644
--- a/Documentation/devicetree/bindings/sound/amlogic,g12a-toacodec.yaml
+++ b/Documentation/devicetree/bindings/sound/amlogic,g12a-toacodec.yaml
@@ -9,6 +9,9 @@ title: Amlogic G12a Internal DAC Control Glue
 maintainers:
   - Jerome Brunet <[email protected]>
 
+allOf:
+  - $ref: name-prefix.yaml#
+
 properties:
   $nodename:
     pattern: "^audio-controller@.*"
@@ -31,6 +34,8 @@ properties:
   resets:
     maxItems: 1
 
+  sound-name-prefix: true
+
 required:
   - "#sound-dai-cells"
   - compatible

Documentation/devicetree/bindings/sound/amlogic,t9015.yaml

View file

diff --git a/Documentation/devicetree/bindings/sound/amlogic,t9015.yaml b/Documentation/devicetree/bindings/sound/amlogic,t9015.yaml
index db7b04d..580a3d0 100644
--- a/Documentation/devicetree/bindings/sound/amlogic,t9015.yaml
+++ b/Documentation/devicetree/bindings/sound/amlogic,t9015.yaml
@@ -9,6 +9,9 @@ title: Amlogic T9015 Internal Audio DAC
 maintainers:
   - Jerome Brunet <[email protected]>
 
+allOf:
+  - $ref: name-prefix.yaml#
+
 properties:
   $nodename:
     pattern: "^audio-controller@.*"
@@ -38,6 +41,8 @@ properties:
     description:
       Analogue power supply.
 
+  sound-name-prefix: true
+
 required:
   - "#sound-dai-cells"
   - compatible

Documentation/devicetree/bindings/sound/audio-graph-port.yaml

View file

diff --git a/Documentation/devicetree/bindings/sound/audio-graph-port.yaml b/Documentation/devicetree/bindings/sound/audio-graph-port.yaml
index 43e7f86..476dcb4 100644
--- a/Documentation/devicetree/bindings/sound/audio-graph-port.yaml
+++ b/Documentation/devicetree/bindings/sound/audio-graph-port.yaml
@@ -42,10 +42,15 @@ patternProperties:
         $ref: /schemas/types.yaml#/definitions/flag
       frame-master:
         description: Indicates dai-link frame master.
-        $ref: /schemas/types.yaml#/definitions/phandle
+        oneOf:
+          - $ref: /schemas/types.yaml#/definitions/flag
+          - $ref: /schemas/types.yaml#/definitions/phandle
       bitclock-master:
         description: Indicates dai-link bit clock master
-        $ref: /schemas/types.yaml#/definitions/phandle
+        oneOf:
+          - $ref: /schemas/types.yaml#/definitions/flag
+          - $ref: /schemas/types.yaml#/definitions/phandle
+
       dai-format:
         description: audio format.
         items:

Documentation/devicetree/bindings/sound/cirrus,cs42l42.yaml

View file

diff --git a/Documentation/devicetree/bindings/sound/cirrus,cs42l42.yaml b/Documentation/devicetree/bindings/sound/cirrus,cs42l42.yaml
new file mode 100644
index 0000000..31800f7
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/cirrus,cs42l42.yaml
@@ -0,0 +1,225 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/sound/cirrus,cs42l42.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Cirrus Logic CS42L42 audio CODEC
+
+maintainers:
+  - [email protected]
+
+description:
+  The CS42L42 is a low-power audio codec designed for portable applications.
+  It provides a high-dynamic range, stereo DAC for audio playback and a mono
+  high-dynamic-range ADC for audio capture. There is an integrated headset
+  detection block.
+
+properties:
+  compatible:
+    enum:
+      - cirrus,cs42l42
+
+  reg:
+    description:
+      The I2C address of the CS42L42.
+    maxItems: 1
+
+  VP-supply:
+    description:
+      VP power supply.
+
+  VCP-supply:
+    description:
+      Charge pump power supply.
+
+  VD_FILT-supply:
+    description:
+      FILT+ power supply.
+
+  VL-supply:
+    description:
+      Logic power supply.
+
+  VA-supply:
+    description:
+      Analog power supply.
+
+  reset-gpios:
+    description:
+      This pin will be asserted and then deasserted to reset the
+      CS42L42 before communication starts.
+    maxItems: 1
+
+  interrupts:
+    description:
+      Interrupt for CS42L42 IRQ line.
+    maxItems: 1
+
+  cirrus,ts-inv:
+    description: |
+      Sets the behaviour of the jack plug detect switch.
+
+      0 - (Default) Shorted to tip when unplugged, open when plugged.
+      This is "inverted tip sense (ITS)" in the datasheet.
+
+      1 - Open when unplugged, shorted to tip when plugged.
+      This is "normal tip sense (TS)" in the datasheet.
+
+      The CS42L42_TS_INV_* defines are available for this.
+    $ref: "/schemas/types.yaml#/definitions/uint32"
+    minimum: 0
+    maximum: 1
+
+  cirrus,ts-dbnc-rise:
+    description: |
+      Debounce the rising edge of TIP_SENSE_PLUG. With no
+      debounce, the tip sense pin might be noisy on a plug event.
+
+      0 - 0ms
+      1 - 125ms
+      2 - 250ms
+      3 - 500ms
+      4 - 750ms
+      5 - 1s (Default)
+      6 - 1.25s
+      7 - 1.5s
+
+      The CS42L42_TS_DBNCE_* defines are available for this.
+    $ref: "/schemas/types.yaml#/definitions/uint32"
+    minimum: 0
+    maximum: 7
+
+  cirrus,ts-dbnc-fall:
+    description: |
+      Debounce the falling edge of TIP_SENSE_UNPLUG. With no
+      debounce, the tip sense pin might be noisy on an unplug event.
+
+      0 - 0ms
+      1 - 125ms
+      2 - 250ms
+      3 - 500ms
+      4 - 750ms
+      5 - 1s (Default)
+      6 - 1.25s
+      7 - 1.5s
+
+      The CS42L42_TS_DBNCE_* defines are available for this.
+    $ref: "/schemas/types.yaml#/definitions/uint32"
+    minimum: 0
+    maximum: 7
+
+  cirrus,btn-det-init-dbnce:
+    description: |
+      This sets how long to wait after enabling button detection
+      interrupts before servicing button interrupts, to allow the
+      HS bias time to settle. Value is in milliseconds.
+      There may be erroneous button interrupts if this debounce time
+      is too short.
+
+      0ms - 200ms,
+      Default = 100ms
+    $ref: "/schemas/types.yaml#/definitions/uint32"
+    minimum: 0
+    maximum: 200
+
+  cirrus,btn-det-event-dbnce:
+    description: |
+      This sets how long to wait after receiving a button press
+      interrupt before processing it. Allows time for the button
+      press to make a clean connection with the bias resistors.
+      Value is in milliseconds.
+
+      0ms - 20ms,
+      Default = 10ms
+    $ref: "/schemas/types.yaml#/definitions/uint32"
+    minimum: 0
+    maximum: 20
+
+  cirrus,bias-lvls:
+    description: |
+      For a level-detect headset button scheme, each button will bias
+      the mic pin to a certain voltage. To determine which button was
+      pressed, the voltage is compared to sequential, decreasing
+      voltages, until the compared voltage < bias voltage.
+      For different hardware setups, a designer might want to tweak this.
+      This is an array of descending values for the comparator voltage,
+      given as percent of the HSBIAS voltage.
+
+      Array of 4 values, each 0-63
+      < x1 x2 x3 x4 >
+      Default = < 15 8 4 1 >
+    $ref: /schemas/types.yaml#/definitions/uint32-array
+    minItems: 4
+    maxItems: 4
+    items:
+      minimum: 0
+      maximum: 63
+
+  cirrus,hs-bias-ramp-rate:
+    description: |
+      If present this sets the rate that the HS bias should rise and fall.
+      The actual rise and fall times depend on external hardware (the
+      datasheet gives several rise and fall time examples).
+
+      0 - Fast rise time; slow, load-dependent fall time
+      1 - Fast
+      2 - Slow (default)
+      3 - Slowest
+
+      The CS42L42_HSBIAS_RAMP_* defines are available for this.
+    $ref: "/schemas/types.yaml#/definitions/uint32"
+    minimum: 0
+    maximum: 3
+
+  cirrus,hs-bias-sense-disable:
+    description: |
+      If present the HSBIAS sense is disabled. Configures HSBIAS output
+      current sense through the external 2.21-k resistor. HSBIAS_SENSE
+      is a hardware feature to reduce the potential pop noise when the
+      headset plug is removed slowly. But on some platforms ESD voltage
+      will affect it causing plug detection to fail, especially with CTIA
+      headset type. For different hardware setups, a designer might want
+      to tweak default behavior.
+    type: boolean
+
+required:
+  - compatible
+  - reg
+  - VP-supply
+  - VCP-supply
+  - VD_FILT-supply
+  - VL-supply
+  - VA-supply
+
+additionalProperties: false
+
+examples:
+  - |
+    #include <dt-bindings/sound/cs42l42.h>
+    i2c {
+      #address-cells = <1>;
+      #size-cells = <0>;
+
+      cs42l42: cs42l42@48 {
+          compatible = "cirrus,cs42l42";
+          reg = <0x48>;
+          VA-supply = <&dummy_vreg>;
+          VP-supply = <&dummy_vreg>;
+          VCP-supply = <&dummy_vreg>;
+          VD_FILT-supply = <&dummy_vreg>;
+          VL-supply = <&dummy_vreg>;
+
+          reset-gpios = <&axi_gpio_0 1 0>;
+          interrupt-parent = <&gpio0>;
+          interrupts = <55 8>;
+
+          cirrus,ts-inv = <CS42L42_TS_INV_DIS>;
+          cirrus,ts-dbnc-rise = <CS42L42_TS_DBNCE_1000>;
+          cirrus,ts-dbnc-fall = <CS42L42_TS_DBNCE_0>;
+          cirrus,btn-det-init-dbnce = <100>;
+          cirrus,btn-det-event-dbnce = <10>;
+          cirrus,bias-lvls = <0x0F 0x08 0x04 0x01>;
+          cirrus,hs-bias-ramp-rate = <CS42L42_HSBIAS_RAMP_SLOW>;
+      };
+    };

Documentation/devicetree/bindings/sound/cs42l42.txt

View before deletion

diff --git a/Documentation/devicetree/bindings/sound/cs42l42.txt b/Documentation/devicetree/bindings/sound/cs42l42.txt
deleted file mode 100644
index 3b77056..0000000
--- a/Documentation/devicetree/bindings/sound/cs42l42.txt
+++ /dev/null
@@ -1,115 +0,0 @@
-CS42L42 audio CODEC
-
-Required properties:
-
-  - compatible : "cirrus,cs42l42"
-
-  - reg : the I2C address of the device for I2C.
-
-  - VP-supply, VCP-supply, VD_FILT-supply, VL-supply, VA-supply :
-  power supplies for the device, as covered in
-  Documentation/devicetree/bindings/regulator/regulator.txt.
-
-Optional properties:
-
-  - reset-gpios : a GPIO spec for the reset pin. If specified, it will be
-  deasserted before communication to the codec starts.
-
-  - interrupts : IRQ line info CS42L42.
-  (See Documentation/devicetree/bindings/interrupt-controller/interrupts.txt
-  for further information relating to interrupt properties)
-
-  - cirrus,ts-inv : Boolean property. Sets the behaviour of the jack plug
-  detect switch.
-
-  0 = (Default) Shorted to tip when unplugged, open when plugged.
-      This is "inverted tip sense (ITS)" in the datasheet.
-
-  1 = Open when unplugged, shorted to tip when plugged.
-      This is "normal tip sense (TS)" in the datasheet.
-
-  - cirrus,ts-dbnc-rise : Debounce the rising edge of TIP_SENSE_PLUG. With no
-  debounce, the tip sense pin might be noisy on a plug event.
-
-  0 - 0ms,
-  1 - 125ms,
-  2 - 250ms,
-  3 - 500ms,
-  4 - 750ms,
-  5 - (Default) 1s,
-  6 - 1.25s,
-  7 - 1.5s,
-
-  - cirrus,ts-dbnc-fall : Debounce the falling edge of TIP_SENSE_UNPLUG.
-  With no debounce, the tip sense pin might be noisy on an unplug event.
-
-  0 - 0ms,
-  1 - 125ms,
-  2 - 250ms,
-  3 - 500ms,
-  4 - 750ms,
-  5 - (Default) 1s,
-  6 - 1.25s,
-  7 - 1.5s,
-
-  - cirrus,btn-det-init-dbnce : This sets how long the driver sleeps after
-  enabling button detection interrupts. After auto-detection and before
-  servicing button interrupts, the HS bias needs time to settle. If you
-  don't wait, there is possibility for erroneous button interrupt.
-
-  0ms - 200ms,
-  Default = 100ms
-
-  - cirrus,btn-det-event-dbnce : This sets how long the driver delays after
-  receiving a button press interrupt. With level detect interrupts, you want
-  to wait a small amount of time to make sure the button press is making a
-  clean connection with the bias resistors.
-
-  0ms - 20ms,
-  Default = 10ms
-
-  - cirrus,bias-lvls : For a level-detect headset button scheme, each button
-  will bias the mic pin to a certain voltage. To determine which button was
-  pressed, the driver will compare this biased voltage to sequential,
-  decreasing voltages and will stop when a comparator is tripped,
-  indicating a comparator voltage < bias voltage. This value represents a
-  percentage of the internally generated HS bias voltage. For different
-  hardware setups, a designer might want to tweak this. This is an array of
-  descending values for the comparator voltage.
-
-  Array of 4 values
-  Each 0-63
-  < x1 x2 x3 x4 >
-  Default = < 15 8 4 1>
-
-  - cirrus,hs-bias-sense-disable: This is boolean property. If present the
-  HSBIAS sense is disabled. Configures HSBIAS output current sense through
-  the external 2.21-k resistor. HSBIAS_SENSE is hardware feature to reduce
-  the potential pop noise during the headset plug out slowly. But on some
-  platforms ESD voltage will affect it causing test to fail, especially
-  with CTIA headset type. For different hardware setups, a designer might
-  want to tweak default behavior.
-
-Example:
-
-cs42l42: cs42l42@48 {
-	compatible = "cirrus,cs42l42";
-	reg = <0x48>;
-	VA-supply = <&dummy_vreg>;
-	VP-supply = <&dummy_vreg>;
-	VCP-supply = <&dummy_vreg>;
-	VD_FILT-supply = <&dummy_vreg>;
-	VL-supply = <&dummy_vreg>;
-
-	reset-gpios = <&axi_gpio_0 1 0>;
-	interrupt-parent = <&gpio0>;
-	interrupts = <55 8>
-
-	cirrus,ts-inv = <0x00>;
-	cirrus,ts-dbnc-rise = <0x05>;
-	cirrus,ts-dbnc-fall = <0x00>;
-	cirrus,btn-det-init-dbnce = <100>;
-	cirrus,btn-det-event-dbnce = <10>;
-	cirrus,bias-lvls = <0x0F 0x08 0x04 0x01>;
-	cirrus,hs-bias-ramp-rate = <0x02>;
-};

Documentation/devicetree/bindings/sound/linux,spdif-dit.yaml

View file

diff --git a/Documentation/devicetree/bindings/sound/linux,spdif-dit.yaml b/Documentation/devicetree/bindings/sound/linux,spdif-dit.yaml
index c6b070e..a4f9257 100644
--- a/Documentation/devicetree/bindings/sound/linux,spdif-dit.yaml
+++ b/Documentation/devicetree/bindings/sound/linux,spdif-dit.yaml
@@ -9,6 +9,9 @@ title: Dummy SPDIF Transmitter Device Tree Bindings
 maintainers:
   - Mark Brown <[email protected]>
 
+allOf:
+  - $ref: name-prefix.yaml#
+
 properties:
   compatible:
     const: linux,spdif-dit
@@ -16,6 +19,8 @@ properties:
   "#sound-dai-cells":
     const: 0
 
+  sound-name-prefix: true
+
 required:
   - "#sound-dai-cells"
   - compatible

Documentation/devicetree/bindings/sound/mt8195-afe-pcm.yaml

View file

diff --git a/Documentation/devicetree/bindings/sound/mt8195-afe-pcm.yaml b/Documentation/devicetree/bindings/sound/mt8195-afe-pcm.yaml
index dcf790b..6d0975b 100644
--- a/Documentation/devicetree/bindings/sound/mt8195-afe-pcm.yaml
+++ b/Documentation/devicetree/bindings/sound/mt8195-afe-pcm.yaml
@@ -19,6 +19,12 @@ properties:
   interrupts:
     maxItems: 1
 
+  memory-region:
+    maxItems: 1
+    description: |
+      Shared memory region for AFE memif.  A "shared-dma-pool".
+      See ../reserved-memory/reserved-memory.txt for details.
+
   mediatek,topckgen:
     $ref: "/schemas/types.yaml#/definitions/phandle"
     description: The phandle of the mediatek topckgen controller
@@ -125,6 +131,7 @@ required:
   - power-domains
   - clocks
   - clock-names
+  - memory-region
 
 additionalProperties: false
 
@@ -139,6 +146,7 @@ examples:
         interrupts = <GIC_SPI 822 IRQ_TYPE_LEVEL_HIGH 0>;
         mediatek,topckgen = <&topckgen>;
         power-domains = <&spm 7>; //MT8195_POWER_DOMAIN_AUDIO
+        memory-region = <&snd_dma_mem_reserved>;
         clocks = <&clk26m>,
                  <&topckgen 163>, //CLK_TOP_APLL1
                  <&topckgen 166>, //CLK_TOP_APLL2

Documentation/devicetree/bindings/sound/mt8195-mt6359-rt1011-rt5682.yaml

View file

diff --git a/Documentation/devicetree/bindings/sound/mt8195-mt6359-rt1011-rt5682.yaml b/Documentation/devicetree/bindings/sound/mt8195-mt6359-rt1011-rt5682.yaml
index d354c30..cf6ad79 100644
--- a/Documentation/devicetree/bindings/sound/mt8195-mt6359-rt1011-rt5682.yaml
+++ b/Documentation/devicetree/bindings/sound/mt8195-mt6359-rt1011-rt5682.yaml
@@ -16,6 +16,10 @@ properties:
   compatible:
     const: mediatek,mt8195_mt6359_rt1011_rt5682
 
+  model:
+    $ref: /schemas/types.yaml#/definitions/string
+    description: User specified audio sound card name
+
   mediatek,platform:
     $ref: "/schemas/types.yaml#/definitions/phandle"
     description: The phandle of MT8195 ASoC platform.

Documentation/devicetree/bindings/sound/mt8195-mt6359-rt1019-rt5682.yaml

View file

diff --git a/Documentation/devicetree/bindings/sound/mt8195-mt6359-rt1019-rt5682.yaml b/Documentation/devicetree/bindings/sound/mt8195-mt6359-rt1019-rt5682.yaml
index 20bc0ff..8f177e0 100644
--- a/Documentation/devicetree/bindings/sound/mt8195-mt6359-rt1019-rt5682.yaml
+++ b/Documentation/devicetree/bindings/sound/mt8195-mt6359-rt1019-rt5682.yaml
@@ -16,6 +16,10 @@ properties:
   compatible:
     const: mediatek,mt8195_mt6359_rt1019_rt5682
 
+  model:
+    $ref: /schemas/types.yaml#/definitions/string
+    description: User specified audio sound card name
+
   mediatek,platform:
     $ref: "/schemas/types.yaml#/definitions/phandle"
     description: The phandle of MT8195 ASoC platform.
@@ -28,6 +32,16 @@ properties:
     $ref: "/schemas/types.yaml#/definitions/phandle"
     description: The phandle of MT8195 HDMI codec node.
 
+  mediatek,adsp:
+    $ref: "/schemas/types.yaml#/definitions/phandle"
+    description: The phandle of MT8195 ADSP platform.
+