Commit 2a9f04bd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'rtc-6.14' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux 

Pull RTC updates from Alexandre Belloni:
 "Not much this cycle, there are multiple small fixes.

  Core:
   - use boolean values with device_init_wakeup()

  Drivers:
   - pcf2127: add BSM support
   - pcf85063: fix possible out of bounds write"

* tag 'rtc-6.14' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
  rtc: pcf2127: add BSM support
  rtc: Remove hpet_rtc_dropped_irq()
  dt-bindings: rtc: mxc: Document fsl,imx31-rtc
  rtc: stm32: Use syscon_regmap_lookup_by_phandle_args
  rtc: zynqmp: Fix optional clock name property
  rtc: loongson: clear TOY_MATCH0_REG in loongson_rtc_isr()
  rtc: pcf85063: fix potential OOB write in PCF85063 NVMEM read
  rtc: tps6594: Fix integer overflow on 32bit systems
  rtc: use boolean values with device_init_wakeup()
  rtc: RTC_DRV_SPEAR should not default to y when compile-testing
parents a4b5e48e 97274527

Documentation/devicetree/bindings/rtc/rtc-mxc.yaml

+7 −3
Original line number Diff line number Diff line
@@ -14,9 +14,13 @@ maintainers: 


properties:

  compatible:

    enum:

      - fsl,imx1-rtc

      - fsl,imx21-rtc

    oneOf:

      - const: fsl,imx1-rtc

      - const: fsl,imx21-rtc

      - items:

          - enum:

              - fsl,imx31-rtc

          - const: fsl,imx21-rtc



  reg:

    maxItems: 1

arch/x86/include/asm/hpet.h

+0 −1
Original line number Diff line number Diff line
@@ -84,7 +84,6 @@ extern int hpet_set_rtc_irq_bit(unsigned long bit_mask); 
extern int hpet_set_alarm_time(unsigned char hrs, unsigned char min,

			       unsigned char sec);

extern int hpet_set_periodic_freq(unsigned long freq);

extern int hpet_rtc_dropped_irq(void);

extern int hpet_rtc_timer_init(void);

extern irqreturn_t hpet_rtc_interrupt(int irq, void *dev_id);

extern int hpet_register_irq_handler(rtc_irq_handler handler);

arch/x86/kernel/hpet.c

+0 −6
Original line number Diff line number Diff line
@@ -1382,12 +1382,6 @@ int hpet_set_periodic_freq(unsigned long freq) 
}

EXPORT_SYMBOL_GPL(hpet_set_periodic_freq);



int hpet_rtc_dropped_irq(void)

{

	return is_hpet_enabled();

}

EXPORT_SYMBOL_GPL(hpet_rtc_dropped_irq);



static void hpet_rtc_timer_reinit(void)

{

	unsigned int delta;

drivers/rtc/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -1316,7 +1316,7 @@ config RTC_DRV_SC27XX 
config RTC_DRV_SPEAR

	tristate "SPEAR ST RTC"

	depends on PLAT_SPEAR || COMPILE_TEST

	default y

	default PLAT_SPEAR

	help

	 If you say Y here you will get support for the RTC found on

	 spear

drivers/rtc/rtc-88pm80x.c

+1 −1
Original line number Diff line number Diff line
@@ -308,7 +308,7 @@ static int pm80x_rtc_probe(struct platform_device *pdev) 
	/* remember whether this power up is caused by PMIC RTC or not */

	info->rtc_dev->dev.platform_data = &pdata->rtc_wakeup;



	device_init_wakeup(&pdev->dev, 1);

	device_init_wakeup(&pdev->dev, true);



	return 0;

out_rtc: