Merge remote-tracking branch 'rtc/rtc-next'

[karo-tx-linux.git] / drivers / rtc / rtc-ds1343.c

diff --git a/drivers/rtc/rtc-ds1343.c b/drivers/rtc/rtc-ds1343.c
index 07371a9e37936b7290febc3a0ec08a3c30e37da2..3d389bd8a289590561d45a0dc3a82697fd659bf4 100644 (file)
--- a/drivers/rtc/rtc-ds1343.c
+++ b/drivers/rtc/rtc-ds1343.c
@@ -21,6 +21,7 @@
 #include <linux/rtc.h>
 #include <linux/bcd.h>
 #include <linux/pm.h>
 #include <linux/rtc.h>
 #include <linux/bcd.h>
 #include <linux/pm.h>

+#include <linux/pm_wakeirq.h>

 #include <linux/slab.h>
 
 #define DS1343_DRV_VERSION     "01.00"
 #include <linux/slab.h>
 
 #define DS1343_DRV_VERSION     "01.00"


@@ -663,15 +664,15 @@ static int ds1343_probe(struct spi_device *spi)
 
        if (priv->irq >= 0) {
                res = devm_request_threaded_irq(&spi->dev, spi->irq, NULL,
 
        if (priv->irq >= 0) {
                res = devm_request_threaded_irq(&spi->dev, spi->irq, NULL,

-                                               ds1343_thread,
-                                               IRQF_NO_SUSPEND | IRQF_ONESHOT,
+                                               ds1343_thread, IRQF_ONESHOT,

                                                "ds1343", priv);
                if (res) {
                        priv->irq = -1;
                        dev_err(&spi->dev,
                                "unable to request irq for rtc ds1343\n");
                } else {
                                                "ds1343", priv);
                if (res) {
                        priv->irq = -1;
                        dev_err(&spi->dev,
                                "unable to request irq for rtc ds1343\n");
                } else {

-                       device_set_wakeup_capable(&spi->dev, 1);
+                       device_init_wakeup(&spi->dev, true);
+                       dev_pm_set_wake_irq(&spi->dev, spi->irq);

                }
        }
 
                }
        }
 


@@ -692,6 +693,8 @@ static int ds1343_remove(struct spi_device *spi)
                priv->irqen &= ~RTC_AF;
                mutex_unlock(&priv->mutex);
 
                priv->irqen &= ~RTC_AF;
                mutex_unlock(&priv->mutex);
 

+               dev_pm_clear_wake_irq(&spi->dev);
+               device_init_wakeup(&spi->dev, false);

                devm_free_irq(&spi->dev, spi->irq, priv);
        }
 
                devm_free_irq(&spi->dev, spi->irq, priv);
        }