From: Mark Brown <broonie@kernel•org>
To: Mark Brown <broonie@kernel•org>
Cc: Andi Shyti <andi.shyti@kernel•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Thomas Lin <thomas_lin@lecomputing•com>
Subject: linux-next: manual merge of the spi tree with the i2c-host tree
Date: Fri, 29 May 2026 22:46:40 +0100 [thread overview]
Message-ID: <ahoJQKqhYl8yHLiJ@sirena.org.uk> (raw)
[-- Attachment #1: Type: text/plain, Size: 1638 bytes --]
Hi all,
Today's linux-next merge of the spi tree got a conflict in:
drivers/acpi/acpi_apd.c
between commit:
fae5e96bb646e ("i2c: designware: Add ACPI ID LECA0003 for LECARC SoCs")
from the i2c-host tree and commit:
019947c495850 ("spi: dw-mmio: Add ACPI ID LECA0002 for LECARC SoCs")
from the spi 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/acpi/acpi_apd.c
index 86678ee22a041,4d5a51d30adcd..0000000000000
--- a/drivers/acpi/acpi_apd.c
+++ b/drivers/acpi/acpi_apd.c
@@@ -182,11 -182,11 +182,16 @@@ static const struct apd_device_desc hip
.fixed_clk_rate = 250000000,
};
+static const struct apd_device_desc leca_i2c_desc = {
+ .setup = acpi_apd_setup,
+ .fixed_clk_rate = 250000000,
+};
+
+ static const struct apd_device_desc leca_spi_desc = {
+ .setup = acpi_apd_setup,
+ .fixed_clk_rate = 400000000,
+ };
+
#endif /* CONFIG_ARM64 */
#endif
@@@ -257,7 -257,7 +262,8 @@@ static const struct acpi_device_id acpi
{ "HISI02A2", APD_ADDR(hip08_i2c_desc) },
{ "HISI02A3", APD_ADDR(hip08_lite_i2c_desc) },
{ "HISI0173", APD_ADDR(hip08_spi_desc) },
+ { "LECA0002", APD_ADDR(leca_spi_desc) },
+ { "LECA0003", APD_ADDR(leca_i2c_desc) },
{ "NXP0001", APD_ADDR(nxp_i2c_desc) },
#endif
{ }
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
reply other threads:[~2026-05-29 21:46 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=ahoJQKqhYl8yHLiJ@sirena.org.uk \
--to=broonie@kernel$(echo .)org \
--cc=andi.shyti@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=thomas_lin@lecomputing$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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