ASoC: Pull in fixes

Cleanups for the dmaengine code build on top of current fixes.

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

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

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

diff --cc sound/soc/codecs/wm8960.c
index 92fcd335c5de98a15753144aa3a2ddbda524edb8,08c87ac161373940e9f22bc608e3e2c2110c6523..8c8f32b230838ffb62fa52983bb4ae0a630ab17e
--- 1/sound/soc/codecs/wm8960.c
--- 2/sound/soc/codecs/wm8960.c
+++ b/sound/soc/codecs/wm8960.c
@@@ -1506,9 -1519,10 +1518,10 @@@ MODULE_DEVICE_TABLE(acpi, wm8960_acpi_m
  static struct i2c_driver wm8960_i2c_driver = {
        .driver = {
                .name = "wm8960",
-               .of_match_table = wm8960_of_match,
+               .of_match_table = of_match_ptr(wm8960_of_match),
+               .acpi_match_table = ACPI_PTR(wm8960_acpi_match),
        },
 -      .probe =    wm8960_i2c_probe,
 +      .probe_new = wm8960_i2c_probe,
        .remove =   wm8960_i2c_remove,
        .id_table = wm8960_i2c_id,
  };

diff --cc sound/soc/generic/simple-card-utils.c
Simple merge

diff --cc sound/soc/sof/ipc3-topology.c
Simple merge

diff --cc sound/soc/sof/sof-pci-dev.c
Simple merge