Merge remote-tracking branch 'asoc/topic/inte' into asoc-next

2026-09-26 18:16:26 +00:00 · 2017-07-03 16:51:38 +01:00 · 2017-07-03 16:51:38 +01:00 · b821d298f8
commit b821d298f8
parent 254d96be46 478b77461a
64 changed files with 4398 additions and 499 deletions
--- a/Documentation/devicetree/bindings/sound/audio-graph-card.txt
+++ b/Documentation/devicetree/bindings/sound/audio-graph-card.txt
--- a/Documentation/devicetree/bindings/sound/audio-graph-scu-card.txt
+++ b/Documentation/devicetree/bindings/sound/audio-graph-scu-card.txt
--- a/Documentation/devicetree/bindings/sound/nau8825.txt
+++ b/Documentation/devicetree/bindings/sound/nau8825.txt
--- a/Documentation/devicetree/bindings/sound/rockchip,pdm.txt
+++ b/Documentation/devicetree/bindings/sound/rockchip,pdm.txt
--- a/Documentation/devicetree/bindings/sound/rockchip-spdif.txt
+++ b/Documentation/devicetree/bindings/sound/rockchip-spdif.txt
--- a/Documentation/devicetree/bindings/sound/samsung,odroid.txt
+++ b/Documentation/devicetree/bindings/sound/samsung,odroid.txt
--- a/Documentation/devicetree/bindings/sound/st,stm32-i2s.txt
+++ b/Documentation/devicetree/bindings/sound/st,stm32-i2s.txt
--- a/Documentation/devicetree/bindings/sound/st,stm32-sai.txt
+++ b/Documentation/devicetree/bindings/sound/st,stm32-sai.txt
--- a/Documentation/devicetree/bindings/sound/st,stm32-spdifrx.txt
+++ b/Documentation/devicetree/bindings/sound/st,stm32-spdifrx.txt
--- a/Documentation/devicetree/bindings/sound/sun4i-codec.txt
+++ b/Documentation/devicetree/bindings/sound/sun4i-codec.txt
--- a/Documentation/devicetree/bindings/sound/sun8i-codec-analog.txt
+++ b/Documentation/devicetree/bindings/sound/sun8i-codec-analog.txt
--- a/Documentation/devicetree/bindings/sound/zte,zx-aud96p22.txt
+++ b/Documentation/devicetree/bindings/sound/zte,zx-aud96p22.txt
--- a/include/sound/hdmi-codec.h
+++ b/include/sound/hdmi-codec.h
--- a/include/sound/rt5645.h
+++ b/include/sound/rt5645.h
--- a/include/sound/simple_card_utils.h
+++ b/include/sound/simple_card_utils.h
--- a/include/sound/soc-topology.h
+++ b/include/sound/soc-topology.h
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
--- a/sound/soc/codecs/Makefile
+++ b/sound/soc/codecs/Makefile
--- a/sound/soc/codecs/hdmi-codec.c
+++ b/sound/soc/codecs/hdmi-codec.c
--- a/sound/soc/codecs/max9867.c
+++ b/sound/soc/codecs/max9867.c
--- a/sound/soc/codecs/msm8916-wcd-analog.c
+++ b/sound/soc/codecs/msm8916-wcd-analog.c
--- a/sound/soc/codecs/nau8824.c
+++ b/sound/soc/codecs/nau8824.c
--- a/sound/soc/codecs/nau8824.h
+++ b/sound/soc/codecs/nau8824.h
--- a/sound/soc/codecs/nau8825.c
+++ b/sound/soc/codecs/nau8825.c
--- a/sound/soc/codecs/nau8825.h
+++ b/sound/soc/codecs/nau8825.h
--- a/sound/soc/codecs/rt5514.c
+++ b/sound/soc/codecs/rt5514.c
--- a/sound/soc/codecs/rt5514.h
+++ b/sound/soc/codecs/rt5514.h
--- a/sound/soc/codecs/rt5645.c
+++ b/sound/soc/codecs/rt5645.c
--- a/sound/soc/codecs/rt5651.c
+++ b/sound/soc/codecs/rt5651.c
--- a/sound/soc/codecs/rt5665.c
+++ b/sound/soc/codecs/rt5665.c
--- a/sound/soc/codecs/rt5670.c
+++ b/sound/soc/codecs/rt5670.c
--- a/sound/soc/codecs/sgtl5000.c
+++ b/sound/soc/codecs/sgtl5000.c
--- a/sound/soc/codecs/tlv320aic31xx.c
+++ b/sound/soc/codecs/tlv320aic31xx.c
--- a/sound/soc/codecs/wm_adsp.c
+++ b/sound/soc/codecs/wm_adsp.c
--- a/sound/soc/codecs/zx_aud96p22.c
+++ b/sound/soc/codecs/zx_aud96p22.c
--- a/sound/soc/fsl/mpc5200_dma.c
+++ b/sound/soc/fsl/mpc5200_dma.c
--- a/sound/soc/generic/audio-graph-card.c
+++ b/sound/soc/generic/audio-graph-card.c
--- a/sound/soc/generic/audio-graph-scu-card.c
+++ b/sound/soc/generic/audio-graph-scu-card.c
--- a/sound/soc/generic/simple-card-utils.c
+++ b/sound/soc/generic/simple-card-utils.c
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
--- a/sound/soc/generic/simple-scu-card.c
+++ b/sound/soc/generic/simple-scu-card.c
--- a/sound/soc/hisilicon/hi6210-i2s.c
+++ b/sound/soc/hisilicon/hi6210-i2s.c
--- a/sound/soc/mediatek/mt2701/mt2701-cs42448.c
+++ b/sound/soc/mediatek/mt2701/mt2701-cs42448.c
--- a/sound/soc/omap/mcbsp.c
+++ b/sound/soc/omap/mcbsp.c
--- a/sound/soc/pxa/Kconfig
+++ b/sound/soc/pxa/Kconfig
--- a/sound/soc/rockchip/Kconfig
+++ b/sound/soc/rockchip/Kconfig
--- a/sound/soc/rockchip/Makefile
+++ b/sound/soc/rockchip/Makefile
--- a/sound/soc/rockchip/rockchip_i2s.c
+++ b/sound/soc/rockchip/rockchip_i2s.c
--- a/sound/soc/rockchip/rockchip_i2s.h
+++ b/sound/soc/rockchip/rockchip_i2s.h
--- a/sound/soc/rockchip/rockchip_pdm.c
+++ b/sound/soc/rockchip/rockchip_pdm.c
--- a/sound/soc/rockchip/rockchip_pdm.h
+++ b/sound/soc/rockchip/rockchip_pdm.h
--- a/sound/soc/rockchip/rockchip_spdif.c
+++ b/sound/soc/rockchip/rockchip_spdif.c
--- a/sound/soc/samsung/s3c24xx_uda134x.c
+++ b/sound/soc/samsung/s3c24xx_uda134x.c
--- a/sound/soc/sh/fsi.c
+++ b/sound/soc/sh/fsi.c
--- a/sound/soc/soc-topology.c
+++ b/sound/soc/soc-topology.c
--- a/sound/soc/stm/Kconfig
+++ b/sound/soc/stm/Kconfig
--- a/sound/soc/stm/Makefile
+++ b/sound/soc/stm/Makefile
--- a/sound/soc/stm/stm32_i2s.c
+++ b/sound/soc/stm/stm32_i2s.c
--- a/sound/soc/stm/stm32_sai.c
+++ b/sound/soc/stm/stm32_sai.c
--- a/sound/soc/stm/stm32_sai.h
+++ b/sound/soc/stm/stm32_sai.h
--- a/sound/soc/stm/stm32_sai_sub.c
+++ b/sound/soc/stm/stm32_sai_sub.c
--- a/sound/soc/stm/stm32_spdifrx.c
+++ b/sound/soc/stm/stm32_spdifrx.c
--- a/sound/soc/sunxi/sun4i-codec.c
+++ b/sound/soc/sunxi/sun4i-codec.c
--- a/sound/soc/sunxi/sun8i-codec-analog.c
+++ b/sound/soc/sunxi/sun8i-codec-analog.c