aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2010-05-15 16:58:27 -0400
committerSamuel Ortiz <sameo@linux.intel.com>2010-05-27 19:37:52 -0400
commit8deca39e5caf7a20fc3786548dc9bfb7f0ae14b6 (patch)
treec3401030a2061731570b12dfe1022ede150460a9
parent380c09f6489f1fd773a697e9e2a156c083a34fc5 (diff)
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>
-rw-r--r--drivers/gpio/rdc321x-gpio.c4
-rw-r--r--drivers/mfd/rdc321x-southbridge.c6
-rw-r--r--drivers/watchdog/rdc321x_wdt.c2
3 files changed, 6 insertions, 6 deletions
diff --git a/drivers/gpio/rdc321x-gpio.c b/drivers/gpio/rdc321x-gpio.c
index e344907da5b0..22f31dc50104 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)
147 return -ENOMEM; 147 return -ENOMEM;
148 } 148 }
149 149
150 r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "gpio-reg1"); 150 r = platform_get_resource_byname(pdev, IORESOURCE_IO, "gpio-reg1");
151 if (!r) { 151 if (!r) {
152 dev_err(&pdev->dev, "failed to get gpio-reg1 resource\n"); 152 dev_err(&pdev->dev, "failed to get gpio-reg1 resource\n");
153 err = -ENODEV; 153 err = -ENODEV;
@@ -159,7 +159,7 @@ static int __devinit rdc321x_gpio_probe(struct platform_device *pdev)
159 rdc321x_gpio_dev->reg1_ctrl_base = r->start; 159 rdc321x_gpio_dev->reg1_ctrl_base = r->start;
160 rdc321x_gpio_dev->reg1_data_base = r->start + 0x4; 160 rdc321x_gpio_dev->reg1_data_base = r->start + 0x4;
161 161
162 r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "gpio-reg2"); 162 r = platform_get_resource_byname(pdev, IORESOURCE_IO, "gpio-reg2");
163 if (!r) { 163 if (!r) {
164 dev_err(&pdev->dev, "failed to get gpio-reg2 resource\n"); 164 dev_err(&pdev->dev, "failed to get gpio-reg2 resource\n");
165 err = -ENODEV; 165 err = -ENODEV;
diff --git a/drivers/mfd/rdc321x-southbridge.c b/drivers/mfd/rdc321x-southbridge.c
index 256dd560bd48..50922975bda3 100644
--- a/drivers/mfd/rdc321x-southbridge.c
+++ b/drivers/mfd/rdc321x-southbridge.c
@@ -34,7 +34,7 @@ static struct resource rdc321x_wdt_resource[] = {
34 .name = "wdt-reg", 34 .name = "wdt-reg",
35 .start = RDC321X_WDT_CTRL, 35 .start = RDC321X_WDT_CTRL,
36 .end = RDC321X_WDT_CTRL + 0x3, 36 .end = RDC321X_WDT_CTRL + 0x3,
37 .flags = IORESOURCE_MEM, 37 .flags = IORESOURCE_IO,
38 } 38 }
39}; 39};
40 40
@@ -47,12 +47,12 @@ static struct resource rdc321x_gpio_resources[] = {
47 .name = "gpio-reg1", 47 .name = "gpio-reg1",
48 .start = RDC321X_GPIO_CTRL_REG1, 48 .start = RDC321X_GPIO_CTRL_REG1,
49 .end = RDC321X_GPIO_CTRL_REG1 + 0x7, 49 .end = RDC321X_GPIO_CTRL_REG1 + 0x7,
50 .flags = IORESOURCE_MEM, 50 .flags = IORESOURCE_IO,
51 }, { 51 }, {
52 .name = "gpio-reg2", 52 .name = "gpio-reg2",
53 .start = RDC321X_GPIO_CTRL_REG2, 53 .start = RDC321X_GPIO_CTRL_REG2,
54 .end = RDC321X_GPIO_CTRL_REG2 + 0x7, 54 .end = RDC321X_GPIO_CTRL_REG2 + 0x7,
55 .flags = IORESOURCE_MEM, 55 .flags = IORESOURCE_IO,
56 } 56 }
57}; 57};
58 58
diff --git a/drivers/watchdog/rdc321x_wdt.c b/drivers/watchdog/rdc321x_wdt.c
index 4733a99955dd..428f8a1583e8 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)
237 return -ENODEV; 237 return -ENODEV;
238 } 238 }
239 239
240 r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "wdt-reg"); 240 r = platform_get_resource_byname(pdev, IORESOURCE_IO, "wdt-reg");
241 if (!r) { 241 if (!r) {
242 dev_err(&pdev->dev, "failed to get wdt-reg resource\n"); 242 dev_err(&pdev->dev, "failed to get wdt-reg resource\n");
243 return -ENODEV; 243 return -ENODEV;