MFD: rdc321x: change resources flags to IORESOURCE_IO
Subsystems (3)
PATCH v2 1/1 MFD: rdc321x: change 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.
---
drivers/gpio/rdc321x-gpio.c +2 -2
@@ -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 ;
drivers/mfd/rdc321x-southbridge.c +3 -3
@@ -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, } };
drivers/watchdog/rdc321x_wdt.c +1 -1
@@ -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 ;
Hi Florian,
Quoted 6 lines · Florian Fainelli
The rdc321x southbridge PCI device has no MEM PCI resources that we could pass to
mfd_add_devices. Since33254dd5,mfd_add_devicechecks for themem_baseargument that we set to NULL. Changing the resources passed to our MFD cells fromIORESOURCE_MEMtoIORESOURCE_IOfixes that. Since we use those resources as offsets to the PCI configuration space base address of the southbridge device this is also more adequate.
Patch applied, many thanks.
Cheers,
Samuel.
Quoted 65 lines
Signed-off-by Florian Fainelli <[email protected]>---
drivers/gpio/rdc321x-gpio.c +2
-2@@ -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 ;drivers/mfd/rdc321x-southbridge.c +3
-3@@ -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, } };drivers/watchdog/rdc321x_wdt.c +1
-1@@ -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 ;
Signature · 2 lines
Intel Open Source Technology Centre http://oss.intel.com/