mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-15 23:41:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

mfd: core: Preserve OF node when ACPI handle is present

Browse Source 
Switch device_set_node to set_primary_fwnode, 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.

Cc: stable@vger.kernel.org
Fixes: 51e3b25709 ("mfd: core: Make use of device_set_node()")
Signed-off-by: Brian Mak <makb@juniper.net>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://patch.msgid.link/20260325223024.35992-1-makb@juniper.net
Signed-off-by: Lee Jones <lee@kernel.org>
This commit is contained in:
Brian Mak
2026-03-25 15:30:24 -07:00
committed by Lee Jones
parent 70910aadff
commit caa5a5d44d
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/mfd/mfd-core.c
View File

@@ -88,7 +88,17 @@ static void mfd_acpi_add_device(const struct mfd_cell *cell,
}
}
device_set_node(&pdev->dev, acpi_fwnode_handle(adev ?: parent));
/*
* NOTE: The fwnode design doesn't allow proper stacking/sharing. This
* should eventually turn into a device fwnode API call that will allow
* prepending to a list of fwnodes (with ACPI taking precedence).
*
* set_primary_fwnode() is used here, instead of device_set_node(), as
* device_set_node() will overwrite the existing fwnode, which may be an
* OF node that was populated earlier. To support a use case where ACPI
* and OF is used in conjunction, we call set_primary_fwnode() instead.
*/
set_primary_fwnode(&pdev->dev, acpi_fwnode_handle(adev ?: parent));
}
#else
static inline void mfd_acpi_add_device(const struct mfd_cell *cell,