Re: [PATCH v1 3/8] mfd: intel_quark_i2c_gpio: load gpio driver first
From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Date: 2015-09-23 07:53:50
Also in:
linux-acpi, linux-i2c, lkml
On Tue, 2015-09-22 at 23:23 +0100, Lee Jones wrote:
quoted hunk ↗ jump to hunk
On Tue, 22 Sep 2015, Andy Shevchenko wrote:quoted
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. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- drivers/mfd/intel_quark_i2c_gpio.c | 48 +++++++++++++++++++++----- ------------ 1 file changed, 27 insertions(+), 21 deletions(-)--- a/drivers/mfd/intel_quark_i2c_gpio.c +++ b/drivers/mfd/intel_quark_i2c_gpio.c@@ -28,8 +28,8 @@ #include <linux/platform_data/i2c-designware.h> /* PCI BAR for register base address */ -#define MFD_I2C_BAR 0 -#define MFD_GPIO_BAR 1 +#define MFD_GPIO_BAR 0 +#define MFD_I2C_BAR 1 /* The base GPIO number under GPIOLIB framework */ #define INTEL_QUARK_MFD_GPIO_BASE 8?
No, PCI bars are left without changes, but _ADR values are different.
Otherwise it will not work.
Here is the excerpt from DSDT
Device (GIP0)
{
Name (_ADR, 0x00150002) // _ADR: Address
Name (_STA, 0x0F) // _STA: Status
Name (_PRW, Package (0x02) // _PRW: Power Resources for Wake
{
0x0F,
0x03
})
Device (GPO)
{
Name (_ADR, Zero) // _ADR: Address
Name (_STA, 0x0F) // _STA: Status
Name (_PRW, Package (0x02) // _PRW: Power Resources for Wake
{
0x0F,
0x03
})
}
Device (I2C)
{
Name (_ADR, One) // _ADR: Address
Name (_STA, 0x0F) // _STA: Status
Name (_PRW, Package (0x02) // _PRW: Power Resources for Wake
{
0x0F,
0x03
})
}
}
quoted
diff --git a/drivers/mfd/intel_quark_i2c_gpio.cb/drivers/mfd/intel_quark_i2c_gpio.c index 1ce1603..89bd4bf 100644--- a/drivers/mfd/intel_quark_i2c_gpio.c +++ b/drivers/mfd/intel_quark_i2c_gpio.c@@ -82,27 +82,26 @@ static struct resource intel_quark_i2c_res[] ={ }, }; +static struct mfd_cell intel_quark_mfd_i2c_cell = { + .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 struct resource intel_quark_gpio_res[] = { [INTEL_QUARK_IORES_MEM] = { .flags = IORESOURCE_MEM, }, }; -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, - .name = "gpio-dwapb", - .num_resources = ARRAY_SIZE(intel_quark_gpio_res), - .resources = intel_quark_gpio_res, - .ignore_resource_conflicts = true, - }, +static struct mfd_cell intel_quark_mfd_gpio_cell = { + .id = MFD_GPIO_BAR, + .name = "gpio-dwapb", + .num_resources = ARRAY_SIZE(intel_quark_gpio_res), + .resources = intel_quark_gpio_res, + .ignore_resource_conflicts = true, }; static const struct pci_device_id intel_quark_mfd_ids[] = {@@ -248,18 +247,25 @@ static int intel_quark_mfd_probe(structpci_dev *pdev, 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_i2c_cell); if (ret) return ret; - ret = intel_quark_gpio_setup(pdev, - &intel_quark_mfd_cells[MFD_GPIO_BAR]); + ret = intel_quark_gpio_setup(pdev, &intel_quark_mfd_gpio_cell); if (ret) return ret; - return mfd_add_devices(&pdev->dev, 0, intel_quark_mfd_cells, - ARRAY_SIZE(intel_quark_mfd_cells), NULL, 0, - NULL); + ret = mfd_add_devices(&pdev->dev, 0, &intel_quark_mfd_gpio_cell, 1, + NULL, 0, NULL); + if (ret) + return ret; + + ret = mfd_add_devices(&pdev->dev, 0, &intel_quark_mfd_i2c_cell, 1, + NULL, 0, NULL); + if (ret) + mfd_remove_devices(&pdev->dev); + + return ret; } static void intel_quark_mfd_remove(struct pci_dev *pdev)
-- Andy Shevchenko [off-list ref] Intel Finland Oy