Merge tag 'v5.2-rc6' into asoc-5.3

Linux 5.2-rc6

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/gpu/drm/vc4/vc4_hdmi.c
Simple merge

diff --cc include/sound/hda_codec.h
Simple merge

diff --cc sound/hda/ext/hdac_ext_bus.c
Simple merge

diff --cc sound/soc/atmel/atmel-classd.c
Simple merge

diff --cc sound/soc/atmel/atmel-pdmic.c
Simple merge

diff --cc sound/soc/atmel/atmel_wm8904.c
Simple merge

diff --cc sound/soc/atmel/mikroe-proto.c
Simple merge

diff --cc sound/soc/atmel/sam9g20_wm8731.c
Simple merge

diff --cc sound/soc/atmel/sam9x5_wm8731.c
Simple merge

diff --cc sound/soc/au1x/db1000.c
Simple merge

diff --cc sound/soc/au1x/db1200.c
Simple merge

diff --cc sound/soc/cirrus/edb93xx.c
Simple merge

diff --cc sound/soc/cirrus/simone.c
Simple merge

diff --cc sound/soc/cirrus/snappercl15.c
Simple merge

diff --cc sound/soc/codecs/Kconfig
Simple merge

diff --cc sound/soc/codecs/hdac_hdmi.c
Simple merge

diff --cc sound/soc/codecs/hdmi-codec.c
Simple merge

diff --cc sound/soc/codecs/max98357a.c
Simple merge

diff --cc sound/soc/codecs/pcm3168a.c
Simple merge

diff --cc sound/soc/codecs/rt5514-spi.c
Simple merge

diff --cc sound/soc/codecs/rt5677-spi.c
Simple merge

diff --cc sound/soc/codecs/rt5677.c
Simple merge

diff --cc sound/soc/codecs/rt5677.h
Simple merge

diff --cc sound/soc/codecs/tas571x.c
Simple merge

diff --cc sound/soc/codecs/tlv320aic3x.c
Simple merge

diff --cc sound/soc/codecs/wm_adsp.c
Simple merge

diff --cc sound/soc/intel/Kconfig
Simple merge

diff --cc sound/soc/intel/atom/sst/sst_acpi.c
Simple merge

diff --cc sound/soc/intel/boards/Kconfig
Simple merge

diff --cc sound/soc/intel/boards/bdw-rt5677.c
Simple merge

diff --cc sound/soc/intel/boards/broadwell.c
Simple merge

diff --cc sound/soc/intel/boards/bxt_da7219_max98357a.c
index 0f7610c5fd534b693627d497674e2efc589884da,1c4f4c124b00a1333b84418849fa7b9397b762e8..c0d865a940dce428b93a57dbc4424233054557a9
--- 1/sound/soc/intel/boards/bxt_da7219_max98357a.c
--- 2/sound/soc/intel/boards/bxt_da7219_max98357a.c
+++ b/sound/soc/intel/boards/bxt_da7219_max98357a.c
@@@ -5,17 -6,9 +6,8 @@@
   *
   * Modified from:
   *   Intel Skylake I2S Machine driver
-  *
-  * This program is free software; you can redistribute it and/or
-  * modify it under the terms of the GNU General Public License version
-  * 2 as published by the Free Software Foundation.
-  *
-  * This program is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  * GNU General Public License for more details.
   */
  
 -#include <asm/cpu_device_id.h>
  #include <linux/input.h>
  #include <linux/module.h>
  #include <linux/platform_device.h>

diff --cc sound/soc/intel/boards/bxt_rt298.c
Simple merge

diff --cc sound/soc/intel/boards/byt-max98090.c
Simple merge

diff --cc sound/soc/intel/boards/byt-rt5640.c
Simple merge

diff --cc sound/soc/intel/boards/bytcht_da7213.c
Simple merge

diff --cc sound/soc/intel/boards/bytcht_es8316.c
Simple merge

diff --cc sound/soc/intel/boards/bytcht_nocodec.c
Simple merge

diff --cc sound/soc/intel/boards/bytcr_rt5640.c
Simple merge

diff --cc sound/soc/intel/boards/bytcr_rt5651.c
Simple merge

diff --cc sound/soc/intel/boards/cht_bsw_max98090_ti.c
Simple merge

diff --cc sound/soc/intel/boards/cht_bsw_nau8824.c
Simple merge

diff --cc sound/soc/intel/boards/cht_bsw_rt5645.c
Simple merge

diff --cc sound/soc/intel/boards/cht_bsw_rt5672.c
Simple merge

diff --cc sound/soc/intel/boards/haswell.c
Simple merge

