From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752798Ab0EOU6f (ORCPT ); Sat, 15 May 2010 16:58:35 -0400 Received: from mail-ww0-f46.google.com ([74.125.82.46]:40456 "EHLO mail-ww0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751726Ab0EOU6e convert rfc822-to-8bit (ORCPT ); Sat, 15 May 2010 16:58:34 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:reply-to:to:subject:date:user-agent:cc:references :in-reply-to:mime-version:content-type:content-transfer-encoding :message-id; b=s3OLCkrbNC439EYd84DgHjNYs375WNswDFox5trsN6mulp1WAPOcdphBrQMSajj4MS cElWqpKyRbqopFeSnRwB2FCBlryHeVhhyOPN7TQLgx9B+rNaJVJCHpu5e+w9PKChXfua T4eooXJ9ME3+94LEazLWde37Uws7yOcF1obw8= From: Florian Fainelli Reply-To: Florian Fainelli To: Samuel Ortiz Subject: Re: [PATCH] MFD: rdc321x: change resources flags to IORESOURCE_IO Date: Sat, 15 May 2010 22:58:13 +0200 User-Agent: KMail/1.12.4 (Linux/2.6.33-2-686; KDE/4.3.4; i686; ; ) Cc: "linux-kernel" References: <201005152212.59269.florian@openwrt.org> In-Reply-To: <201005152212.59269.florian@openwrt.org> MIME-Version: 1.0 Content-Type: Text/Plain; charset="utf-8" Content-Transfer-Encoding: 8BIT Message-Id: <201005152258.16129.florian@openwrt.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Le samedi 15 mai 2010 22:12:58, Fainelli a écrit : > The rdc321x southbridge PCI device has no MEM PCI resources that we could > pass to mfd_add_devices. Since 33254dd5, mfd_add_device checks for the > mem_base argument that we set to NULL. Changing the resources passed to > our MFD cells from IORESOURCE_MEM to IORESOURCE_IO fixes that. Since we use > those resources as offsets to the PCI configuration space base address of > the southbridge device this is also more adequate. > > Signed-off-by: Florian Fainelli > --- > diff --git a/drivers/gpio/rdc321x-gpio.c b/drivers/gpio/rdc321x-gpio.c > index e344907..9ec3c51 100644 > --- a/drivers/gpio/rdc321x-gpio.c > +++ b/drivers/gpio/rdc321x-gpio.c > @@ -147,7 +147,7 @@ static int __devinit rdc321x_gpio_probe(struct > platform_device *pdev) return -ENOMEM; > } > > - r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "gpio-reg1"); > + r = platform_get_resource_byname(pdev, IORESOURCE_IO, "gpio-reg1"); > if (!r) { > dev_err(&pdev->dev, "failed to get gpio-reg1 resource\n"); > err = -ENODEV; I missed one hunk here, please discard this version of the patch. > diff --git a/drivers/mfd/rdc321x-southbridge.c > b/drivers/mfd/rdc321x-southbridge.c index 256dd56..5092297 100644 > --- a/drivers/mfd/rdc321x-southbridge.c > +++ b/drivers/mfd/rdc321x-southbridge.c > @@ -34,7 +34,7 @@ static struct resource rdc321x_wdt_resource[] = { > .name = "wdt-reg", > .start = RDC321X_WDT_CTRL, > .end = RDC321X_WDT_CTRL + 0x3, > - .flags = IORESOURCE_MEM, > + .flags = IORESOURCE_IO, > } > }; > > @@ -47,12 +47,12 @@ static struct resource rdc321x_gpio_resources[] = { > .name = "gpio-reg1", > .start = RDC321X_GPIO_CTRL_REG1, > .end = RDC321X_GPIO_CTRL_REG1 + 0x7, > - .flags = IORESOURCE_MEM, > + .flags = IORESOURCE_IO, > }, { > .name = "gpio-reg2", > .start = RDC321X_GPIO_CTRL_REG2, > .end = RDC321X_GPIO_CTRL_REG2 + 0x7, > - .flags = IORESOURCE_MEM, > + .flags = IORESOURCE_IO, > } > }; > > diff --git a/drivers/watchdog/rdc321x_wdt.c > b/drivers/watchdog/rdc321x_wdt.c index 4733a99..428f8a1 100644 > --- a/drivers/watchdog/rdc321x_wdt.c > +++ b/drivers/watchdog/rdc321x_wdt.c > @@ -237,7 +237,7 @@ static int __devinit rdc321x_wdt_probe(struct > platform_device *pdev) return -ENODEV; > } > > - r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "wdt-reg"); > + r = platform_get_resource_byname(pdev, IORESOURCE_IO, "wdt-reg"); > if (!r) { > dev_err(&pdev->dev, "failed to get wdt-reg resource\n"); > return -ENODEV; >