Commit 99cd1059 authored by Lee Jones's avatar Lee Jones

mfd: cs5535-mfd: Register clients using their own dedicated MFD cell entries

CS5535 is the only user of mfd_clone_cell().  It makes more sense to
register child devices in the traditional way and remove the quite
bespoke mfd_clone_cell() call from the MFD API.
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Reviewed-by: default avatarDaniel Thompson <daniel.thompson@linaro.org>
parent 2d4ba917
...@@ -50,16 +50,19 @@ static struct mfd_cell cs5535_mfd_cells[] = { ...@@ -50,16 +50,19 @@ static struct mfd_cell cs5535_mfd_cells[] = {
.num_resources = 1, .num_resources = 1,
.resources = &cs5535_mfd_resources[PMS_BAR], .resources = &cs5535_mfd_resources[PMS_BAR],
}, },
};
static struct mfd_cell cs5535_olpc_mfd_cells[] = {
{ {
.name = "cs5535-acpi", .name = "olpc-xo1-pm-acpi",
.num_resources = 1,
.resources = &cs5535_mfd_resources[ACPI_BAR],
},
{
.name = "olpc-xo1-sci-acpi",
.num_resources = 1, .num_resources = 1,
.resources = &cs5535_mfd_resources[ACPI_BAR], .resources = &cs5535_mfd_resources[ACPI_BAR],
}, },
};
static const char *olpc_acpi_clones[] = {
"olpc-xo1-pm-acpi",
"olpc-xo1-sci-acpi"
}; };
static int cs5535_mfd_probe(struct pci_dev *pdev, static int cs5535_mfd_probe(struct pci_dev *pdev,
...@@ -101,10 +104,14 @@ static int cs5535_mfd_probe(struct pci_dev *pdev, ...@@ -101,10 +104,14 @@ static int cs5535_mfd_probe(struct pci_dev *pdev,
goto err_remove_devices; goto err_remove_devices;
} }
err = mfd_clone_cell("cs5535-acpi", olpc_acpi_clones, err = mfd_add_devices(&pdev->dev, PLATFORM_DEVID_NONE,
ARRAY_SIZE(olpc_acpi_clones)); cs5535_olpc_mfd_cells,
ARRAY_SIZE(cs5535_olpc_mfd_cells),
NULL, 0, NULL);
if (err) { if (err) {
dev_err(&pdev->dev, "Failed to clone MFD cell\n"); dev_err(&pdev->dev,
"Failed to add CS5535 OLPC sub-devices: %d\n",
err);
goto err_release_acpi; goto err_release_acpi;
} }
} }
......
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