From: Mark Brown <broonie@kernel.org>
To: Mark Brown <broonie@kernel.org>, Liam Girdwood <lgirdwood@gmail.com>
Cc: Georg Wenzel <g.wenzel@gmail.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Shenghao Ding <shenghao-ding@ti.com>,
Takashi Iwai <tiwai@suse.de>
Subject: linux-next: manual merge of the sound-asoc tree with the sound tree
Date: Mon, 5 Oct 2026 14:46:48 +0200 [thread overview]
Message-ID: <asOcOPrfi0lw6NU7@sirena.co.uk> (raw)
[-- Attachment #1: Type: text/plain, Size: 2803 bytes --]
Hi all,
Today's linux-next merge of the sound-asoc tree got a conflict in:
include/sound/tas2781.h
between commit:
3bc4fc135ec74 ("ALSA: hda/tas2781: Enable bass speakers support")
from the sound tree and commit:
0bebef817d481 ("ASoC: tas2781: Add TAS2573 calibration support")
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.
diff --cc include/sound/tas2781.h
index ccc0142fbad5d,f4275226366de..0000000000000
--- a/include/sound/tas2781.h
+++ b/include/sound/tas2781.h
@@@ -91,18 -98,30 +98,42 @@@
/* prm_TE_1_Beta1 */
#define TAS2563_TE_DT_REG TASDEVICE_REG(0x00, 0x0f, 0x70)
+/* TAS2563 ASI (Audio Serial Interface) Register Definitions */
+#define TAS2563_ASI_CFG_REG TASDEVICE_REG(0x00, 0x00, 0x06)
+#define TAS2563_ASI_SR_REG TASDEVICE_REG(0x00, 0x00, 0x07)
+#define TAS2563_ASI_FS_REG TASDEVICE_REG(0x00, 0x00, 0x08)
+#define TAS2563_ASI_DA_REG TASDEVICE_REG(0x00, 0x00, 0x0a)
+#define TAS2563_ASI_TDM_REG TASDEVICE_REG(0x00, 0x00, 0x0b)
+#define TAS2563_ASI_DL_REG TASDEVICE_REG(0x00, 0x00, 0x0c)
+#define TAS2563_ASI_SLOT_REG TASDEVICE_REG(0x00, 0x00, 0x30)
+
+/* TAS2563 ASI Apply Register (triggers configuration update) */
+#define TAS2563_ASI_APPLY_REG TASDEVICE_REG(0x00, 0x00, 0x02)
+
+ #define TAS2573_FCT_INT_LATCH TASDEVICE_REG(0x00, 0x00, 0x67)
+ /* YM57 */
+ #define TAS2573_FCT_OUTPUT_R0 TASDEVICE_REG(0x00, 0x65, 0x74)
+ /* YM58 */
+ #define TAS2573_FCT_OUTPUT_R0_LOW TASDEVICE_REG(0x00, 0x65, 0x78)
+ /* YM59 */
+ #define TAS2573_FCT_OUTPUT_INV_R0 TASDEVICE_REG(0x00, 0x65, 0x7C)
+ /* YM61 */
+ #define TAS2573_FCT_OUTPUT_POWERTOT TASDEVICE_REG(0x00, 0x66, 0x0C)
+ /* YM64 */
+ #define TAS2573_FCT_OUTPUT_F0 TASDEVICE_REG(0x00, 0x65, 0x18)
+ /* YM147 */
+ #define TAS2573_FCT_STATUS_CTRL TASDEVICE_REG(0x00, 0x68, 0x74)
+ /* YM148 */
+ #define TAS2573_FCT_STATUS_BINNING TASDEVICE_REG(0x00, 0x68, 0x78)
+ /* YM664 */
+ #define TAS2573_RE_OUT TASDEVICE_REG(0x00, 0x7A, 0x18)
+ /* YM952 */
+ #define TAS2573_SILENCE_DETECTED TASDEVICE_REG(0x00, 0x83, 0x60)
+ /* YM954 */
+ #define TAS2573_OPEN_CIRCUIT TASDEVICE_REG(0x00, 0x83, 0x68)
+ /* YM955 */
+ #define TAS2573_SHORTCKT TASDEVICE_REG(0x00, 0x83, 0x6C)
+
#define TAS2781_PRM_INT_MASK_REG TASDEVICE_REG(0x00, 0x00, 0x3b)
#define TAS2781_PRM_CLK_CFG_REG TASDEVICE_REG(0x00, 0x00, 0x5c)
#define TAS2781_PRM_RSVD_REG TASDEVICE_REG(0x00, 0x01, 0x19)
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
next reply other threads:[~2026-10-05 12:46 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-05 12:46 Mark Brown [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-07-14 3:01 Stephen Rothwell
2025-07-14 9:18 ` Takashi Iwai
2023-10-20 1:26 Stephen Rothwell
2023-09-25 1:54 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=asOcOPrfi0lw6NU7@sirena.co.uk \
--to=broonie@kernel.org \
--cc=g.wenzel@gmail.com \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=shenghao-ding@ti.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
all inboxes | Powered by JetHome®