diff --cc sound/soc/intel/boards/kbl_rt5663_max98927.c
Simple merge

diff --cc sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c
Simple merge

diff --cc sound/soc/intel/boards/skl_nau88l25_max98357a.c
Simple merge

diff --cc sound/soc/intel/boards/skl_nau88l25_ssm4567.c
Simple merge

diff --cc sound/soc/intel/boards/skl_rt286.c
Simple merge

diff --cc sound/soc/intel/common/soc-acpi-intel-byt-match.c
Simple merge

diff --cc sound/soc/intel/common/soc-acpi-intel-cht-match.c
Simple merge

diff --cc sound/soc/intel/common/sst-ipc.c
Simple merge

diff --cc sound/soc/intel/skylake/cnl-sst.c
Simple merge

diff --cc sound/soc/intel/skylake/skl-debug.c
Simple merge

diff --cc sound/soc/intel/skylake/skl-messages.c
Simple merge

diff --cc sound/soc/intel/skylake/skl-pcm.c
Simple merge

diff --cc sound/soc/intel/skylake/skl-sst-dsp.h
Simple merge

diff --cc sound/soc/intel/skylake/skl-sst-ipc.c
Simple merge

diff --cc sound/soc/intel/skylake/skl-sst-utils.c
Simple merge

diff --cc sound/soc/intel/skylake/skl-sst.c
Simple merge

diff --cc sound/soc/intel/skylake/skl-topology.c
Simple merge

diff --cc sound/soc/intel/skylake/skl-topology.h
Simple merge

diff --cc sound/soc/intel/skylake/skl.c
Simple merge

diff --cc sound/soc/intel/skylake/skl.h
Simple merge

diff --cc sound/soc/jz4740/qi_lb60.c
Simple merge

diff --cc sound/soc/kirkwood/armada-370-db.c
Simple merge

diff --cc sound/soc/meson/Kconfig
Simple merge

diff --cc sound/soc/mxs/mxs-sgtl5000.c
Simple merge

diff --cc sound/soc/nuc900/nuc900-audio.c
Simple merge

diff --cc sound/soc/pxa/brownstone.c
Simple merge

diff --cc sound/soc/pxa/corgi.c
Simple merge

diff --cc sound/soc/pxa/e740_wm9705.c
Simple merge

diff --cc sound/soc/pxa/e750_wm9705.c
Simple merge

diff --cc sound/soc/pxa/e800_wm9712.c
Simple merge

diff --cc sound/soc/pxa/em-x270.c
Simple merge

diff --cc sound/soc/pxa/hx4700.c
Simple merge

diff --cc sound/soc/pxa/imote2.c
Simple merge

diff --cc sound/soc/pxa/magician.c
Simple merge

diff --cc sound/soc/pxa/mioa701_wm9713.c
Simple merge

diff --cc sound/soc/pxa/palm27x.c
Simple merge

diff --cc sound/soc/pxa/poodle.c
Simple merge

diff --cc sound/soc/pxa/spitz.c
Simple merge

diff --cc sound/soc/pxa/tosa.c
Simple merge

diff --cc sound/soc/pxa/ttc-dkb.c
Simple merge

diff --cc sound/soc/pxa/z2.c
Simple merge

diff --cc sound/soc/pxa/zylonite.c
Simple merge

diff --cc sound/soc/qcom/apq8016_sbc.c
Simple merge

diff --cc sound/soc/qcom/storm.c
Simple merge

diff --cc sound/soc/rockchip/Kconfig
Simple merge

diff --cc sound/soc/rockchip/rk3288_hdmi_analog.c
Simple merge

diff --cc sound/soc/rockchip/rk3399_gru_sound.c
Simple merge

diff --cc sound/soc/rockchip/rockchip_max98090.c
Simple merge

diff --cc sound/soc/rockchip/rockchip_rt5645.c
Simple merge

diff --cc sound/soc/sirf/sirf-audio.c
Simple merge

diff --cc sound/soc/soc-core.c
Simple merge

diff --cc sound/soc/sof/Kconfig
Simple merge

diff --cc sound/soc/sof/intel/Kconfig
Simple merge

diff --cc sound/soc/stm/stm32_i2s.c
index 8846f49b2951ba30651cd2de5f4a9091a4bc2b1d,01ed5e4c1cc0c6392c7c95abb23e175f02102675..ba6452dab69b37633cc80188df01dc3470a6ec40
--- 1/sound/soc/stm/stm32_i2s.c
--- 2/sound/soc/stm/stm32_i2s.c
+++ b/sound/soc/stm/stm32_i2s.c
@@@ -3,20 -4,8 +4,9 @@@
   *
   * Copyright (C) 2017, STMicroelectronics - All Rights Reserved
   * Author(s): Olivier Moysan <olivier.moysan@st.com> for STMicroelectronics.
