Merge branch 'asoc-fix-ep93xx' into spi-fix-ep93xx

2026-10-09 18:15:49 +00:00 · 2016-05-26 11:13:12 +01:00 · 2016-05-26 11:13:12 +01:00 · bea8205fee
commit bea8205fee
parent c4e85b7e6f f7aa23cb8d
83 changed files with 3298 additions and 486 deletions
--- a/Documentation/devicetree/bindings/sound/davinci-mcbsp.txt
+++ b/Documentation/devicetree/bindings/sound/davinci-mcbsp.txt
--- a/Documentation/devicetree/bindings/sound/fsl-sai.txt
+++ b/Documentation/devicetree/bindings/sound/fsl-sai.txt
--- a/Documentation/devicetree/bindings/sound/pcm5102a.txt
+++ b/Documentation/devicetree/bindings/sound/pcm5102a.txt
--- a/1
+++ b/1
--- a/drivers/spi/spi-ep93xx.c
+++ b/drivers/spi/spi-ep93xx.c
--- a/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h
+++ b/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h
--- a/include/sound/dmaengine_pcm.h
+++ b/include/sound/dmaengine_pcm.h
--- a/include/sound/hdaudio_ext.h
+++ b/include/sound/hdaudio_ext.h
--- a/include/sound/hdmi-codec.h
+++ b/include/sound/hdmi-codec.h
--- a/include/sound/pcm_iec958.h
+++ b/include/sound/pcm_iec958.h
--- a/include/sound/soc-dapm.h
+++ b/include/sound/soc-dapm.h
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
--- a/sound/core/pcm_dmaengine.c
+++ b/sound/core/pcm_dmaengine.c
--- a/sound/core/pcm_iec958.c
+++ b/sound/core/pcm_iec958.c
--- a/sound/hda/ext/hdac_ext_bus.c
+++ b/sound/hda/ext/hdac_ext_bus.c
--- a/sound/hda/ext/hdac_ext_controller.c
+++ b/sound/hda/ext/hdac_ext_controller.c
--- a/sound/hda/local.h
+++ b/sound/hda/local.h
--- a/sound/soc/atmel/atmel_ssc_dai.c
+++ b/sound/soc/atmel/atmel_ssc_dai.c
--- a/sound/soc/au1x/dbdma2.c
+++ b/sound/soc/au1x/dbdma2.c
--- a/sound/soc/bcm/bcm2835-i2s.c
+++ b/sound/soc/bcm/bcm2835-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/ak4642.c
+++ b/sound/soc/codecs/ak4642.c
--- a/sound/soc/codecs/arizona.c
+++ b/sound/soc/codecs/arizona.c
--- a/sound/soc/codecs/cs42l56.c
+++ b/sound/soc/codecs/cs42l56.c
--- a/sound/soc/codecs/cs47l24.c
+++ b/sound/soc/codecs/cs47l24.c
--- a/sound/soc/codecs/da7213.c
+++ b/sound/soc/codecs/da7213.c
--- a/sound/soc/codecs/da7213.h
+++ b/sound/soc/codecs/da7213.h
--- a/sound/soc/codecs/da7218.c
+++ b/sound/soc/codecs/da7218.c
--- a/sound/soc/codecs/da7218.h
+++ b/sound/soc/codecs/da7218.h
--- a/sound/soc/codecs/da7219.c
+++ b/sound/soc/codecs/da7219.c
--- a/sound/soc/codecs/da7219.h
+++ b/sound/soc/codecs/da7219.h
--- a/sound/soc/codecs/es8328.c
+++ b/sound/soc/codecs/es8328.c
--- a/sound/soc/codecs/es8328.h
+++ b/sound/soc/codecs/es8328.h
--- a/sound/soc/codecs/hdac_hdmi.c
+++ b/sound/soc/codecs/hdac_hdmi.c
--- a/sound/soc/codecs/hdmi-codec.c
+++ b/sound/soc/codecs/hdmi-codec.c
--- a/sound/soc/codecs/pcm5102a.c
+++ b/sound/soc/codecs/pcm5102a.c
--- a/sound/soc/codecs/rt298.c
+++ b/sound/soc/codecs/rt298.c
--- a/sound/soc/codecs/rt5645.c
+++ b/sound/soc/codecs/rt5645.c
--- a/sound/soc/codecs/wm5102.c
+++ b/sound/soc/codecs/wm5102.c
--- a/sound/soc/codecs/wm5110.c
+++ b/sound/soc/codecs/wm5110.c
--- a/sound/soc/codecs/wm_adsp.c
+++ b/sound/soc/codecs/wm_adsp.c
--- a/sound/soc/codecs/wm_adsp.h
+++ b/sound/soc/codecs/wm_adsp.h
--- a/sound/soc/davinci/Kconfig
+++ b/sound/soc/davinci/Kconfig
--- a/sound/soc/davinci/davinci-i2s.c
+++ b/sound/soc/davinci/davinci-i2s.c
--- a/sound/soc/davinci/davinci-mcasp.c
+++ b/sound/soc/davinci/davinci-mcasp.c
--- a/sound/soc/davinci/davinci-mcasp.h
+++ b/sound/soc/davinci/davinci-mcasp.h
--- a/sound/soc/dwc/designware_i2s.c
+++ b/sound/soc/dwc/designware_i2s.c
--- a/sound/soc/fsl/fsl_sai.c
+++ b/sound/soc/fsl/fsl_sai.c
--- a/sound/soc/fsl/fsl_ssi.c
+++ b/sound/soc/fsl/fsl_ssi.c
--- a/sound/soc/fsl/imx-pcm-fiq.c
+++ b/sound/soc/fsl/imx-pcm-fiq.c
--- a/sound/soc/intel/Kconfig
+++ b/sound/soc/intel/Kconfig
--- a/sound/soc/intel/atom/sst-atom-controls.c
+++ b/sound/soc/intel/atom/sst-atom-controls.c
--- a/sound/soc/intel/boards/Makefile
+++ b/sound/soc/intel/boards/Makefile
--- a/sound/soc/intel/boards/broadwell.c
+++ b/sound/soc/intel/boards/broadwell.c
--- a/sound/soc/intel/boards/bxt_rt298.c
+++ b/sound/soc/intel/boards/bxt_rt298.c
--- a/sound/soc/intel/boards/bytcr_rt5640.c
+++ b/sound/soc/intel/boards/bytcr_rt5640.c
--- a/sound/soc/intel/boards/bytcr_rt5651.c
+++ b/sound/soc/intel/boards/bytcr_rt5651.c
--- a/sound/soc/intel/boards/cht_bsw_max98090_ti.c
+++ b/sound/soc/intel/boards/cht_bsw_max98090_ti.c
--- a/sound/soc/intel/boards/cht_bsw_rt5645.c
+++ b/sound/soc/intel/boards/cht_bsw_rt5645.c
--- a/sound/soc/intel/boards/cht_bsw_rt5672.c
+++ b/sound/soc/intel/boards/cht_bsw_rt5672.c
--- a/sound/soc/intel/boards/haswell.c
+++ b/sound/soc/intel/boards/haswell.c
--- a/sound/soc/intel/boards/skl_nau88l25_max98357a.c
+++ b/sound/soc/intel/boards/skl_nau88l25_max98357a.c
--- a/sound/soc/intel/boards/skl_nau88l25_ssm4567.c
+++ b/sound/soc/intel/boards/skl_nau88l25_ssm4567.c
--- a/sound/soc/intel/boards/skl_rt286.c
+++ b/sound/soc/intel/boards/skl_rt286.c
--- a/sound/soc/intel/common/sst-acpi.h
+++ b/sound/soc/intel/common/sst-acpi.h
--- a/sound/soc/intel/haswell/sst-haswell-pcm.c
+++ b/sound/soc/intel/haswell/sst-haswell-pcm.c
--- a/sound/soc/intel/skylake/Makefile
+++ b/sound/soc/intel/skylake/Makefile
--- a/sound/soc/intel/skylake/bxt-sst.c
+++ b/sound/soc/intel/skylake/bxt-sst.c
--- a/sound/soc/intel/skylake/skl-messages.c
+++ b/sound/soc/intel/skylake/skl-messages.c
--- a/sound/soc/intel/skylake/skl-nhlt.c
+++ b/sound/soc/intel/skylake/skl-nhlt.c
--- a/sound/soc/intel/skylake/skl-pcm.c
+++ b/sound/soc/intel/skylake/skl-pcm.c
--- a/sound/soc/intel/skylake/skl-sst-dsp.c
+++ b/sound/soc/intel/skylake/skl-sst-dsp.c
--- a/sound/soc/intel/skylake/skl-sst-dsp.h
+++ b/sound/soc/intel/skylake/skl-sst-dsp.h
--- a/sound/soc/intel/skylake/skl-sst.c
+++ b/sound/soc/intel/skylake/skl-sst.c
--- a/sound/soc/intel/skylake/skl-topology.c
+++ b/sound/soc/intel/skylake/skl-topology.c
--- a/sound/soc/intel/skylake/skl-topology.h
+++ b/sound/soc/intel/skylake/skl-topology.h
--- a/sound/soc/intel/skylake/skl-tplg-interface.h
+++ b/sound/soc/intel/skylake/skl-tplg-interface.h
--- a/sound/soc/intel/skylake/skl.c
+++ b/sound/soc/intel/skylake/skl.c
--- a/sound/soc/intel/skylake/skl.h
+++ b/sound/soc/intel/skylake/skl.h
--- a/sound/soc/rockchip/rockchip_i2s.c
+++ b/sound/soc/rockchip/rockchip_i2s.c
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
--- a/sound/soc/soc-generic-dmaengine-pcm.c
+++ b/sound/soc/soc-generic-dmaengine-pcm.c