Merge branch 'asoc-4.20' into asoc-next

2026-10-14 05:55:17 +00:00 · 2018-10-21 16:59:23 +01:00 · 2018-10-21 16:59:23 +01:00 · 65dfb6d6dd
commit 65dfb6d6dd
parent 576b354ac2 7f91e2af1a
193 changed files with 8867 additions and 2057 deletions
--- a/Documentation/devicetree/bindings/sound/adi,adau1977.txt
+++ b/Documentation/devicetree/bindings/sound/adi,adau1977.txt
--- a/Documentation/devicetree/bindings/sound/amlogic,axg-pdm.txt
+++ b/Documentation/devicetree/bindings/sound/amlogic,axg-pdm.txt
--- a/Documentation/devicetree/bindings/sound/cs42l51.txt
+++ b/Documentation/devicetree/bindings/sound/cs42l51.txt
--- a/Documentation/devicetree/bindings/sound/maxim,max98088.txt
+++ b/Documentation/devicetree/bindings/sound/maxim,max98088.txt
--- a/Documentation/devicetree/bindings/sound/mikroe,mikroe-proto.txt
+++ b/Documentation/devicetree/bindings/sound/mikroe,mikroe-proto.txt
--- a/Documentation/devicetree/bindings/sound/nau8822.txt
+++ b/Documentation/devicetree/bindings/sound/nau8822.txt
--- a/Documentation/devicetree/bindings/sound/pcm3060.txt
+++ b/Documentation/devicetree/bindings/sound/pcm3060.txt
--- a/Documentation/devicetree/bindings/sound/qcom,q6afe.txt
+++ b/Documentation/devicetree/bindings/sound/qcom,q6afe.txt
--- a/Documentation/devicetree/bindings/sound/renesas,rsnd.txt
+++ b/Documentation/devicetree/bindings/sound/renesas,rsnd.txt
--- a/Documentation/devicetree/bindings/sound/st,sta32x.txt
+++ b/Documentation/devicetree/bindings/sound/st,sta32x.txt
--- a/Documentation/devicetree/bindings/sound/st,stm32-sai.txt
+++ b/Documentation/devicetree/bindings/sound/st,stm32-sai.txt
--- a/Documentation/devicetree/bindings/sound/sun4i-i2s.txt
+++ b/Documentation/devicetree/bindings/sound/sun4i-i2s.txt
--- a/Documentation/devicetree/bindings/sound/sun50i-codec-analog.txt
+++ b/Documentation/devicetree/bindings/sound/sun50i-codec-analog.txt
--- a/Documentation/devicetree/bindings/sound/ts3a227e.txt
+++ b/Documentation/devicetree/bindings/sound/ts3a227e.txt
--- a/Documentation/devicetree/bindings/sound/wm8782.txt
+++ b/Documentation/devicetree/bindings/sound/wm8782.txt
--- a/Documentation/devicetree/bindings/trivial-devices.txt
+++ b/Documentation/devicetree/bindings/trivial-devices.txt
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
--- a/7
+++ b/7
--- a/include/sound/hda_codec.h
+++ b/include/sound/hda_codec.h
--- a/include/sound/simple_card_utils.h
+++ b/include/sound/simple_card_utils.h
--- a/include/sound/soc-acpi-intel-match.h
+++ b/include/sound/soc-acpi-intel-match.h
--- a/include/sound/soc-dapm.h
+++ b/include/sound/soc-dapm.h
--- a/include/sound/soc-dpcm.h
+++ b/include/sound/soc-dpcm.h
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
--- a/sound/arm/Kconfig
+++ b/sound/arm/Kconfig
--- a/sound/pci/hda/hda_auto_parser.c
+++ b/sound/pci/hda/hda_auto_parser.c
--- a/sound/pci/hda/hda_beep.h
+++ b/sound/pci/hda/hda_beep.h
--- a/sound/pci/hda/hda_bind.c
+++ b/sound/pci/hda/hda_bind.c
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
--- a/sound/pci/hda/hda_controller.h
+++ b/sound/pci/hda/hda_controller.h
--- a/sound/pci/hda/hda_eld.c
+++ b/sound/pci/hda/hda_eld.c
--- a/sound/pci/hda/hda_generic.c
+++ b/sound/pci/hda/hda_generic.c
--- a/sound/pci/hda/hda_hwdep.c
+++ b/sound/pci/hda/hda_hwdep.c
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
--- a/sound/pci/hda/hda_jack.c
+++ b/sound/pci/hda/hda_jack.c
--- a/sound/pci/hda/hda_proc.c
+++ b/sound/pci/hda/hda_proc.c
--- a/sound/pci/hda/hda_sysfs.c
+++ b/sound/pci/hda/hda_sysfs.c
--- a/sound/pci/hda/hda_tegra.c
+++ b/sound/pci/hda/hda_tegra.c
--- a/sound/pci/hda/patch_analog.c
+++ b/sound/pci/hda/patch_analog.c
--- a/sound/pci/hda/patch_ca0110.c
+++ b/sound/pci/hda/patch_ca0110.c
--- a/sound/pci/hda/patch_ca0132.c
+++ b/sound/pci/hda/patch_ca0132.c
--- a/sound/pci/hda/patch_cirrus.c
+++ b/sound/pci/hda/patch_cirrus.c
--- a/sound/pci/hda/patch_cmedia.c
+++ b/sound/pci/hda/patch_cmedia.c
--- a/sound/pci/hda/patch_conexant.c
+++ b/sound/pci/hda/patch_conexant.c
--- a/sound/pci/hda/patch_hdmi.c
+++ b/sound/pci/hda/patch_hdmi.c
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
--- a/sound/pci/hda/patch_si3054.c
+++ b/sound/pci/hda/patch_si3054.c
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
--- a/sound/pci/hda/patch_via.c
+++ b/sound/pci/hda/patch_via.c
--- a/sound/soc/amd/acp-da7219-max98357a.c
+++ b/sound/soc/amd/acp-da7219-max98357a.c
--- a/sound/soc/amd/acp-pcm-dma.c
+++ b/sound/soc/amd/acp-pcm-dma.c
--- a/sound/soc/amd/acp.h
+++ b/sound/soc/amd/acp.h
--- a/sound/soc/atmel/Kconfig
+++ b/sound/soc/atmel/Kconfig
--- a/sound/soc/atmel/Makefile
+++ b/sound/soc/atmel/Makefile
--- a/sound/soc/atmel/atmel_ssc_dai.c
+++ b/sound/soc/atmel/atmel_ssc_dai.c
--- a/sound/soc/atmel/mikroe-proto.c
+++ b/sound/soc/atmel/mikroe-proto.c
--- a/sound/soc/atmel/tse850-pcm5142.c
+++ b/sound/soc/atmel/tse850-pcm5142.c
--- a/sound/soc/bcm/cygnus-ssp.c
+++ b/sound/soc/bcm/cygnus-ssp.c
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
--- a/sound/soc/codecs/Makefile
+++ b/sound/soc/codecs/Makefile
--- a/sound/soc/codecs/adau1761.c
+++ b/sound/soc/codecs/adau1761.c
--- a/sound/soc/codecs/adau17x1.c
+++ b/sound/soc/codecs/adau17x1.c
--- a/sound/soc/codecs/adau17x1.h
+++ b/sound/soc/codecs/adau17x1.h
--- a/sound/soc/codecs/cs4265.c
+++ b/sound/soc/codecs/cs4265.c
--- a/sound/soc/codecs/cs42l51.c
+++ b/sound/soc/codecs/cs42l51.c
--- a/sound/soc/codecs/dmic.c
+++ b/sound/soc/codecs/dmic.c
--- a/sound/soc/codecs/es8328.c
+++ b/sound/soc/codecs/es8328.c
--- a/sound/soc/codecs/hdac_hda.c
+++ b/sound/soc/codecs/hdac_hda.c
--- a/sound/soc/codecs/hdac_hda.h
+++ b/sound/soc/codecs/hdac_hda.h
--- a/sound/soc/codecs/hdac_hdmi.c
+++ b/sound/soc/codecs/hdac_hdmi.c
--- a/sound/soc/codecs/max98088.c
+++ b/sound/soc/codecs/max98088.c
--- a/sound/soc/codecs/max98373.c
+++ b/sound/soc/codecs/max98373.c
--- a/sound/soc/codecs/nau8822.c
+++ b/sound/soc/codecs/nau8822.c
--- a/sound/soc/codecs/nau8822.h
+++ b/sound/soc/codecs/nau8822.h
--- a/sound/soc/codecs/pcm186x.c
+++ b/sound/soc/codecs/pcm186x.c
--- a/sound/soc/codecs/pcm3060-i2c.c
+++ b/sound/soc/codecs/pcm3060-i2c.c
--- a/sound/soc/codecs/pcm3060-spi.c
+++ b/sound/soc/codecs/pcm3060-spi.c
--- a/sound/soc/codecs/pcm3060.c
+++ b/sound/soc/codecs/pcm3060.c
--- a/sound/soc/codecs/pcm3060.h
+++ b/sound/soc/codecs/pcm3060.h
--- a/sound/soc/codecs/pcm3168a.c
+++ b/sound/soc/codecs/pcm3168a.c
--- a/sound/soc/codecs/rt274.c
+++ b/sound/soc/codecs/rt274.c
--- a/sound/soc/codecs/rt5651.c
+++ b/sound/soc/codecs/rt5651.c
--- a/sound/soc/codecs/rt5663.c
+++ b/sound/soc/codecs/rt5663.c
--- a/sound/soc/codecs/rt5668.c
+++ b/sound/soc/codecs/rt5668.c
--- a/sound/soc/codecs/rt5670.c
+++ b/sound/soc/codecs/rt5670.c
--- a/sound/soc/codecs/rt5677-spi.c
+++ b/sound/soc/codecs/rt5677-spi.c
--- a/sound/soc/codecs/rt5682.c
+++ b/sound/soc/codecs/rt5682.c
--- a/sound/soc/codecs/rt5682.h
+++ b/sound/soc/codecs/rt5682.h
--- a/sound/soc/codecs/sgtl5000.c
+++ b/sound/soc/codecs/sgtl5000.c
--- a/sound/soc/codecs/sta32x.c
+++ b/sound/soc/codecs/sta32x.c
--- a/sound/soc/codecs/tas5720.c
+++ b/sound/soc/codecs/tas5720.c
--- a/sound/soc/codecs/tas6424.c
+++ b/sound/soc/codecs/tas6424.c
--- a/sound/soc/codecs/tas6424.h
+++ b/sound/soc/codecs/tas6424.h
--- a/sound/soc/codecs/tlv320aic31xx.c
+++ b/sound/soc/codecs/tlv320aic31xx.c
--- a/sound/soc/codecs/tlv320aic31xx.h
+++ b/sound/soc/codecs/tlv320aic31xx.h
--- a/sound/soc/codecs/tscs454.c
+++ b/sound/soc/codecs/tscs454.c
--- a/sound/soc/codecs/wm2000.c
+++ b/sound/soc/codecs/wm2000.c
--- a/sound/soc/codecs/wm8782.c
+++ b/sound/soc/codecs/wm8782.c
--- a/sound/soc/codecs/wm8904.c
+++ b/sound/soc/codecs/wm8904.c
--- a/sound/soc/codecs/wm8974.c
+++ b/sound/soc/codecs/wm8974.c
--- a/Show more
+++ b/Show more