-  *
-  * License terms: GPL V2.0.
-  *
-  * This program is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU General Public License version 2 as published by
-  * the Free Software Foundation.
-  *
-  * This program is distributed in the hope that it will be useful, but
-  * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
-  * details.
   */
  
 +#include <linux/bitfield.h>
  #include <linux/clk.h>
  #include <linux/delay.h>
  #include <linux/module.h>

diff --cc sound/soc/stm/stm32_sai.c
Simple merge

diff --cc sound/soc/stm/stm32_sai.h
Simple merge

diff --cc sound/soc/stm/stm32_sai_sub.c
Simple merge

diff --cc sound/soc/stm/stm32_spdifrx.c
index 4a3fad4a711f29de4a5749af94816b00e21ea8d8,56d79695577c51c1815c463a1e5df53766c4a2ed..ee71b898897bd62b1e1884d869c97b2a4484fcb1
--- 1/sound/soc/stm/stm32_spdifrx.c
--- 2/sound/soc/stm/stm32_spdifrx.c
+++ b/sound/soc/stm/stm32_spdifrx.c
@@@ -3,20 -4,8 +4,9 @@@
   *
   * Copyright (C) 2017, STMicroelectronics - All Rights Reserved
   * Author(s): Olivier Moysan <olivier.moysan@st.com> for STMicroelectronics.
-  *
-  * License terms: GPL V2.0.
-  *
-  * This program is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU General Public License version 2 as published by
-  * the Free Software Foundation.
-  *
-  * This program is distributed in the hope that it will be useful, but
-  * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
-  * details.
   */
  
 +#include <linux/bitfield.h>
  #include <linux/clk.h>
  #include <linux/completion.h>
  #include <linux/delay.h>

diff --cc sound/soc/sunxi/sun4i-codec.c
Simple merge

diff --cc sound/soc/sunxi/sun4i-i2s.c
Simple merge

diff --cc sound/soc/sunxi/sun4i-spdif.c
Simple merge

diff --cc sound/soc/tegra/tegra_alc5632.c
Simple merge

diff --cc sound/soc/tegra/tegra_max98090.c
Simple merge

diff --cc sound/soc/tegra/tegra_rt5640.c
Simple merge

diff --cc sound/soc/tegra/tegra_rt5677.c
Simple merge

diff --cc sound/soc/tegra/tegra_sgtl5000.c
Simple merge

diff --cc sound/soc/tegra/tegra_wm8753.c
Simple merge

diff --cc sound/soc/tegra/tegra_wm8903.c
Simple merge

diff --cc sound/soc/tegra/tegra_wm9712.c
Simple merge

diff --cc sound/soc/tegra/trimslice.c
Simple merge

diff --cc sound/soc/ti/ams-delta.c
Simple merge

diff --cc sound/soc/ti/davinci-evm.c
Simple merge

diff --cc sound/soc/ti/davinci-mcasp.c
Simple merge

diff --cc sound/soc/ti/n810.c
Simple merge

diff --cc sound/soc/ti/omap-abe-twl6040.c
Simple merge

diff --cc sound/soc/ti/omap-hdmi.c
Simple merge

diff --cc sound/soc/ti/omap-twl4030.c
Simple merge

diff --cc sound/soc/ti/omap3pandora.c
Simple merge

diff --cc sound/soc/ti/osk5912.c
Simple merge

diff --cc sound/soc/ti/rx51.c
Simple merge

diff --cc sound/soc/txx9/txx9aclc-generic.c
Simple merge

diff --cc sound/soc/ux500/mop500.c
Simple merge

diff --cc sound/usb/bcd2000/Makefile
index 0a100310a671e205ce01fb62c4383121606efaa7,99546074e5f47ddb1931d708b92608f9e7e6fd00..e2d916e24787f96344e44b81bd3aaf7aa8e69e85
--- 1/sound/usb/bcd2000/Makefile
--- 2/sound/usb/bcd2000/Makefile
+++ b/sound/usb/bcd2000/Makefile
@@@ -1,3 -1,4 +1,4 @@@
+ # SPDX-License-Identifier: GPL-2.0-only
  snd-bcd2000-y := bcd2000.o
  
 -obj-$(CONFIG_SND_BCD2000) += snd-bcd2000.o
 +obj-$(CONFIG_SND_BCD2000) += snd-bcd2000.o