Subject: linux-next: manual merge of the sound-asoc tree with the sound tree

From: Stephen Rothwell <[email-masked]>
Date: Fri, 9 Aug 2019 13:31:59 +1000

Hi all,

Today's linux-next merge of the sound-asoc tree got a conflict in:

  sound/soc/sof/intel/hda-dsp.c

between commit:

  19abfefd4c76 ("ALSA: hda: Direct MMIO accesses")

from the sound tree and commits:

  fd15f2f5e272 ("ASoC: SOF: Intel: hda: Enable jack detection")
  d06973515f95 ("ASoC: SOF: Intel: hda: use SOF defined init chip in resume")

from the sound-asoc tree.

I fixed it up (I used the latter version and added the following merge
fix patch) and can carry the fix as necessary. This is now fixed as far as
linux-next is concerned, but any non trivial conflicts should be mentioned
to your upstream maintainer when your tree is submitted for merging.
You may also want to consider cooperating with the maintainer of the
conflicting tree to minimise any particularly complex conflicts.

From: Stephen Rothwell <[email-masked]>
Date: Fri, 9 Aug 2019 13:28:00 +1000
Subject: [PATCH] ASoc: SOF: Intel: hda: merge fix up for "ALSA: hda: Direct MMIO accesses"

Signed-off-by: Stephen Rothwell <[email-masked]>
---
 sound/soc/sof/intel/hda-ctrl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/soc/sof/intel/hda-ctrl.c b/sound/soc/sof/intel/hda-ctrl.c
index a7fee403cb90..bc41028a7a01 100644
--- a/sound/soc/sof/intel/hda-ctrl.c
+++ b/sound/soc/sof/intel/hda-ctrl.c
@@ -254,7 +254,7 @@ int hda_dsp_ctrl_init_chip(struct snd_sof_dev *sdev, bool full_reset)
 #if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA)
 	/* Reset stream-to-link mapping */
 	list_for_each_entry(hlink, &bus->hlink_list, list)
-		bus->io_ops->reg_writel(0, hlink->ml_addr + AZX_REG_ML_LOSIDV);
+		writel(0, hlink->ml_addr + AZX_REG_ML_LOSIDV);
 #endif
 
 	bus->chip_init = true;
-- 
2.20.1

-- 
Cheers,
Stephen Rothwell