Skip to content

Commit

Permalink
mfd: max8925: Convert to IORESOURCE_REG
Browse files Browse the repository at this point in the history
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com>
Tested-by: Haojian Zhuang <haojian.zhuang@gmail.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
  • Loading branch information
Mark Brown authored and Samuel Ortiz committed Sep 11, 2012
1 parent 0236702 commit 015625a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 15 deletions.
18 changes: 4 additions & 14 deletions drivers/mfd/max8925-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
},
};

Expand All @@ -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,
},
};

Expand All @@ -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,
},
};

Expand Down Expand Up @@ -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[] = {
Expand Down
2 changes: 1 addition & 1 deletion drivers/video/backlight/max8925_bl.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 015625a

Please sign in to comment.