From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Mark Brown <broonie@kernel.org>,
Liam Girdwood <lgirdwood@gmail.com>, Takashi Iwai <tiwai@suse.de>
Cc: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Stefan Binding <sbinding@opensource.cirrus.com>
Subject: linux-next: manual merge of the sound-asoc tree with the sound tree
Date: Mon, 25 Sep 2023 11:54:46 +1000 [thread overview]
Message-ID: <20230925115446.12bf0047@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1947 bytes --]
Hi all,
Today's linux-next merge of the sound-asoc tree got a conflict in:
sound/pci/hda/cs35l41_hda.c
between commit:
447106e92a0c ("ALSA: hda: cs35l41: Support mute notifications for CS35L41 HDA")
from the sound tree and commit:
77bf613f0bf0 ("ASoC: cs35l41: Fix broken shared boost activation")
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/pci/hda/cs35l41_hda.c
index 92b815ce193b,c74faa2ff46c..000000000000
--- a/sound/pci/hda/cs35l41_hda.c
+++ b/sound/pci/hda/cs35l41_hda.c
@@@ -555,9 -527,15 +555,9 @@@ static void cs35l41_hda_play_done(struc
dev_dbg(dev, "Play (Complete)\n");
- cs35l41_global_enable(dev, reg, cs35l41->hw_cfg.bst_type, 1, NULL,
+ cs35l41_global_enable(dev, reg, cs35l41->hw_cfg.bst_type, 1,
cs35l41->firmware_running);
- if (cs35l41->firmware_running) {
- regmap_multi_reg_write(reg, cs35l41_hda_unmute_dsp,
- ARRAY_SIZE(cs35l41_hda_unmute_dsp));
- } else {
- regmap_multi_reg_write(reg, cs35l41_hda_unmute,
- ARRAY_SIZE(cs35l41_hda_unmute));
- }
+ cs35l41_mute(dev, false);
}
static void cs35l41_hda_pause_start(struct device *dev)
@@@ -567,8 -545,8 +567,8 @@@
dev_dbg(dev, "Pause (Start)\n");
- regmap_multi_reg_write(reg, cs35l41_hda_mute, ARRAY_SIZE(cs35l41_hda_mute));
+ cs35l41_mute(dev, true);
- cs35l41_global_enable(dev, reg, cs35l41->hw_cfg.bst_type, 0, NULL,
+ cs35l41_global_enable(dev, reg, cs35l41->hw_cfg.bst_type, 0,
cs35l41->firmware_running);
}
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2023-09-25 1:54 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-25 1:54 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-10-20 1:26 linux-next: manual merge of the sound-asoc tree with the sound tree Stephen Rothwell
2019-11-12 1:26 Stephen Rothwell
2019-10-16 0:33 Stephen Rothwell
2019-10-07 23:52 Stephen Rothwell
2019-08-09 3:31 Stephen Rothwell
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230925115446.12bf0047@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=broonie@kernel.org \
--cc=cristian.ciocaltea@collabora.com \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sbinding@opensource.cirrus.com \
--cc=tiwai@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).