Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 5a280844bb3bcd79076cac6ad002f71d25c798e5

Authored by Dmitry Osipenko
Committed by Linus Torvalds
1 parent f101a9464b
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

drivers/rtc/rtc-tps6586x.c: device wakeup flags correction 

Use device_init_wakeup() instead of device_set_wakeup_capable() and move
it before rtc dev registering.  This fixes alarmtimer not registered
when tps6586x rtc is the only wakeup compatible rtc in the system.

Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
Cc: Laxman Dewangan <ldewangan@nvidia.com>
Cc: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 2 additions and 1 deletions Side-by-side Diff

drivers/rtc/rtc-tps6586x.c
Diff comments   View file @ 5a28084
... ... @@ -273,6 +273,8 @@
273 273 return ret;
274 274 }
275 275  
  276 + device_init_wakeup(&pdev->dev, 1);
  277 +
276 278 platform_set_drvdata(pdev, rtc);
277 279 rtc->rtc = devm_rtc_device_register(&pdev->dev, dev_name(&pdev->dev),
278 280 &tps6586x_rtc_ops, THIS_MODULE);
... ... @@ -292,7 +294,6 @@
292 294 goto fail_rtc_register;
293 295 }
294 296 disable_irq(rtc->irq);
295   - device_set_wakeup_capable(&pdev->dev, 1);
296 297 return 0;
297 298  
298 299 fail_rtc_register: