Merge remote-tracking branches 'asoc/topic/max98504', 'asoc/topic/max9867', 'asoc/topic/max9877', 'asoc/topic/mtk' and 'asoc/topic/nau8825' into asoc-next

2026-10-14 05:55:17 +00:00 · 2016-07-24 22:07:37 +01:00 · 2016-07-24 22:07:37 +01:00 · c704f4e312
commit c704f4e312
parent abc026fac2 51ded0fbc1 0ac4aeb518 49220e9b45 97e1145a41 308e3e0bfa
41 changed files with 8052 additions and 2635 deletions
--- a/Documentation/devicetree/bindings/sound/max98504.txt
+++ b/Documentation/devicetree/bindings/sound/max98504.txt
--- a/Documentation/devicetree/bindings/sound/mt2701-afe-pcm.txt
+++ b/Documentation/devicetree/bindings/sound/mt2701-afe-pcm.txt
--- a/Documentation/devicetree/bindings/sound/mt2701-cs42448.txt
+++ b/Documentation/devicetree/bindings/sound/mt2701-cs42448.txt
--- a/Documentation/devicetree/bindings/sound/mt8173-rt5650.txt
+++ b/Documentation/devicetree/bindings/sound/mt8173-rt5650.txt
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
--- a/sound/soc/codecs/Makefile
+++ b/sound/soc/codecs/Makefile
--- a/sound/soc/codecs/max98504.c
+++ b/sound/soc/codecs/max98504.c
--- a/sound/soc/codecs/max98504.h
+++ b/sound/soc/codecs/max98504.h
--- a/sound/soc/codecs/max9867.c
+++ b/sound/soc/codecs/max9867.c
--- a/sound/soc/codecs/max9867.h
+++ b/sound/soc/codecs/max9867.h
--- a/sound/soc/codecs/max9877.h
+++ b/sound/soc/codecs/max9877.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/mediatek/Kconfig
+++ b/sound/soc/mediatek/Kconfig
--- a/sound/soc/mediatek/Makefile
+++ b/sound/soc/mediatek/Makefile
--- a/sound/soc/mediatek/common/Makefile
+++ b/sound/soc/mediatek/common/Makefile
--- a/sound/soc/mediatek/common/mtk-afe-fe-dai.c
+++ b/sound/soc/mediatek/common/mtk-afe-fe-dai.c
--- a/sound/soc/mediatek/common/mtk-afe-fe-dai.h
+++ b/sound/soc/mediatek/common/mtk-afe-fe-dai.h
--- a/sound/soc/mediatek/common/mtk-afe-platform-driver.c
+++ b/sound/soc/mediatek/common/mtk-afe-platform-driver.c
--- a/sound/soc/mediatek/common/mtk-afe-platform-driver.h
+++ b/sound/soc/mediatek/common/mtk-afe-platform-driver.h
--- a/sound/soc/mediatek/common/mtk-base-afe.h
+++ b/sound/soc/mediatek/common/mtk-base-afe.h
--- a/sound/soc/mediatek/mt2701/Makefile
+++ b/sound/soc/mediatek/mt2701/Makefile
--- a/sound/soc/mediatek/mt2701/mt2701-afe-clock-ctrl.c
+++ b/sound/soc/mediatek/mt2701/mt2701-afe-clock-ctrl.c
--- a/sound/soc/mediatek/mt2701/mt2701-afe-clock-ctrl.h
+++ b/sound/soc/mediatek/mt2701/mt2701-afe-clock-ctrl.h
--- a/sound/soc/mediatek/mt2701/mt2701-afe-common.h
+++ b/sound/soc/mediatek/mt2701/mt2701-afe-common.h
--- a/sound/soc/mediatek/mt2701/mt2701-afe-pcm.c
+++ b/sound/soc/mediatek/mt2701/mt2701-afe-pcm.c
--- a/sound/soc/mediatek/mt2701/mt2701-cs42448.c
+++ b/sound/soc/mediatek/mt2701/mt2701-cs42448.c
--- a/sound/soc/mediatek/mt2701/mt2701-reg.h
+++ b/sound/soc/mediatek/mt2701/mt2701-reg.h
--- a/sound/soc/mediatek/mt8173/Makefile
+++ b/sound/soc/mediatek/mt8173/Makefile
--- a/sound/soc/mediatek/mt8173/mt8173-afe-common.h
+++ b/sound/soc/mediatek/mt8173/mt8173-afe-common.h
--- a/sound/soc/mediatek/mt8173/mt8173-afe-pcm.c
+++ b/sound/soc/mediatek/mt8173/mt8173-afe-pcm.c
--- a/sound/soc/mediatek/mt8173/mt8173-max98090.c
+++ b/sound/soc/mediatek/mt8173/mt8173-max98090.c
--- a/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c
+++ b/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c
--- a/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c
+++ b/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c
--- a/sound/soc/mediatek/mt8173/mt8173-rt5650.c
+++ b/sound/soc/mediatek/mt8173/mt8173-rt5650.c
--- a/sound/soc/mediatek/mtk-afe-common.h
+++ b/sound/soc/mediatek/mtk-afe-common.h