Commit c978414b authored by Alexandre Belloni's avatar Alexandre Belloni
Browse files

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

parents e90ff8ed 08279468

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

+2 −0
Original line number Diff line number Diff line
@@ -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

drivers/rtc/rtc-sunplus.c

+2 −2
Original line number Diff line number Diff line
@@ -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)