Merge branch 'fix/intel' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

Conflicts:
	sound/soc/intel/sst-baytrail-dsp.c

diff --cc sound/soc/intel/sst-baytrail-dsp.c
index 4a5d489,adf0aca..fc58876
--- 1/sound/soc/intel/sst-baytrail-dsp.c
--- 2/sound/soc/intel/sst-baytrail-dsp.c
+++ b/sound/soc/intel/sst-baytrail-dsp.c
@@@ -324,7 -317,14 +324,7 @@@ static int sst_byt_init(struct sst_dsp 
                return ret;
        }
  
-       ret = dma_coerce_mask_and_coherent(dev, DMA_BIT_MASK(32));
 -      /*
 -       * save the physical address of extended firmware block in the first
 -       * 4 bytes of the mailbox
 -       */
 -      memcpy_toio(sst->addr.lpe + SST_BYT_MAILBOX_OFFSET,
 -             &pdata->fw_base, sizeof(u32));
 -
+       ret = dma_coerce_mask_and_coherent(sst->dma_dev, DMA_BIT_MASK(32));
        if (ret)
                return ret;
  

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

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

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