tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Alexandre Belloni c978414b e90ff8ed

+4 -2
+2
Documentation/devicetree/bindings/rtc/qcom-pm8xxx-rtc.yaml
··· 40 40 description: 41 41 Indicates that the setting of RTC time is allowed by the host CPU. 42 42 43 + wakeup-source: true 44 + 43 45 required: 44 46 - compatible 45 47 - reg
+2 -2
drivers/rtc/rtc-sunplus.c
··· 240 240 if (IS_ERR(sp_rtc->reg_base)) 241 241 return dev_err_probe(&plat_dev->dev, PTR_ERR(sp_rtc->reg_base), 242 242 "%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); 245 245 246 246 sp_rtc->irq = platform_get_irq(plat_dev, 0); 247 247 if (sp_rtc->irq < 0)