mfd: Change rdc321x resources flags to IORESOURCE_IO

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 <florian@openwrt.org>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

diff --git a/drivers/gpio/rdc321x-gpio.c b/drivers/gpio/rdc321x-gpio.c
index e344907..22f31dc 100644 (file)
--- 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;
@@ -159,7 +159,7 @@ static int __devinit rdc321x_gpio_probe(struct platform_device *pdev)
        rdc321x_gpio_dev->reg1_ctrl_base = r->start;
        rdc321x_gpio_dev->reg1_data_base = r->start + 0x4;
 
-       r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "gpio-reg2");
+       r = platform_get_resource_byname(pdev, IORESOURCE_IO, "gpio-reg2");
        if (!r) {
                dev_err(&pdev->dev, "failed to get gpio-reg2 resource\n");
                err = -ENODEV;

diff --git a/drivers/mfd/rdc321x-southbridge.c b/drivers/mfd/rdc321x-southbridge.c
index 256dd56..5092297 100644 (file)
--- 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 (file)
--- 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;