Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
* linux-next: manual merge of the sound-asoc tree with the sound tree
@ 2019-08-09  3:31 Stephen Rothwell
  0 siblings, 0 replies; 5+ messages in thread
From: Stephen Rothwell @ 2019-08-09  3:31 UTC (permalink / raw)
  To: Mark Brown, Liam Girdwood, Takashi Iwai
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Rander Wang,
	Guennadi Liakhovetski, Pierre-Louis Bossart, Zhu Yingjiang

[-- Attachment #1: Type: text/plain, Size: 1785 bytes --]

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 <sfr@canb.auug.org.au>
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 <sfr@canb.auug.org.au>
---
 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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 5+ messages in thread

* linux-next: manual merge of the sound-asoc tree with the sound tree
@ 2019-08-09  3:16 Stephen Rothwell
  0 siblings, 0 replies; 5+ messages in thread
From: Stephen Rothwell @ 2019-08-09  3:16 UTC (permalink / raw)
  To: Mark Brown, Liam Girdwood, Takashi Iwai
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Cezary Rojewski

[-- Attachment #1: Type: text/plain, Size: 1316 bytes --]

Hi all,

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

  sound/soc/intel/skylake/skl.c

between commit:

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

from the sound tree and commit:

  bcc2a2dc3ba8 ("ASoC: Intel: Skylake: Merge skl_sst and skl into skl_dev struct")

from the sound-asoc tree.

I fixed it up (see below) 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.

-- 
Cheers,
Stephen Rothwell

diff --cc sound/soc/intel/skylake/skl.c
index 239348b0596b,6be25e617c21..000000000000
--- a/sound/soc/intel/skylake/skl.c
+++ b/sound/soc/intel/skylake/skl.c
@@@ -858,10 -854,11 +858,10 @@@ out_err
   * constructor
   */
  static int skl_create(struct pci_dev *pci,
- 		      struct skl **rskl)
 -		      const struct hdac_io_ops *io_ops,
+ 		      struct skl_dev **rskl)
  {
  	struct hdac_ext_bus_ops *ext_ops = NULL;
- 	struct skl *skl;
+ 	struct skl_dev *skl;
  	struct hdac_bus *bus;
  	struct hda_bus *hbus;
  	int err;

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: linux-next: manual merge of the sound-asoc tree with the sound tree
  2019-08-01  2:50 Stephen Rothwell
@ 2019-08-01 16:46 ` Pierre-Louis Bossart
  0 siblings, 0 replies; 5+ messages in thread
From: Pierre-Louis Bossart @ 2019-08-01 16:46 UTC (permalink / raw)
  To: Stephen Rothwell, Mark Brown, Liam Girdwood, Takashi Iwai
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Cezary Rojewski



On 7/31/19 9:50 PM, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the sound-asoc tree got conflicts in:
> 
>    sound/soc/intel/skylake/skl-nhlt.c
>    sound/soc/intel/skylake/skl.h
> 
> between commit:
> 
>    1169cbf6b98e ("ASoC: Intel: Skylake: use common NHLT module")
> 
> from the sound tree and commit:
> 
>    bcc2a2dc3ba8 ("ASoC: Intel: Skylake: Merge skl_sst and skl into skl_dev struct")
> 
> from the sound-asoc tree.
> 
> I fixed it up (I think, see below (I used the sound tree version of
> ound/soc/intel/skylake/skl-nhlt.c)) 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.

Mark, this comes my NHLT fixes merged by Takashi and available on his 
topic/hda-dmic branch.

This can be fixed by merging this topic/hda-dmic into your for-next 
branch, with a minor set of merge conflicts already identified by Stephen.

If you don't like merge conflicts, we can also do this with 
revert-merge-reapply, I pushed a branch 
https://github.com/plbossart/sound/commits/fix/nhlt-conflicts to provide 
the sequence needed

Sorry about that, let me know if I can help further.
-Pierre


^ permalink raw reply	[flat|nested] 5+ messages in thread

* linux-next: manual merge of the sound-asoc tree with the sound tree
@ 2019-08-01  2:50 Stephen Rothwell
  2019-08-01 16:46 ` Pierre-Louis Bossart
  0 siblings, 1 reply; 5+ messages in thread
From: Stephen Rothwell @ 2019-08-01  2:50 UTC (permalink / raw)
  To: Mark Brown, Liam Girdwood, Takashi Iwai
  Cc: Linux Next Mailing List, Linux Kernel Mailing List,
	Pierre-Louis Bossart, Cezary Rojewski

[-- Attachment #1: Type: text/plain, Size: 3373 bytes --]

Hi all,

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

  sound/soc/intel/skylake/skl-nhlt.c
  sound/soc/intel/skylake/skl.h

between commit:

  1169cbf6b98e ("ASoC: Intel: Skylake: use common NHLT module")

from the sound tree and commit:

  bcc2a2dc3ba8 ("ASoC: Intel: Skylake: Merge skl_sst and skl into skl_dev struct")

from the sound-asoc tree.

I fixed it up (I think, see below (I used the sound tree version of
ound/soc/intel/skylake/skl-nhlt.c)) 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.

-- 
Cheers,
Stephen Rothwell

diff --cc sound/soc/intel/skylake/skl-nhlt.c
index 6f57ceb9efb7,6fc3a190067e..000000000000
--- a/sound/soc/intel/skylake/skl-nhlt.c
+++ b/sound/soc/intel/skylake/skl-nhlt.c
diff --cc sound/soc/intel/skylake/skl.h
index f4dd6c767993,600a61f79b0a..000000000000
--- a/sound/soc/intel/skylake/skl.h
+++ b/sound/soc/intel/skylake/skl.h
@@@ -16,7 -16,9 +16,8 @@@
  #include <sound/hdaudio_ext.h>
  #include <sound/hda_codec.h>
  #include <sound/soc.h>
 -#include "skl-nhlt.h"
  #include "skl-ssp-clk.h"
+ #include "skl-sst-ipc.h"
  
  #define SKL_SUSPEND_DELAY 2000
  
@@@ -128,24 -167,27 +166,24 @@@ struct skl_dsp_ops 
  int skl_platform_unregister(struct device *dev);
  int skl_platform_register(struct device *dev);
  
- struct nhlt_specific_cfg *skl_get_ep_blob(struct skl *skl, u32 instance,
 -struct nhlt_acpi_table *skl_nhlt_init(struct device *dev);
 -void skl_nhlt_free(struct nhlt_acpi_table *addr);
+ struct nhlt_specific_cfg *skl_get_ep_blob(struct skl_dev *skl, u32 instance,
  					u8 link_type, u8 s_fmt, u8 no_ch,
  					u32 s_rate, u8 dirn, u8 dev_type);
  
- int skl_nhlt_update_topology_bin(struct skl *skl);
- int skl_init_dsp(struct skl *skl);
- int skl_free_dsp(struct skl *skl);
- int skl_suspend_late_dsp(struct skl *skl);
- int skl_suspend_dsp(struct skl *skl);
- int skl_resume_dsp(struct skl *skl);
- void skl_cleanup_resources(struct skl *skl);
 -int skl_get_dmic_geo(struct skl_dev *skl);
+ int skl_nhlt_update_topology_bin(struct skl_dev *skl);
+ int skl_init_dsp(struct skl_dev *skl);
+ int skl_free_dsp(struct skl_dev *skl);
+ int skl_suspend_late_dsp(struct skl_dev *skl);
+ int skl_suspend_dsp(struct skl_dev *skl);
+ int skl_resume_dsp(struct skl_dev *skl);
+ void skl_cleanup_resources(struct skl_dev *skl);
  const struct skl_dsp_ops *skl_get_dsp_ops(int pci_id);
  void skl_update_d0i3c(struct device *dev, bool enable);
- int skl_nhlt_create_sysfs(struct skl *skl);
- void skl_nhlt_remove_sysfs(struct skl *skl);
- void skl_get_clks(struct skl *skl, struct skl_ssp_clk *ssp_clks);
+ int skl_nhlt_create_sysfs(struct skl_dev *skl);
+ void skl_nhlt_remove_sysfs(struct skl_dev *skl);
+ void skl_get_clks(struct skl_dev *skl, struct skl_ssp_clk *ssp_clks);
  struct skl_clk_parent_src *skl_get_parent_clk(u8 clk_id);
- int skl_dsp_set_dma_control(struct skl_sst *ctx, u32 *caps,
+ int skl_dsp_set_dma_control(struct skl_dev *skl, u32 *caps,
  				u32 caps_size, u32 node_id);
  
  struct skl_module_cfg;

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 5+ messages in thread

* linux-next: manual merge of the sound-asoc tree with the sound tree
@ 2015-02-04  2:44 Stephen Rothwell
  0 siblings, 0 replies; 5+ messages in thread
From: Stephen Rothwell @ 2015-02-04  2:44 UTC (permalink / raw)
  To: Mark Brown, Liam Girdwood, Takashi Iwai
  Cc: linux-next, linux-kernel, Lars-Peter Clausen

[-- Attachment #1: Type: text/plain, Size: 524 bytes --]

Hi all,

Today's linux-next merge of the sound-asoc tree got a conflict in
sound/soc/intel/sst-mfld-platform-pcm.c between commit ef46c7af93f9
("ALSA: pcm: Embed struct device") from the sound tree and commit
8686f251e482 ("ASoC: intel: Remove unnecessary
snd_pcm_lib_preallocate_free_for_all()") from the sound-asoc tree.

I fixed it up (the latter removed more than the former) and can carry
the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, back to index

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-08-09  3:31 linux-next: manual merge of the sound-asoc tree with the sound tree Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2019-08-09  3:16 Stephen Rothwell
2019-08-01  2:50 Stephen Rothwell
2019-08-01 16:46 ` Pierre-Louis Bossart
2015-02-04  2:44 Stephen Rothwell

Linux-Next Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-next/0 linux-next/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-next linux-next/ https://lore.kernel.org/linux-next \
		linux-next@vger.kernel.org linux-next@archiver.kernel.org
	public-inbox-index linux-next


Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-next


AGPL code for this site: git clone https://public-inbox.org/ public-inbox