Merge branch 'asoc-4.18' into asoc-next

2026-10-14 05:55:17 +00:00 · 2018-06-05 12:27:32 +01:00 · 2018-06-05 12:27:32 +01:00 · 5544717d41
commit 5544717d41
parent 2858e2cfc2 ff2faf1289
252 changed files with 29891 additions and 4101 deletions
--- a/Documentation/devicetree/bindings/soc/qcom/qcom,apr.txt
+++ b/Documentation/devicetree/bindings/soc/qcom/qcom,apr.txt
--- a/Documentation/devicetree/bindings/sound/adi,ssm2305.txt
+++ b/Documentation/devicetree/bindings/sound/adi,ssm2305.txt
--- a/Documentation/devicetree/bindings/sound/atmel-i2s.txt
+++ b/Documentation/devicetree/bindings/sound/atmel-i2s.txt
--- a/Documentation/devicetree/bindings/sound/cs42xx8.txt
+++ b/Documentation/devicetree/bindings/sound/cs42xx8.txt
--- a/Documentation/devicetree/bindings/sound/fsl,asrc.txt
+++ b/Documentation/devicetree/bindings/sound/fsl,asrc.txt
--- a/Documentation/devicetree/bindings/sound/fsl,esai.txt
+++ b/Documentation/devicetree/bindings/sound/fsl,esai.txt
--- a/Documentation/devicetree/bindings/sound/fsl,spdif.txt
+++ b/Documentation/devicetree/bindings/sound/fsl,spdif.txt
--- a/Documentation/devicetree/bindings/sound/fsl-sai.txt
+++ b/Documentation/devicetree/bindings/sound/fsl-sai.txt
--- a/Documentation/devicetree/bindings/sound/mt2701-afe-pcm.txt
+++ b/Documentation/devicetree/bindings/sound/mt2701-afe-pcm.txt
--- a/Documentation/devicetree/bindings/sound/mt6351.txt
+++ b/Documentation/devicetree/bindings/sound/mt6351.txt
--- a/Documentation/devicetree/bindings/sound/mt6797-afe-pcm.txt
+++ b/Documentation/devicetree/bindings/sound/mt6797-afe-pcm.txt
--- a/Documentation/devicetree/bindings/sound/mt6797-mt6351.txt
+++ b/Documentation/devicetree/bindings/sound/mt6797-mt6351.txt
--- a/Documentation/devicetree/bindings/sound/qcom,apq8096.txt
+++ b/Documentation/devicetree/bindings/sound/qcom,apq8096.txt
--- a/Documentation/devicetree/bindings/sound/qcom,q6adm.txt
+++ b/Documentation/devicetree/bindings/sound/qcom,q6adm.txt
--- a/Documentation/devicetree/bindings/sound/qcom,q6afe.txt
+++ b/Documentation/devicetree/bindings/sound/qcom,q6afe.txt
--- a/Documentation/devicetree/bindings/sound/qcom,q6asm.txt
+++ b/Documentation/devicetree/bindings/sound/qcom,q6asm.txt
--- a/Documentation/devicetree/bindings/sound/qcom,q6core.txt
+++ b/Documentation/devicetree/bindings/sound/qcom,q6core.txt
--- a/Documentation/devicetree/bindings/sound/rt274.txt
+++ b/Documentation/devicetree/bindings/sound/rt274.txt
--- a/Documentation/devicetree/bindings/sound/rt5514.txt
+++ b/Documentation/devicetree/bindings/sound/rt5514.txt
--- a/Documentation/devicetree/bindings/sound/rt5616.txt
+++ b/Documentation/devicetree/bindings/sound/rt5616.txt
--- a/Documentation/devicetree/bindings/sound/rt5640.txt
+++ b/Documentation/devicetree/bindings/sound/rt5640.txt
--- a/Documentation/devicetree/bindings/sound/rt5645.txt
+++ b/Documentation/devicetree/bindings/sound/rt5645.txt
--- a/Documentation/devicetree/bindings/sound/rt5651.txt
+++ b/Documentation/devicetree/bindings/sound/rt5651.txt
--- a/Documentation/devicetree/bindings/sound/rt5663.txt
+++ b/Documentation/devicetree/bindings/sound/rt5663.txt
--- a/Documentation/devicetree/bindings/sound/rt5668.txt
+++ b/Documentation/devicetree/bindings/sound/rt5668.txt
--- a/Documentation/devicetree/bindings/sound/sgtl5000.txt
+++ b/Documentation/devicetree/bindings/sound/sgtl5000.txt
--- a/Documentation/devicetree/bindings/sound/simple-card.txt
+++ b/Documentation/devicetree/bindings/sound/simple-card.txt
--- a/Documentation/devicetree/bindings/sound/ti,tas6424.txt
+++ b/Documentation/devicetree/bindings/sound/ti,tas6424.txt
--- a/Documentation/devicetree/bindings/sound/tscs42xx.txt
+++ b/Documentation/devicetree/bindings/sound/tscs42xx.txt
--- a/Documentation/devicetree/bindings/sound/tscs454.txt
+++ b/Documentation/devicetree/bindings/sound/tscs454.txt
--- a/Documentation/devicetree/bindings/sound/wm8510.txt
+++ b/Documentation/devicetree/bindings/sound/wm8510.txt
--- a/Documentation/devicetree/bindings/sound/wm8523.txt
+++ b/Documentation/devicetree/bindings/sound/wm8523.txt
--- a/Documentation/devicetree/bindings/sound/wm8524.txt
+++ b/Documentation/devicetree/bindings/sound/wm8524.txt
--- a/Documentation/devicetree/bindings/sound/wm8580.txt
+++ b/Documentation/devicetree/bindings/sound/wm8580.txt
--- a/Documentation/devicetree/bindings/sound/wm8711.txt
+++ b/Documentation/devicetree/bindings/sound/wm8711.txt
--- a/Documentation/devicetree/bindings/sound/wm8728.txt
+++ b/Documentation/devicetree/bindings/sound/wm8728.txt
--- a/Documentation/devicetree/bindings/sound/wm8731.txt
+++ b/Documentation/devicetree/bindings/sound/wm8731.txt
--- a/Documentation/devicetree/bindings/sound/wm8737.txt
+++ b/Documentation/devicetree/bindings/sound/wm8737.txt
--- a/Documentation/devicetree/bindings/sound/wm8741.txt
+++ b/Documentation/devicetree/bindings/sound/wm8741.txt
--- a/Documentation/devicetree/bindings/sound/wm8750.txt
+++ b/Documentation/devicetree/bindings/sound/wm8750.txt
--- a/Documentation/devicetree/bindings/sound/wm8753.txt
+++ b/Documentation/devicetree/bindings/sound/wm8753.txt
--- a/Documentation/devicetree/bindings/sound/wm8770.txt
+++ b/Documentation/devicetree/bindings/sound/wm8770.txt
--- a/Documentation/devicetree/bindings/sound/wm8776.txt
+++ b/Documentation/devicetree/bindings/sound/wm8776.txt
--- a/Documentation/devicetree/bindings/sound/wm8804.txt
+++ b/Documentation/devicetree/bindings/sound/wm8804.txt
--- a/Documentation/devicetree/bindings/sound/wm8903.txt
+++ b/Documentation/devicetree/bindings/sound/wm8903.txt
--- a/Documentation/devicetree/bindings/sound/wm8960.txt
+++ b/Documentation/devicetree/bindings/sound/wm8960.txt
--- a/Documentation/devicetree/bindings/sound/wm8962.txt
+++ b/Documentation/devicetree/bindings/sound/wm8962.txt
--- a/Documentation/devicetree/bindings/sound/wm8994.txt
+++ b/Documentation/devicetree/bindings/sound/wm8994.txt
--- a/Documentation/sound/soc/codec.rst
+++ b/Documentation/sound/soc/codec.rst
--- a/Documentation/sound/soc/platform.rst
+++ b/Documentation/sound/soc/platform.rst
--- a/arch/arm/mach-ep93xx/core.c
+++ b/arch/arm/mach-ep93xx/core.c
--- a/drivers/media/i2c/tda1997x.c
+++ b/drivers/media/i2c/tda1997x.c
--- a/drivers/soc/qcom/Kconfig
+++ b/drivers/soc/qcom/Kconfig
--- a/drivers/soc/qcom/Makefile
+++ b/drivers/soc/qcom/Makefile
--- a/drivers/soc/qcom/apr.c
+++ b/drivers/soc/qcom/apr.c
--- a/include/dt-bindings/soc/qcom,apr.h
+++ b/include/dt-bindings/soc/qcom,apr.h
--- a/include/dt-bindings/sound/fsl-imx-audmux.h
+++ b/include/dt-bindings/sound/fsl-imx-audmux.h
--- a/include/dt-bindings/sound/qcom,q6afe.h
+++ b/include/dt-bindings/sound/qcom,q6afe.h
--- a/include/dt-bindings/sound/qcom,q6asm.h
+++ b/include/dt-bindings/sound/qcom,q6asm.h
--- a/include/dt-bindings/sound/rt5640.h
+++ b/include/dt-bindings/sound/rt5640.h
--- a/include/linux/mfd/wm8350/audio.h
+++ b/include/linux/mfd/wm8350/audio.h
--- a/include/linux/mod_devicetable.h
+++ b/include/linux/mod_devicetable.h
--- a/include/linux/soc/qcom/apr.h
+++ b/include/linux/soc/qcom/apr.h
--- a/include/sound/omap-pcm.h
+++ b/include/sound/omap-pcm.h
--- a/include/sound/rt5640.h
+++ b/include/sound/rt5640.h
--- a/include/sound/rt5668.h
+++ b/include/sound/rt5668.h
--- a/include/sound/soc-dai.h
+++ b/include/sound/soc-dai.h
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
--- a/include/trace/events/asoc.h
+++ b/include/trace/events/asoc.h
--- a/include/uapi/sound/asoc.h
+++ b/include/uapi/sound/asoc.h
--- a/sound/soc/intel/skylake/skl-tplg-interface.h
+++ b/sound/soc/intel/skylake/skl-tplg-interface.h
--- a/sound/soc/Makefile
+++ b/sound/soc/Makefile
--- 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-i2s.c
+++ b/sound/soc/atmel/atmel-i2s.c
--- a/sound/soc/atmel/atmel_ssc_dai.c
+++ b/sound/soc/atmel/atmel_ssc_dai.c
--- a/sound/soc/bcm/Kconfig
+++ b/sound/soc/bcm/Kconfig
--- a/sound/soc/cirrus/Kconfig
+++ b/sound/soc/cirrus/Kconfig
--- a/sound/soc/cirrus/ep93xx-i2s.c
+++ b/sound/soc/cirrus/ep93xx-i2s.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/adau17x1.c
+++ b/sound/soc/codecs/adau17x1.c
--- a/sound/soc/codecs/max98088.c
+++ b/sound/soc/codecs/max98088.c
--- a/sound/soc/codecs/max98095.c
+++ b/sound/soc/codecs/max98095.c
--- a/sound/soc/codecs/max9860.c
+++ b/sound/soc/codecs/max9860.c
--- a/sound/soc/codecs/max9860.h
+++ b/sound/soc/codecs/max9860.h
--- a/sound/soc/codecs/mt6351.c
+++ b/sound/soc/codecs/mt6351.c
--- a/sound/soc/codecs/mt6351.h
+++ b/sound/soc/codecs/mt6351.h
--- a/sound/soc/codecs/nau8810.c
+++ b/sound/soc/codecs/nau8810.c
--- a/sound/soc/codecs/nau8824.c
+++ b/sound/soc/codecs/nau8824.c
--- a/sound/soc/codecs/pcm1789.c
+++ b/sound/soc/codecs/pcm1789.c
--- a/sound/soc/codecs/pcm512x-i2c.c
+++ b/sound/soc/codecs/pcm512x-i2c.c
--- a/sound/soc/codecs/rt1305.c
+++ b/sound/soc/codecs/rt1305.c
--- a/sound/soc/codecs/rt1305.h
+++ b/sound/soc/codecs/rt1305.h
--- a/sound/soc/codecs/rt5640.c
+++ b/sound/soc/codecs/rt5640.c
--- a/sound/soc/codecs/rt5640.h
+++ b/sound/soc/codecs/rt5640.h
--- a/sound/soc/codecs/rt5645.c
+++ b/sound/soc/codecs/rt5645.c
--- a/Show more
+++ b/Show more