Skip to content

Commit c978414

Browse files
Merge tag 'rtc-6.2-fixes' into rtc-next
2 parents e90ff8e + 0827946 commit c978414

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

Documentation/devicetree/bindings/rtc/qcom-pm8xxx-rtc.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ properties:
4040
description:
4141
Indicates that the setting of RTC time is allowed by the host CPU.
4242

43+
wakeup-source: true
44+
4345
required:
4446
- compatible
4547
- reg

drivers/rtc/rtc-sunplus.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,8 +240,8 @@ static int sp_rtc_probe(struct platform_device *plat_dev)
240240
if (IS_ERR(sp_rtc->reg_base))
241241
return dev_err_probe(&plat_dev->dev, PTR_ERR(sp_rtc->reg_base),
242242
"%s devm_ioremap_resource fail\n", RTC_REG_NAME);
243-
dev_dbg(&plat_dev->dev, "res = 0x%x, reg_base = 0x%lx\n",
244-
sp_rtc->res->start, (unsigned long)sp_rtc->reg_base);
243+
dev_dbg(&plat_dev->dev, "res = %pR, reg_base = %p\n",
244+
sp_rtc->res, sp_rtc->reg_base);
245245

246246
sp_rtc->irq = platform_get_irq(plat_dev, 0);
247247
if (sp_rtc->irq < 0)

0 commit comments

Comments
 (0)