Merge remote-tracking branches 'asoc/topic/samsung', 'asoc/topic/sgtl5000', 'asoc/topic/sh', 'asoc/topic/simple', 'asoc/topic/sirf', 'asoc/topic/sn95031', 'asoc/topic/ssm2602' and 'asoc/topic/stac9766' into asoc-next

2026-09-28 19:20:30 +00:00 · 2014-03-12 23:04:42 +00:00 · 2014-03-12 23:04:42 +00:00 · 7cc6417208
commit 7cc6417208
parent a4b12990b6 8b621d0fae c8ed650421 23a735cc02 12ffa6fc19 af12a31f05 f3c1196e16 b38fbe3073 3cd7ca5882
33 changed files with 1564 additions and 433 deletions
--- a/Documentation/devicetree/bindings/sound/simple-card.txt
+++ b/Documentation/devicetree/bindings/sound/simple-card.txt
--- a/Documentation/devicetree/bindings/sound/sirf-audio-codec.txt
+++ b/Documentation/devicetree/bindings/sound/sirf-audio-codec.txt
--- a/Documentation/devicetree/bindings/sound/sirf-audio-port.txt
+++ b/Documentation/devicetree/bindings/sound/sirf-audio-port.txt
--- a/Documentation/devicetree/bindings/sound/sirf-audio.txt
+++ b/Documentation/devicetree/bindings/sound/sirf-audio.txt
--- a/include/linux/platform_data/asoc-s3c.h
+++ b/include/linux/platform_data/asoc-s3c.h
--- a/include/linux/platform_data/asoc-s3c24xx_simtec.h
+++ b/include/linux/platform_data/asoc-s3c24xx_simtec.h
--- a/include/sound/simple_card.h
+++ b/include/sound/simple_card.h
--- a/sound/soc/Kconfig
+++ b/sound/soc/Kconfig
--- a/sound/soc/Makefile
+++ b/sound/soc/Makefile
--- a/sound/soc/blackfin/Kconfig
+++ b/sound/soc/blackfin/Kconfig
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
--- a/sound/soc/codecs/Makefile
+++ b/sound/soc/codecs/Makefile
--- a/sound/soc/codecs/sgtl5000.c
+++ b/sound/soc/codecs/sgtl5000.c
--- a/sound/soc/codecs/sirf-audio-codec.c
+++ b/sound/soc/codecs/sirf-audio-codec.c
--- a/sound/soc/codecs/sirf-audio-codec.h
+++ b/sound/soc/codecs/sirf-audio-codec.h
--- a/sound/soc/codecs/sn95031.c
+++ b/sound/soc/codecs/sn95031.c
--- a/sound/soc/codecs/ssm2602-i2c.c
+++ b/sound/soc/codecs/ssm2602-i2c.c
--- a/sound/soc/codecs/ssm2602-spi.c
+++ b/sound/soc/codecs/ssm2602-spi.c
--- a/sound/soc/codecs/ssm2602.c
+++ b/sound/soc/codecs/ssm2602.c
--- a/sound/soc/codecs/ssm2602.h
+++ b/sound/soc/codecs/ssm2602.h
--- a/sound/soc/codecs/stac9766.c
+++ b/sound/soc/codecs/stac9766.c
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
--- a/sound/soc/samsung/h1940_uda1380.c
+++ b/sound/soc/samsung/h1940_uda1380.c
--- a/sound/soc/samsung/neo1973_wm8753.c
+++ b/sound/soc/samsung/neo1973_wm8753.c
--- a/sound/soc/samsung/rx1950_uda1380.c
+++ b/sound/soc/samsung/rx1950_uda1380.c
--- a/sound/soc/samsung/smdk_wm8994.c
+++ b/sound/soc/samsung/smdk_wm8994.c
--- a/sound/soc/samsung/tobermory.c
+++ b/sound/soc/samsung/tobermory.c
--- a/sound/soc/sh/migor.c
+++ b/sound/soc/sh/migor.c
--- a/sound/soc/sirf/Kconfig
+++ b/sound/soc/sirf/Kconfig
--- a/sound/soc/sirf/Makefile
+++ b/sound/soc/sirf/Makefile
--- a/sound/soc/sirf/sirf-audio-port.c
+++ b/sound/soc/sirf/sirf-audio-port.c
--- a/sound/soc/sirf/sirf-audio-port.h
+++ b/sound/soc/sirf/sirf-audio-port.h
--- a/sound/soc/sirf/sirf-audio.c
+++ b/sound/soc/sirf/sirf-audio.c