aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mfd/max8925-core.c
diff options
context:
space:
mode:
authorHaojian Zhuang <haojian.zhuang@gmail.com>2012-06-05 06:08:50 -0400
committerSamuel Ortiz <sameo@linux.intel.com>2012-07-08 18:16:10 -0400
commitc1a2f31dfeb09c0c767fc178daa4a1e2855808a7 (patch)
tree2fde3ee500d6b39267b9336a58104c4c65fe9adf /drivers/mfd/max8925-core.c
parentb673e24c0ae041d02b51b13917ba89aafdd454ed (diff)
mfd: Transfer rtc max8925 irq from MFD defined resources
MAX8925 rtc irq is transfered from mfd resources now. Signed-off-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.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/mfd/max8925-core.c b/drivers/mfd/max8925-core.c
index ca881efedf75..825a7f06d9ba 100644
--- a/drivers/mfd/max8925-core.c
+++ b/drivers/mfd/max8925-core.c
@@ -75,9 +75,9 @@ static struct mfd_cell power_devs[] = {
75static struct resource rtc_resources[] = { 75static struct resource rtc_resources[] = {
76 { 76 {
77 .name = "max8925-rtc", 77 .name = "max8925-rtc",
78 .start = MAX8925_RTC_IRQ, 78 .start = MAX8925_IRQ_RTC_ALARM0,
79 .end = MAX8925_RTC_IRQ_MASK, 79 .end = MAX8925_IRQ_RTC_ALARM0,
80 .flags = IORESOURCE_IO, 80 .flags = IORESOURCE_IRQ,
81 }, 81 },
82}; 82};
83 83
@@ -598,7 +598,7 @@ int __devinit max8925_device_init(struct max8925_chip *chip,
598 598
599 ret = mfd_add_devices(chip->dev, 0, &rtc_devs[0], 599 ret = mfd_add_devices(chip->dev, 0, &rtc_devs[0],
600 ARRAY_SIZE(rtc_devs), 600 ARRAY_SIZE(rtc_devs),
601 &rtc_resources[0], 0); 601 &rtc_resources[0], chip->irq_base);
602 if (ret < 0) { 602 if (ret < 0) {
603 dev_err(chip->dev, "Failed to add rtc subdev\n"); 603 dev_err(chip->dev, "Failed to add rtc subdev\n");
604 goto out; 604 goto out;