summaryrefslogtreecommitdiffstats
path: root/drivers/mfd/max8925-core.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-08-07 19:42:49 +0100
committerSamuel Ortiz <sameo@linux.intel.com>2012-09-11 10:15:03 +0200
commit015625a20f630c798a8c5fdf5d472be091b8ac7d (patch)
tree19dd03f125c9ceadb36eaf2d968b8c6deca984eb /drivers/mfd/max8925-core.c
parent023670295ab6b65f5a84b8f214377c04c683809d (diff)
downloadlinux-015625a20f630c798a8c5fdf5d472be091b8ac7d.tar.bz2
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/mfd/max8925-core.c')
-rw-r--r--drivers/mfd/max8925-core.c18
1 files changed, 4 insertions, 14 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[] = {