Commit 5f2545fa authored by Daniel Drake's avatar Daniel Drake Committed by Samuel Ortiz

mfd: Allow for bypass of cell resource conflict check

The upcoming VIA VX855 MFD driver needs to communicate resources
to subdevices where the resources may be claimed by ACPI.

Add a flag to mfd_cell to request that resources are not policed.
Signed-off-by: default avatarDaniel Drake <dsd@laptop.org>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 2d95ae3b
...@@ -65,9 +65,11 @@ static int mfd_add_device(struct device *parent, int id, ...@@ -65,9 +65,11 @@ static int mfd_add_device(struct device *parent, int id,
res[r].end = cell->resources[r].end; res[r].end = cell->resources[r].end;
} }
ret = acpi_check_resource_conflict(res); if (!cell->ignore_resource_conflicts) {
if (ret) ret = acpi_check_resource_conflict(res);
goto fail_res; if (ret)
goto fail_res;
}
} }
ret = platform_device_add_resources(pdev, res, cell->num_resources); ret = platform_device_add_resources(pdev, res, cell->num_resources);
......
...@@ -44,6 +44,9 @@ struct mfd_cell { ...@@ -44,6 +44,9 @@ struct mfd_cell {
*/ */
int num_resources; int num_resources;
const struct resource *resources; const struct resource *resources;
/* don't check for resource conflicts */
bool ignore_resource_conflicts;
}; };
extern int mfd_add_devices(struct device *parent, int id, extern int mfd_add_devices(struct device *parent, int id,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment