summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-08-07 22:42:49 +0400
committerSamuel Ortiz <sameo@linux.intel.com>2012-09-11 12:15:03 +0400
commit015625a20f630c798a8c5fdf5d472be091b8ac7d (patch)
tree19dd03f125c9ceadb36eaf2d968b8c6deca984eb /drivers
parent023670295ab6b65f5a84b8f214377c04c683809d (diff)
downloadlinux-015625a20f630c798a8c5fdf5d472be091b8ac7d.tar.xz
mfd: max8925: Convert to IORESOURCE_REG
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mfd/max8925-core.c18
-rw-r--r--drivers/video/backlight/max8925_bl.c2
2 files changed, 5 insertions, 15 deletions
diff --git a/drivers/mfd/max8925-core.c b/drivers/mfd/max8925-core.c
index 6aa3a22ea435..08a57231c25b 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 e833ac72e063..996dadfa09ff 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;