aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mfd/max8925-core.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-08-07 14:42:49 -0400
committerSamuel Ortiz <sameo@linux.intel.com>2012-09-11 04:15:03 -0400
commit015625a20f630c798a8c5fdf5d472be091b8ac7d (patch)
tree19dd03f125c9ceadb36eaf2d968b8c6deca984eb /drivers/mfd/max8925-core.c
parent023670295ab6b65f5a84b8f214377c04c683809d (diff)
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 @@
18#include <linux/mfd/core.h> 18#include <linux/mfd/core.h>
19#include <linux/mfd/max8925.h> 19#include <linux/mfd/max8925.h>
20 20
21static struct resource io_parent = {
22 .start = 0,
23 .end = 0xffffffff,
24 .flags = IORESOURCE_IO,
25};
26
27static struct resource backlight_resources[] = { 21static struct resource backlight_resources[] = {
28 { 22 {
29 .name = "max8925-backlight", 23 .name = "max8925-backlight",
30 .start = MAX8925_WLED_MODE_CNTL, 24 .start = MAX8925_WLED_MODE_CNTL,
31 .end = MAX8925_WLED_CNTL, 25 .end = MAX8925_WLED_CNTL,
32 .flags = IORESOURCE_IO, 26 .flags = IORESOURCE_REG,
33 .parent = &io_parent,
34 }, 27 },
35}; 28};
36 29
@@ -48,8 +41,7 @@ static struct resource touch_resources[] = {
48 .name = "max8925-tsc", 41 .name = "max8925-tsc",
49 .start = MAX8925_TSC_IRQ, 42 .start = MAX8925_TSC_IRQ,
50 .end = MAX8925_ADC_RES_END, 43 .end = MAX8925_ADC_RES_END,
51 .flags = IORESOURCE_IO, 44 .flags = IORESOURCE_REG,
52 .parent = &io_parent,
53 }, 45 },
54}; 46};
55 47
@@ -67,8 +59,7 @@ static struct resource power_supply_resources[] = {
67 .name = "max8925-power", 59 .name = "max8925-power",
68 .start = MAX8925_CHG_IRQ1, 60 .start = MAX8925_CHG_IRQ1,
69 .end = MAX8925_CHG_IRQ1_MASK, 61 .end = MAX8925_CHG_IRQ1_MASK,
70 .flags = IORESOURCE_IO, 62 .flags = IORESOURCE_REG,
71 .parent = &io_parent,
72 }, 63 },
73}; 64};
74 65
@@ -126,8 +117,7 @@ static struct mfd_cell onkey_devs[] = {
126{ \ 117{ \
127 .start = MAX8925_##_start, \ 118 .start = MAX8925_##_start, \
128 .end = MAX8925_##_end, \ 119 .end = MAX8925_##_end, \
129 .flags = IORESOURCE_IO, \ 120 .flags = IORESOURCE_REG, \
130 .parent = &io_parent, \
131} 121}
132 122
133static struct resource regulator_resources[] = { 123static struct resource regulator_resources[] = {