diff options
author | Florian Fainelli <florian@openwrt.org> | 2010-05-15 16:58:27 -0400 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2010-05-27 19:37:52 -0400 |
commit | 8deca39e5caf7a20fc3786548dc9bfb7f0ae14b6 (patch) | |
tree | c3401030a2061731570b12dfe1022ede150460a9 /drivers/gpio | |
parent | 380c09f6489f1fd773a697e9e2a156c083a34fc5 (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>
Diffstat (limited to 'drivers/gpio')
-rw-r--r-- | drivers/gpio/rdc321x-gpio.c | 4 |
1 files changed, 2 insertions, 2 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; |