UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

mfd: core: Add support for software nodes 

The old device property API is going to be removed and
replaced with the newer software node API. This prepares MFD
subsystem for the transition.

Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
This commit is contained in:
Heikki Krogerus 2021-03-01 16:42:19 +02:00 committed by Lee Jones
parent 586478bfc9
commit 42e5998291
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -244,6 +244,12 @@ static int mfd_add_device(struct device *parent, int id,
goto fail_of_entry;
}
if (cell->swnode) {
ret = device_add_software_node(&pdev->dev, cell->swnode);
if (ret)
goto fail_of_entry;
}
for (r = 0; r < cell->num_resources; r++) {
res[r].name = cell->resources[r].name;
res[r].flags = cell->resources[r].flags;
@ -304,6 +310,7 @@ fail_of_entry:
list_del(&of_entry->list);
kfree(of_entry);
}
device_remove_software_node(&pdev->dev);
fail_alias:
regulator_bulk_unregister_supply_alias(&pdev->dev,
cell->parent_supplies,
@ -372,6 +379,8 @@ static int mfd_remove_devices_fn(struct device *dev, void *data)
regulator_bulk_unregister_supply_alias(dev, cell->parent_supplies,
cell->num_parent_supplies);
device_remove_software_node(&pdev->dev);
platform_device_unregister(pdev);
return 0;
}

4
include/linux/mfd/core.h
View File

@ -50,6 +50,7 @@
#define MFD_DEP_LEVEL_HIGH 1
struct irq_domain;
struct software_node;
struct property_entry;
/* Matches ACPI PNP id, either _HID or _CID, or ACPI _ADR */
@ -78,6 +79,9 @@ struct mfd_cell {
void *platform_data;
size_t pdata_size;
/* Software node for the device. */
const struct software_node *swnode;
/* device properties passed to the sub devices drivers */
const struct property_entry *properties;