* linux-next: manual merge of the soundwire tree with the sound-asoc tree
@ 2022-07-07 5:28 Stephen Rothwell
2022-07-18 8:29 ` Stephen Rothwell
0 siblings, 1 reply; 5+ messages in thread
From: Stephen Rothwell @ 2022-07-07 5:28 UTC (permalink / raw)
To: Vinod Koul, Mark Brown, Liam Girdwood
Cc: Charles Keepax, Linux Kernel Mailing List,
Linux Next Mailing List, Pierre-Louis Bossart
[-- Attachment #1: Type: text/plain, Size: 1395 bytes --]
Hi all,
Today's linux-next merge of the soundwire tree got a conflict in:
drivers/soundwire/intel.c
between commit:
ca68202098a4 ("soundwire: intel: Migrate to new style legacy DAI naming flag")
from the sound-asoc tree and commit:
3e9c9f90573f ("soundwire: intel: use pm_runtime_resume() on component probe")
from the soundwire 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 drivers/soundwire/intel.c
index 0268fa527c0c,95ce292994cc..000000000000
--- a/drivers/soundwire/intel.c
+++ b/drivers/soundwire/intel.c
@@@ -1097,9 -1114,9 +1114,10 @@@ static const struct snd_soc_dai_ops int
};
static const struct snd_soc_component_driver dai_component = {
- .name = "soundwire",
- .probe = intel_component_probe,
- .suspend = intel_component_dais_suspend
+ .name = "soundwire",
++ .probe = intel_component_probe,
+ .suspend = intel_component_dais_suspend,
+ .legacy_dai_naming = 1,
};
static int intel_create_dai(struct sdw_cdns *cdns,
[-- 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 soundwire tree with the sound-asoc tree
2022-07-07 5:28 Stephen Rothwell
@ 2022-07-18 8:29 ` Stephen Rothwell
0 siblings, 0 replies; 5+ messages in thread
From: Stephen Rothwell @ 2022-07-18 8:29 UTC (permalink / raw)
To: Greg KH, Arnd Bergmann, Takashi Iwai
Cc: Vinod Koul, Mark Brown, Liam Girdwood, Charles Keepax,
Linux Kernel Mailing List, Linux Next Mailing List,
Pierre-Louis Bossart
[-- Attachment #1: Type: text/plain, Size: 1636 bytes --]
Hi all,
On Thu, 7 Jul 2022 15:28:31 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the soundwire tree got a conflict in:
>
> drivers/soundwire/intel.c
>
> between commit:
>
> ca68202098a4 ("soundwire: intel: Migrate to new style legacy DAI naming flag")
>
> from the sound-asoc tree and commit:
>
> 3e9c9f90573f ("soundwire: intel: use pm_runtime_resume() on component probe")
>
> from the soundwire 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.
>
>
> diff --cc drivers/soundwire/intel.c
> index 0268fa527c0c,95ce292994cc..000000000000
> --- a/drivers/soundwire/intel.c
> +++ b/drivers/soundwire/intel.c
> @@@ -1097,9 -1114,9 +1114,10 @@@ static const struct snd_soc_dai_ops int
> };
>
> static const struct snd_soc_component_driver dai_component = {
> - .name = "soundwire",
> - .probe = intel_component_probe,
> - .suspend = intel_component_dais_suspend
> + .name = "soundwire",
> ++ .probe = intel_component_probe,
> + .suspend = intel_component_dais_suspend,
> + .legacy_dai_naming = 1,
> };
>
> static int intel_create_dai(struct sdw_cdns *cdns,
This is now a conflict between the char-misc tree and the sound tree.
--
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 soundwire tree with the sound-asoc tree
@ 2024-11-15 4:01 Stephen Rothwell
2024-11-19 6:25 ` Vinod Koul
0 siblings, 1 reply; 5+ messages in thread
From: Stephen Rothwell @ 2024-11-15 4:01 UTC (permalink / raw)
To: Vinod Koul, Mark Brown, Liam Girdwood
Cc: Bard Liao, Charles Keepax, Linux Kernel Mailing List,
Linux Next Mailing List, Pierre-Louis Bossart,
Pierre-Louis Bossart
[-- Attachment #1: Type: text/plain, Size: 1478 bytes --]
Hi all,
Today's linux-next merge of the soundwire tree got a conflict in:
include/linux/soundwire/sdw.h
between commit:
3a513da1ae33 ("ASoC: SDCA: add initial module")
from the sound-asoc tree and commit:
e311b04db66a ("soundwire: Update the includes on the sdw.h header")
from the soundwire 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 include/linux/soundwire/sdw.h
index 49d690f3d29a,784656f740f6..000000000000
--- a/include/linux/soundwire/sdw.h
+++ b/include/linux/soundwire/sdw.h
@@@ -4,14 -4,20 +4,21 @@@
#ifndef __SOUNDWIRE_H
#define __SOUNDWIRE_H
+ #include <linux/bitfield.h>
#include <linux/bug.h>
- #include <linux/lockdep_types.h>
+ #include <linux/completion.h>
+ #include <linux/device.h>
#include <linux/irq.h>
#include <linux/irqdomain.h>
+ #include <linux/lockdep_types.h>
#include <linux/mod_devicetable.h>
- #include <linux/bitfield.h>
+ #include <linux/mutex.h>
+ #include <linux/types.h>
+#include <sound/sdca.h>
+ struct dentry;
+ struct fwnode_handle;
+
struct sdw_bus;
struct sdw_slave;
[-- 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 soundwire tree with the sound-asoc tree
2024-11-15 4:01 linux-next: manual merge of the soundwire tree with the sound-asoc tree Stephen Rothwell
@ 2024-11-19 6:25 ` Vinod Koul
0 siblings, 0 replies; 5+ messages in thread
From: Vinod Koul @ 2024-11-19 6:25 UTC (permalink / raw)
To: Stephen Rothwell, Vinod Koul, Mark Brown, Liam Girdwood
Cc: Bard Liao, Charles Keepax, Linux Kernel Mailing List,
Linux Next Mailing List, Pierre-Louis Bossart,
Pierre-Louis Bossart
On 15/11/24 09:31, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the soundwire tree got a conflict in:
>
> include/linux/soundwire/sdw.h
>
> between commit:
>
> 3a513da1ae33 ("ASoC: SDCA: add initial module")
>
> from the sound-asoc tree and commit:
>
> e311b04db66a ("soundwire: Update the includes on the sdw.h header")
>
> from the soundwire 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.
Thanks, this looks right to me and will let Linus know when I send the
pull request
--
~Vinod
^ permalink raw reply [flat|nested] 5+ messages in thread
* linux-next: manual merge of the soundwire tree with the sound-asoc tree
@ 2026-01-05 4:03 Stephen Rothwell
0 siblings, 0 replies; 5+ messages in thread
From: Stephen Rothwell @ 2026-01-05 4:03 UTC (permalink / raw)
To: Vinod Koul, Mark Brown, Liam Girdwood
Cc: Johan Hovold, Linux Kernel Mailing List, Linux Next Mailing List,
Uwe Kleine-König
[-- Attachment #1: Type: text/plain, Size: 1562 bytes --]
Hi all,
Today's linux-next merge of the soundwire tree got a conflict in:
sound/soc/codecs/wcd939x-sdw.c
between commit:
7a8447fc71a0 ("ASoC: codecs: wcd939x-sdw: use devres for regmap allocation")
from the sound-asoc tree and commit:
478f3890709a ("soundwire: Make remove function return no value")
from the soundwire 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/codecs/wcd939x-sdw.c
index 399dfba79aa2,965c768e7995..000000000000
--- a/sound/soc/codecs/wcd939x-sdw.c
+++ b/sound/soc/codecs/wcd939x-sdw.c
@@@ -1401,15 -1406,23 +1401,13 @@@ static int wcd9390_probe(struct sdw_sla
pm_runtime_set_suspended(dev);
return 0;
-
-err_free_regmap:
- if (wcd->regmap)
- regmap_exit(wcd->regmap);
-
- return ret;
}
- static int wcd9390_remove(struct sdw_slave *pdev)
+ static void wcd9390_remove(struct sdw_slave *pdev)
{
struct device *dev = &pdev->dev;
- struct wcd939x_sdw_priv *wcd = dev_get_drvdata(dev);
component_del(dev, &wcd_sdw_component_ops);
--
- return 0;
- if (wcd->regmap)
- regmap_exit(wcd->regmap);
}
static const struct sdw_device_id wcd9390_slave_id[] = {
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2026-01-05 4:03 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-11-15 4:01 linux-next: manual merge of the soundwire tree with the sound-asoc tree Stephen Rothwell
2024-11-19 6:25 ` Vinod Koul
-- strict thread matches above, loose matches on Subject: below --
2026-01-05 4:03 Stephen Rothwell
2022-07-07 5:28 Stephen Rothwell
2022-07-18 8:29 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox