Merge remote-tracking branches 'asoc/topic/adsp', 'asoc/topic/ak4624', 'asoc/topic...

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

diff --cc sound/soc/codecs/cs47l24.c
index 00e9b6f,e42ba06,576087b,576087b,576087b..5ec5a68
--- 1/sound/soc/codecs/cs47l24.c
--- 2/sound/soc/codecs/cs47l24.c
--- 3/sound/soc/codecs/cs47l24.c
--- 4/sound/soc/codecs/cs47l24.c
--- 5/sound/soc/codecs/cs47l24.c
+++ b/sound/soc/codecs/cs47l24.c
@@@@@@ -1041,10 -1067,16 -1041,10 -1041,10 -1041,10 +1067,16 @@@@@@ static irqreturn_t cs47l24_adsp2_irq(in
     {
        struct cs47l24_priv *priv = data;
        struct arizona *arizona = priv->core.arizona;
- ---   int ret;
+ +++   int serviced = 0;
+ +++   int i, ret;
  +++
-       ret = wm_adsp_compr_handle_irq(&priv->core.adsp[2]);
-       if (ret == -ENODEV) {
+ +++   for (i = 1; i <= 2; ++i) {
+ +++           ret = wm_adsp_compr_handle_irq(&priv->core.adsp[i]);
+ +++           if (ret != -ENODEV)
+ +++                   serviced++;
+ +++   }
+    
  ---   ret = wm_adsp_compr_handle_irq(&priv->core.adsp[2]);
  ---   if (ret == -ENODEV) {
+ +++   if (!serviced) {
                dev_err(arizona->dev, "Spurious compressed data IRQ\n");
                return IRQ_NONE;
        }

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

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