diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/mfd/max8925-core.c | 18 | ||||
-rw-r--r-- | drivers/video/backlight/max8925_bl.c | 2 |
2 files changed, 5 insertions, 15 deletions
diff --git a/drivers/mfd/max8925-core.c b/drivers/mfd/max8925-core.c index 6aa3a22..08a5723 100644 --- a/drivers/mfd/max8925-core.c +++ b/drivers/mfd/max8925-core.c @@ -18,19 +18,12 @@ #include <linux/mfd/core.h> #include <linux/mfd/max8925.h> -static struct resource io_parent = { - .start = 0, - .end = 0xffffffff, - .flags = IORESOURCE_IO, -}; - static struct resource backlight_resources[] = { { .name = "max8925-backlight", .start = MAX8925_WLED_MODE_CNTL, .end = MAX8925_WLED_CNTL, - .flags = IORESOURCE_IO, - .parent = &io_parent, + .flags = IORESOURCE_REG, }, }; @@ -48,8 +41,7 @@ static struct resource touch_resources[] = { .name = "max8925-tsc", .start = MAX8925_TSC_IRQ, .end = MAX8925_ADC_RES_END, - .flags = IORESOURCE_IO, - .parent = &io_parent, + .flags = IORESOURCE_REG, }, }; @@ -67,8 +59,7 @@ static struct resource power_supply_resources[] = { .name = "max8925-power", .start = MAX8925_CHG_IRQ1, .end = MAX8925_CHG_IRQ1_MASK, - .flags = IORESOURCE_IO, - .parent = &io_parent, + .flags = IORESOURCE_REG, }, }; @@ -126,8 +117,7 @@ static struct mfd_cell onkey_devs[] = { { \ .start = MAX8925_##_start, \ .end = MAX8925_##_end, \ - .flags = IORESOURCE_IO, \ - .parent = &io_parent, \ + .flags = IORESOURCE_REG, \ } static struct resource regulator_resources[] = { diff --git a/drivers/video/backlight/max8925_bl.c b/drivers/video/backlight/max8925_bl.c index e833ac7..996dadf 100644 --- a/drivers/video/backlight/max8925_bl.c +++ b/drivers/video/backlight/max8925_bl.c @@ -112,7 +112,7 @@ static int __devinit max8925_backlight_probe(struct platform_device *pdev) unsigned char value; int ret; - res = platform_get_resource(pdev, IORESOURCE_IO, 0); + res = platform_get_resource(pdev, IORESOURCE_REG, 0); if (res == NULL) { dev_err(&pdev->dev, "No I/O resource!\n"); return -EINVAL; |