diff options
| author |   Alexandre Belloni <alexandre.belloni@bootlin.com> | 2023-02-25 23:31:23 +0100 |
|---|---|---|
| committer | Alexandre Belloni <alexandre.belloni@bootlin.com> | 2023-02-25 23:31:23 +0100 |
| commit | c978414bf5190c0474d3c98df95228c2635b6021 (patch) | |
| tree | 97be56caf3174786f048af93fbac2e9fcd3069c0 | |
| parent | rtc: abx80x: Add nvmem support (diff) | |
| parent | rtc: sunplus: fix format string for printing resource (diff) | |
| download | wireguard-linux-c978414bf5190c0474d3c98df95228c2635b6021.tar.xz wireguard-linux-c978414bf5190c0474d3c98df95228c2635b6021.zip | |
Merge tag 'rtc-6.2-fixes' into rtc-next
| -rw-r--r-- | Documentation/devicetree/bindings/rtc/qcom-pm8xxx-rtc.yaml | 2 | ||||
| -rw-r--r-- | drivers/rtc/rtc-sunplus.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/rtc/qcom-pm8xxx-rtc.yaml b/Documentation/devicetree/bindings/rtc/qcom-pm8xxx-rtc.yaml index 0a7aa29563c1..21c8ea08ff0a 100644 --- a/Documentation/devicetree/bindings/rtc/qcom-pm8xxx-rtc.yaml +++ b/Documentation/devicetree/bindings/rtc/qcom-pm8xxx-rtc.yaml @@ -40,6 +40,8 @@ properties: description: Indicates that the setting of RTC time is allowed by the host CPU. + wakeup-source: true + required: - compatible - reg diff --git a/drivers/rtc/rtc-sunplus.c b/drivers/rtc/rtc-sunplus.c index e8e2ab1103fc..4b578e4d44f6 100644 --- a/drivers/rtc/rtc-sunplus.c +++ b/drivers/rtc/rtc-sunplus.c @@ -240,8 +240,8 @@ static int sp_rtc_probe(struct platform_device *plat_dev) if (IS_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); - dev_dbg(&plat_dev->dev, "res = 0x%x, reg_base = 0x%lx\n", - sp_rtc->res->start, (unsigned long)sp_rtc->reg_base); + dev_dbg(&plat_dev->dev, "res = %pR, reg_base = %p\n", + sp_rtc->res, sp_rtc->reg_base); sp_rtc->irq = platform_get_irq(plat_dev, 0); if (sp_rtc->irq < 0) |