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>

diff --git a/drivers/mfd/max8925-core.c b/drivers/mfd/max8925-core.c
index ca881ef..825a7f0 100644 (file)
--- a/drivers/mfd/max8925-core.c
+++ b/drivers/mfd/max8925-core.c
@@ -75,9 +75,9 @@ static struct mfd_cell power_devs[] = {
 static struct resource rtc_resources[] = {
        {
                .name   = "max8925-rtc",
-               .start  = MAX8925_RTC_IRQ,
-               .end    = MAX8925_RTC_IRQ_MASK,
-               .flags  = IORESOURCE_IO,
+               .start  = MAX8925_IRQ_RTC_ALARM0,
+               .end    = MAX8925_IRQ_RTC_ALARM0,
+               .flags  = IORESOURCE_IRQ,
        },
 };
 
@@ -598,7 +598,7 @@ int __devinit max8925_device_init(struct max8925_chip *chip,
 
        ret = mfd_add_devices(chip->dev, 0, &rtc_devs[0],
                              ARRAY_SIZE(rtc_devs),
-                             &rtc_resources[0], 0);
+                             &rtc_resources[0], chip->irq_base);
        if (ret < 0) {
                dev_err(chip->dev, "Failed to add rtc subdev\n");
                goto out;

diff --git a/drivers/rtc/rtc-max8925.c b/drivers/rtc/rtc-max8925.c
index 1459055..34e4349 100644 (file)
--- a/drivers/rtc/rtc-max8925.c
+++ b/drivers/rtc/rtc-max8925.c
@@ -69,6 +69,7 @@ struct max8925_rtc_info {
        struct max8925_chip     *chip;
        struct i2c_client       *rtc;
        struct device           *dev;
+       int                     irq;
 };
 
 static irqreturn_t rtc_update_handler(int irq, void *data)
@@ -250,7 +251,7 @@ static int __devinit max8925_rtc_probe(struct platform_device *pdev)
 {
        struct max8925_chip *chip = dev_get_drvdata(pdev->dev.parent);
        struct max8925_rtc_info *info;
-       int irq, ret;
+       int ret;
 
        info = kzalloc(sizeof(struct max8925_rtc_info), GFP_KERNEL);
        if (!info)
@@ -258,13 +259,13 @@ static int __devinit max8925_rtc_probe(struct platform_device *pdev)
        info->chip = chip;
        info->rtc = chip->rtc;
        info->dev = &pdev->dev;
-       irq = chip->irq_base + MAX8925_IRQ_RTC_ALARM0;
+       info->irq = platform_get_irq(pdev, 0);
 
-       ret = request_threaded_irq(irq, NULL, rtc_update_handler,
+       ret = request_threaded_irq(info->irq, NULL, rtc_update_handler,
                                   IRQF_ONESHOT, "rtc-alarm0", info);
        if (ret < 0) {
                dev_err(chip->dev, "Failed to request IRQ: #%d: %d\n",
-                       irq, ret);
+                       info->irq, ret);
                goto out_irq;
        }
 
@@ -285,7 +286,7 @@ static int __devinit max8925_rtc_probe(struct platform_device *pdev)
        return 0;
 out_rtc:
        platform_set_drvdata(pdev, NULL);
-       free_irq(chip->irq_base + MAX8925_IRQ_RTC_ALARM0, info);
+       free_irq(info->irq, info);
 out_irq:
        kfree(info);
        return ret;
@@ -296,7 +297,7 @@ static int __devexit max8925_rtc_remove(struct platform_device *pdev)
        struct max8925_rtc_info *info = platform_get_drvdata(pdev);
 
        if (info) {
-               free_irq(info->chip->irq_base + MAX8925_IRQ_RTC_ALARM0, info);
+               free_irq(info->irq, info);
                rtc_device_unregister(info->rtc_dev);
                kfree(info);
        }