Skip to content
Snippets Groups Projects
Commit c978414b authored by Alexandre Belloni's avatar Alexandre Belloni
Browse files

Merge tag 'rtc-6.2-fixes' into rtc-next

parents e90ff8ed 08279468
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Documentation/devicetree/bindings/rtc/qcom-pm8xxx-rtc.yaml
+ 2
− 0
View file @ c978414b
...@@ -40,6 +40,8 @@ properties: ...@@ -40,6 +40,8 @@ properties:
description: description:
Indicates that the setting of RTC time is allowed by the host CPU. Indicates that the setting of RTC time is allowed by the host CPU.
wakeup-source: true
required: required:
- compatible - compatible
- reg - reg
......
drivers/rtc/rtc-sunplus.c
+ 2
− 2
View file @ c978414b
...@@ -240,8 +240,8 @@ static int sp_rtc_probe(struct platform_device *plat_dev) ...@@ -240,8 +240,8 @@ static int sp_rtc_probe(struct platform_device *plat_dev)
if (IS_ERR(sp_rtc->reg_base)) if (IS_ERR(sp_rtc->reg_base))
return dev_err_probe(&plat_dev->dev, PTR_ERR(sp_rtc->reg_base), return dev_err_probe(&plat_dev->dev, PTR_ERR(sp_rtc->reg_base),
"%s devm_ioremap_resource fail\n", RTC_REG_NAME); "%s devm_ioremap_resource fail\n", RTC_REG_NAME);
dev_dbg(&plat_dev->dev, "res = 0x%x, reg_base = 0x%lx\n", dev_dbg(&plat_dev->dev, "res = %pR, reg_base = %p\n",
sp_rtc->res->start, (unsigned long)sp_rtc->reg_base); sp_rtc->res, sp_rtc->reg_base);
sp_rtc->irq = platform_get_irq(plat_dev, 0); sp_rtc->irq = platform_get_irq(plat_dev, 0);
if (sp_rtc->irq < 0) if (sp_rtc->irq < 0)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment