Commit c39dc960 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Wolfram Sang

mfd: intel_quark_i2c_gpio: load gpio driver first

On Intel Galileo boards the GPIO expander is connected to i2c bus. Moreover it
is able to generate interrupt, but interrupt line is connected to GPIO. That's
why we have to have GPIO driver in place when we will probe i2c host with
device connected to it.
Acked-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parent 62a615e0
...@@ -89,13 +89,6 @@ static struct resource intel_quark_gpio_res[] = { ...@@ -89,13 +89,6 @@ static struct resource intel_quark_gpio_res[] = {
}; };
static struct mfd_cell intel_quark_mfd_cells[] = { static struct mfd_cell intel_quark_mfd_cells[] = {
{
.id = MFD_I2C_BAR,
.name = "i2c_designware",
.num_resources = ARRAY_SIZE(intel_quark_i2c_res),
.resources = intel_quark_i2c_res,
.ignore_resource_conflicts = true,
},
{ {
.id = MFD_GPIO_BAR, .id = MFD_GPIO_BAR,
.name = "gpio-dwapb", .name = "gpio-dwapb",
...@@ -103,6 +96,13 @@ static struct mfd_cell intel_quark_mfd_cells[] = { ...@@ -103,6 +96,13 @@ static struct mfd_cell intel_quark_mfd_cells[] = {
.resources = intel_quark_gpio_res, .resources = intel_quark_gpio_res,
.ignore_resource_conflicts = true, .ignore_resource_conflicts = true,
}, },
{
.id = MFD_I2C_BAR,
.name = "i2c_designware",
.num_resources = ARRAY_SIZE(intel_quark_i2c_res),
.resources = intel_quark_i2c_res,
.ignore_resource_conflicts = true,
},
}; };
static const struct pci_device_id intel_quark_mfd_ids[] = { static const struct pci_device_id intel_quark_mfd_ids[] = {
...@@ -248,12 +248,11 @@ static int intel_quark_mfd_probe(struct pci_dev *pdev, ...@@ -248,12 +248,11 @@ static int intel_quark_mfd_probe(struct pci_dev *pdev,
dev_set_drvdata(&pdev->dev, quark_mfd); dev_set_drvdata(&pdev->dev, quark_mfd);
ret = intel_quark_i2c_setup(pdev, &intel_quark_mfd_cells[MFD_I2C_BAR]); ret = intel_quark_i2c_setup(pdev, &intel_quark_mfd_cells[1]);
if (ret) if (ret)
return ret; return ret;
ret = intel_quark_gpio_setup(pdev, ret = intel_quark_gpio_setup(pdev, &intel_quark_mfd_cells[0]);
&intel_quark_mfd_cells[MFD_GPIO_BAR]);
if (ret) if (ret)
return ret; return ret;
......
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