Merge remote-tracking branch 'asoc/fix/atmel' into asoc-linus

2026-10-12 06:01:58 +00:00 · 2013-09-11 11:17:14 +01:00 · 2013-09-11 11:17:14 +01:00 · 29dc5dd229
commit 29dc5dd229
parent 6e4664525b e011143454
195 changed files with 10715 additions and 2797 deletions
--- a/Documentation/devicetree/bindings/misc/atmel-ssc.txt
+++ b/Documentation/devicetree/bindings/misc/atmel-ssc.txt
--- a/Documentation/devicetree/bindings/serial/mrvl,pxa-ssp.txt
+++ b/Documentation/devicetree/bindings/serial/mrvl,pxa-ssp.txt
--- a/Documentation/devicetree/bindings/sound/ak4554.c
+++ b/Documentation/devicetree/bindings/sound/ak4554.c
--- a/Documentation/devicetree/bindings/sound/alc5632.txt
+++ b/Documentation/devicetree/bindings/sound/alc5632.txt
--- a/Documentation/devicetree/bindings/sound/atmel-sam9x5-wm8731-audio.txt
+++ b/Documentation/devicetree/bindings/sound/atmel-sam9x5-wm8731-audio.txt
--- a/Documentation/devicetree/bindings/sound/atmel-wm8904.txt
+++ b/Documentation/devicetree/bindings/sound/atmel-wm8904.txt
--- a/Documentation/devicetree/bindings/sound/fsl,spdif.txt
+++ b/Documentation/devicetree/bindings/sound/fsl,spdif.txt
--- a/Documentation/devicetree/bindings/powerpc/fsl/ssi.txt
+++ b/Documentation/devicetree/bindings/powerpc/fsl/ssi.txt
--- a/Documentation/devicetree/bindings/sound/imx-audmux.txt
+++ b/Documentation/devicetree/bindings/sound/imx-audmux.txt
--- a/Documentation/devicetree/bindings/sound/mrvl,pxa-ssp.txt
+++ b/Documentation/devicetree/bindings/sound/mrvl,pxa-ssp.txt
--- a/Documentation/devicetree/bindings/sound/mrvl,pxa2xx-pcm.txt
+++ b/Documentation/devicetree/bindings/sound/mrvl,pxa2xx-pcm.txt
--- a/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-alc5632.txt
+++ b/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-alc5632.txt
--- a/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-rt5640.txt
+++ b/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-rt5640.txt
--- a/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm8753.txt
+++ b/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm8753.txt
--- a/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm8903.txt
+++ b/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm8903.txt
--- a/Documentation/devicetree/bindings/sound/pcm1792a.txt
+++ b/Documentation/devicetree/bindings/sound/pcm1792a.txt
--- a/Documentation/devicetree/bindings/sound/rt5640.txt
+++ b/Documentation/devicetree/bindings/sound/rt5640.txt
--- a/Documentation/devicetree/bindings/sound/samsung-i2s.txt
+++ b/Documentation/devicetree/bindings/sound/samsung-i2s.txt
--- a/Documentation/devicetree/bindings/sound/soc-ac97link.txt
+++ b/Documentation/devicetree/bindings/sound/soc-ac97link.txt
--- a/Documentation/devicetree/bindings/sound/ti,pcm1681.txt
+++ b/Documentation/devicetree/bindings/sound/ti,pcm1681.txt
--- a/Documentation/devicetree/bindings/sound/tlv320aic3x.txt
+++ b/Documentation/devicetree/bindings/sound/tlv320aic3x.txt
--- a/Documentation/devicetree/bindings/sound/wm8731.txt
+++ b/Documentation/devicetree/bindings/sound/wm8731.txt
--- a/Documentation/devicetree/bindings/sound/wm8753.txt
+++ b/Documentation/devicetree/bindings/sound/wm8753.txt
--- a/Documentation/devicetree/bindings/sound/wm8903.txt
+++ b/Documentation/devicetree/bindings/sound/wm8903.txt
--- a/Documentation/devicetree/bindings/sound/wm8994.txt
+++ b/Documentation/devicetree/bindings/sound/wm8994.txt
--- a/2
+++ b/2
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
--- a/arch/arm/mach-dove/common.c
+++ b/arch/arm/mach-dove/common.c
--- a/arch/arm/mach-kirkwood/common.c
+++ b/arch/arm/mach-kirkwood/common.c
--- a/arch/arm/plat-pxa/ssp.c
+++ b/arch/arm/plat-pxa/ssp.c
--- a/include/dt-bindings/sound/fsl-imx-audmux.h
+++ b/include/dt-bindings/sound/fsl-imx-audmux.h
--- a/include/linux/atmel-ssc.h
+++ b/include/linux/atmel-ssc.h
--- a/include/linux/mfd/arizona/gpio.h
+++ b/include/linux/mfd/arizona/gpio.h
--- a/include/linux/platform_data/asoc-s3c.h
+++ b/include/linux/platform_data/asoc-s3c.h
--- a/include/linux/platform_data/omap-abe-twl6040.h
+++ b/include/linux/platform_data/omap-abe-twl6040.h
--- a/include/linux/pxa2xx_ssp.h
+++ b/include/linux/pxa2xx_ssp.h
--- a/include/sound/pxa2xx-lib.h
+++ b/include/sound/pxa2xx-lib.h
--- a/include/sound/rcar_snd.h
+++ b/include/sound/rcar_snd.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/pxa2xx-ac97.c
+++ b/sound/arm/pxa2xx-ac97.c
--- a/sound/arm/pxa2xx-pcm-lib.c
+++ b/sound/arm/pxa2xx-pcm-lib.c
--- a/sound/arm/pxa2xx-pcm.c
+++ b/sound/arm/pxa2xx-pcm.c
--- a/sound/arm/pxa2xx-pcm.h
+++ b/sound/arm/pxa2xx-pcm.h
--- a/sound/core/Kconfig
+++ b/sound/core/Kconfig
--- a/sound/core/Makefile
+++ b/sound/core/Makefile
--- a/sound/soc/soc-dmaengine-pcm.c
+++ b/sound/soc/soc-dmaengine-pcm.c
--- a/sound/soc/Kconfig
+++ b/sound/soc/Kconfig
--- a/sound/soc/Makefile
+++ b/sound/soc/Makefile
--- 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-pcm-dma.c
+++ b/sound/soc/atmel/atmel-pcm-dma.c
--- a/sound/soc/atmel/atmel_ssc_dai.c
+++ b/sound/soc/atmel/atmel_ssc_dai.c
--- a/sound/soc/atmel/atmel_wm8904.c
+++ b/sound/soc/atmel/atmel_wm8904.c
--- a/sound/soc/atmel/sam9x5_wm8731.c
+++ b/sound/soc/atmel/sam9x5_wm8731.c
--- a/sound/soc/au1x/db1200.c
+++ b/sound/soc/au1x/db1200.c
--- a/sound/soc/au1x/psc-ac97.c
+++ b/sound/soc/au1x/psc-ac97.c
--- a/sound/soc/blackfin/bf5xx-ac97.h
+++ b/sound/soc/blackfin/bf5xx-ac97.h
--- a/sound/soc/cirrus/ep93xx-ac97.c
+++ b/sound/soc/cirrus/ep93xx-ac97.c
--- 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/ac97.c
+++ b/sound/soc/codecs/ac97.c
--- a/sound/soc/codecs/ad1980.c
+++ b/sound/soc/codecs/ad1980.c
--- a/sound/soc/codecs/ad73311.c
+++ b/sound/soc/codecs/ad73311.c
--- a/sound/soc/codecs/adau1701.c
+++ b/sound/soc/codecs/adau1701.c
--- a/sound/soc/codecs/adav80x.c
+++ b/sound/soc/codecs/adav80x.c
--- a/sound/soc/codecs/ads117x.c
+++ b/sound/soc/codecs/ads117x.c
--- a/sound/soc/codecs/ak4104.c
+++ b/sound/soc/codecs/ak4104.c
--- a/sound/soc/codecs/ak4554.c
+++ b/sound/soc/codecs/ak4554.c
--- a/sound/soc/codecs/ak5386.c
+++ b/sound/soc/codecs/ak5386.c
--- a/sound/soc/codecs/arizona.c
+++ b/sound/soc/codecs/arizona.c
--- a/sound/soc/codecs/arizona.h
+++ b/sound/soc/codecs/arizona.h
--- a/sound/soc/codecs/bt-sco.c
+++ b/sound/soc/codecs/bt-sco.c
--- a/sound/soc/codecs/cs4270.c
+++ b/sound/soc/codecs/cs4270.c
--- a/sound/soc/codecs/cs4271.c
+++ b/sound/soc/codecs/cs4271.c
--- a/sound/soc/codecs/hdmi.c
+++ b/sound/soc/codecs/hdmi.c
--- a/sound/soc/codecs/lm4857.c
+++ b/sound/soc/codecs/lm4857.c
--- a/sound/soc/codecs/max9768.c
+++ b/sound/soc/codecs/max9768.c
--- a/sound/soc/codecs/max98090.c
+++ b/sound/soc/codecs/max98090.c
--- a/sound/soc/codecs/max9877.c
+++ b/sound/soc/codecs/max9877.c
--- a/sound/soc/codecs/mc13783.c
+++ b/sound/soc/codecs/mc13783.c
--- a/sound/soc/codecs/pcm1681.c
+++ b/sound/soc/codecs/pcm1681.c
--- a/sound/soc/codecs/pcm1792a.c
+++ b/sound/soc/codecs/pcm1792a.c
--- a/sound/soc/codecs/pcm1792a.h
+++ b/sound/soc/codecs/pcm1792a.h
--- a/sound/soc/codecs/pcm3008.c
+++ b/sound/soc/codecs/pcm3008.c
--- a/sound/soc/codecs/rt5640.c
+++ b/sound/soc/codecs/rt5640.c
--- a/sound/soc/codecs/sgtl5000.c
+++ b/sound/soc/codecs/sgtl5000.c
--- a/sound/soc/codecs/si476x.c
+++ b/sound/soc/codecs/si476x.c
--- a/sound/soc/codecs/spdif_receiver.c
+++ b/sound/soc/codecs/spdif_receiver.c
--- a/sound/soc/codecs/spdif_transmitter.c
+++ b/sound/soc/codecs/spdif_transmitter.c
--- a/sound/soc/codecs/sta32x.c
+++ b/sound/soc/codecs/sta32x.c
--- a/sound/soc/codecs/tlv320aic26.c
+++ b/sound/soc/codecs/tlv320aic26.c
--- a/sound/soc/codecs/tlv320aic3x.c
+++ b/sound/soc/codecs/tlv320aic3x.c
--- a/sound/soc/codecs/twl4030.c
+++ b/sound/soc/codecs/twl4030.c
--- a/sound/soc/codecs/twl6040.c
+++ b/sound/soc/codecs/twl6040.c
--- a/sound/soc/codecs/uda134x.c
+++ b/sound/soc/codecs/uda134x.c
--- a/sound/soc/codecs/wl1273.c
+++ b/sound/soc/codecs/wl1273.c
--- a/sound/soc/codecs/wm0010.c
+++ b/sound/soc/codecs/wm0010.c
--- a/Show more
+++ b/Show more