History

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"

Linus Torvalds committed 1 year ago

Commit 41d318c2 parents 7bb4d65 162f24c3 files · +1 −3Browse files

Unified · Split

3 files
  1. drivers/rtc/rtc-cpcap.c +0 −1
  2. drivers/rtc/rtc-rx8025.c +1 −1
  3. drivers/rtc/rtc-tps6586x.c +0 −1
drivers/rtc/rtc-cpcap.c+0−1
@@ -268,7 +268,6 @@ static int cpcap_rtc_probe(struct platform_device *pdev) · 267 unmodified lines
268 return err;268 return err;
269 269
270 rtc->alarm_irq = platform_get_irq(pdev, 0);270 rtc->alarm_irq = platform_get_irq(pdev, 0);
271 rtc->alarm_enabled = true;
272 err = devm_request_threaded_irq(dev, rtc->alarm_irq, NULL,271 err = devm_request_threaded_irq(dev, rtc->alarm_irq, NULL,
273 cpcap_rtc_alarm_irq,272 cpcap_rtc_alarm_irq,
274 IRQF_TRIGGER_NONE | IRQF_ONESHOT,273 IRQF_TRIGGER_NONE | IRQF_ONESHOT,
drivers/rtc/rtc-rx8025.c+1−1
@@ -316,7 +316,7 @@ static int rx8025_init_client(struct i2c_client *client) · 315 unmodified lines
316 return hour_reg;316 return hour_reg;
317 rx8025->is_24 = (hour_reg & RX8035_BIT_HOUR_1224);317 rx8025->is_24 = (hour_reg & RX8035_BIT_HOUR_1224);
318 } else {318 } else {
319 rx8025->is_24 = (ctrl[1] & RX8025_BIT_CTRL1_1224);319 rx8025->is_24 = (ctrl[0] & RX8025_BIT_CTRL1_1224);
320 }320 }
321out:321out:
322 return err;322 return err;
drivers/rtc/rtc-tps6586x.c+0−1
@@ -258,7 +258,6 @@ static int tps6586x_rtc_probe(struct platform_device *pdev) · 257 unmodified lines
258 258
259 irq_set_status_flags(rtc->irq, IRQ_NOAUTOEN);259 irq_set_status_flags(rtc->irq, IRQ_NOAUTOEN);
260 260
261 rtc->irq_en = true;
262 ret = devm_request_threaded_irq(&pdev->dev, rtc->irq, NULL,261 ret = devm_request_threaded_irq(&pdev->dev, rtc->irq, NULL,
263 tps6586x_rtc_irq,262 tps6586x_rtc_irq,
264 IRQF_ONESHOT,263 IRQF_ONESHOT,