Commit 41d318c4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull RTC fixes from Alexandre Belloni:
 "The two reverts are for patches that I shouldn't have applied. The
  rx8025 patch fixes an issue present since 2022:

   - cpcap, tps6586x: revert incorrect irq enable/disable balance fix

   - rx8025: fix incorrect register reference"

* tag 'rtc-6.18-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
  rtc: rx8025: fix incorrect register reference
  Revert "rtc: cpcap: Fix initial enable_irq/disable_irq balance"
  Revert "rtc: tps6586x: Fix initial enable_irq/disable_irq balance"
parents 7bb4d651 162f24cb

drivers/rtc/rtc-cpcap.c

+0 −1
Original line number Diff line number Diff line
@@ -268,7 +268,6 @@ static int cpcap_rtc_probe(struct platform_device *pdev) 
		return err;



	rtc->alarm_irq = platform_get_irq(pdev, 0);

	rtc->alarm_enabled = true;

	err = devm_request_threaded_irq(dev, rtc->alarm_irq, NULL,

					cpcap_rtc_alarm_irq,

					IRQF_TRIGGER_NONE | IRQF_ONESHOT,

drivers/rtc/rtc-rx8025.c

+1 −1
Original line number Diff line number Diff line
@@ -316,7 +316,7 @@ static int rx8025_init_client(struct i2c_client *client) 
			return hour_reg;

		rx8025->is_24 = (hour_reg & RX8035_BIT_HOUR_1224);

	} else {

		rx8025->is_24 = (ctrl[1] & RX8025_BIT_CTRL1_1224);

		rx8025->is_24 = (ctrl[0] & RX8025_BIT_CTRL1_1224);

	}

out:

	return err;

drivers/rtc/rtc-tps6586x.c

+0 −1
Original line number Diff line number Diff line
@@ -258,7 +258,6 @@ static int tps6586x_rtc_probe(struct platform_device *pdev) 


	irq_set_status_flags(rtc->irq, IRQ_NOAUTOEN);



	rtc->irq_en = true;

	ret = devm_request_threaded_irq(&pdev->dev, rtc->irq, NULL,

				tps6586x_rtc_irq,

				IRQF_ONESHOT,