From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934983AbbIVWXv (ORCPT ); Tue, 22 Sep 2015 18:23:51 -0400 Received: from mail-pa0-f42.google.com ([209.85.220.42]:35001 "EHLO mail-pa0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759495AbbIVWXt (ORCPT ); Tue, 22 Sep 2015 18:23:49 -0400 Date: Tue, 22 Sep 2015 23:23:40 +0100 From: Lee Jones To: Andy Shevchenko Cc: linux-acpi@vger.kernel.org, linux-i2c@vger.kernel.org, linux-gpio@vger.kernel.org, Wolfram Sang , Linus Walleij , "Rafael J. Wysocki" , Mika Westerberg , "Puustinen, Ismo" , "Pandruvada, Srinivas" , linux-kernel@vger.kernel.org Subject: Re: [PATCH v1 3/8] mfd: intel_quark_i2c_gpio: load gpio driver first Message-ID: <20150922222340.GC9317@x1> References: <1442916619-140607-1-git-send-email-andriy.shevchenko@linux.intel.com> <1442916619-140607-4-git-send-email-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1442916619-140607-4-git-send-email-andriy.shevchenko@linux.intel.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 22 Sep 2015, Andy Shevchenko wrote: > 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 > --- > 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 /* 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 ? > diff --git a/drivers/mfd/intel_quark_i2c_gpio.c b/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(struct pci_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) -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog