From: Brian Mak <makb@juniper.net>
To: Lee Jones <lee@kernel.org>,
Herve Codina <herve.codina@bootlin.com>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
<linux-kernel@vger.kernel.org>
Cc: Brian Mak <makb@juniper.net>, <stable@vger.kernel.org>
Subject: [PATCH] mfd: core: Preserve OF node when ACPI handle is present
Date: Wed, 25 Feb 2026 15:21:05 -0800 [thread overview]
Message-ID: <20260225232105.454931-1-makb@juniper.net> (raw)
Switch device_set_node back to ACPI_COMPANION_SET, so that the ACPI
fwnode does not overwrite the of_node with NULL.
This allows MFD children with both OF nodes and ACPI handles to have OF
nodes again.
Fixes: 51e3b257099d ("mfd: core: Make use of device_set_node()")
Cc: stable@vger.kernel.org
Signed-off-by: Brian Mak <makb@juniper.net>
---
drivers/mfd/mfd-core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/mfd/mfd-core.c b/drivers/mfd/mfd-core.c
index 6be58eb5a746..3c8b06d52d19 100644
--- a/drivers/mfd/mfd-core.c
+++ b/drivers/mfd/mfd-core.c
@@ -88,7 +88,7 @@ static void mfd_acpi_add_device(const struct mfd_cell *cell,
}
}
- device_set_node(&pdev->dev, acpi_fwnode_handle(adev ?: parent));
+ ACPI_COMPANION_SET(&pdev->dev, adev ?: parent);
}
#else
static inline void mfd_acpi_add_device(const struct mfd_cell *cell,
base-commit: d9d32e5bd5a4e57675f2b70ddf73c3dc5cf44fc2
--
2.25.1
next reply other threads:[~2026-02-25 23:32 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-02-25 23:21 Brian Mak [this message]
2026-02-26 7:27 ` [PATCH] mfd: core: Preserve OF node when ACPI handle is present Andy Shevchenko
2026-02-26 7:39 ` Andy Shevchenko
2026-02-26 19:40 ` Brian Mak
2026-02-26 20:22 ` Andy Shevchenko
2026-02-26 20:36 ` Brian Mak
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=20260225232105.454931-1-makb@juniper.net \
--to=makb@juniper.net \
--cc=andriy.shevchenko@linux.intel.com \
--cc=herve.codina@bootlin.com \
--cc=lee@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@vger.kernel.org \
/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