Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...

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

diff --git a/drivers/rtc/rtc-tps65910.c b/drivers/rtc/rtc-tps65910.c
index 073108dcf9e7b5660f1a4f9fb7074605bf247845..22eb4ebfa1a64cf295b80b02cb09339de15c56ab 100644 (file)
--- a/drivers/rtc/rtc-tps65910.c
+++ b/drivers/rtc/rtc-tps65910.c
@@ -247,6 +247,13 @@ static int __devinit tps65910_rtc_probe(struct platform_device *pdev)
                return ret;
 
        dev_dbg(&pdev->dev, "Enabling rtc-tps65910.\n");
+
+       /* Enable RTC digital power domain */
+       ret = regmap_update_bits(tps65910->regmap, TPS65910_DEVCTRL,
+               DEVCTRL_RTC_PWDN_MASK, 0 << DEVCTRL_RTC_PWDN_SHIFT);
+       if (ret < 0)
+               return ret;
+
        rtc_reg = TPS65910_RTC_CTRL_STOP_RTC;
        ret = regmap_write(tps65910->regmap, TPS65910_RTC_CTRL, rtc_reg);
        if (ret < 0)
@@ -261,7 +268,7 @@ static int __devinit tps65910_rtc_probe(struct platform_device *pdev)
 
        ret = devm_request_threaded_irq(&pdev->dev, irq, NULL,
                tps65910_rtc_interrupt, IRQF_TRIGGER_LOW,
-               "rtc-tps65910", &pdev->dev);
+               dev_name(&pdev->dev), &pdev->dev);
        if (ret < 0) {
                dev_err(&pdev->dev, "IRQ is not free.\n");
                return ret;