From patchwork Tue Sep 22 10:10:14 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 520984 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 93F1414012C for ; Tue, 22 Sep 2015 20:11:39 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757439AbbIVKK3 (ORCPT ); Tue, 22 Sep 2015 06:10:29 -0400 Received: from mga01.intel.com ([192.55.52.88]:24182 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757472AbbIVKKZ (ORCPT ); Tue, 22 Sep 2015 06:10:25 -0400 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP; 22 Sep 2015 03:10:24 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.17,572,1437462000"; d="scan'208";a="810280474" Received: from black.fi.intel.com ([10.237.72.93]) by fmsmga002.fm.intel.com with ESMTP; 22 Sep 2015 03:10:21 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id CC2512E3; Tue, 22 Sep 2015 13:10:20 +0300 (EEST) From: Andy Shevchenko To: linux-acpi@vger.kernel.org, linux-i2c@vger.kernel.org, linux-gpio@vger.kernel.org, Lee Jones , Wolfram Sang , Linus Walleij , "Rafael J. Wysocki" , Mika Westerberg , "Puustinen, Ismo" , "Pandruvada, Srinivas" , linux-kernel@vger.kernel.org Cc: Andy Shevchenko Subject: [PATCH v1 3/8] mfd: intel_quark_i2c_gpio: load gpio driver first Date: Tue, 22 Sep 2015 13:10:14 +0300 Message-Id: <1442916619-140607-4-git-send-email-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.5.1 In-Reply-To: <1442916619-140607-1-git-send-email-andriy.shevchenko@linux.intel.com> References: <1442916619-140607-1-git-send-email-andriy.shevchenko@linux.intel.com> Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org 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(-) 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)