Skip to content

[pull] master from torvalds:master #1968

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Jul 1, 2025
Merged

[pull] master from torvalds:master #1968

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
002cc0e
rtc: s5m: cache device type during probe
andred Apr 9, 2025
a57743b
rtc: s5m: prepare for external regmap
andred Apr 9, 2025
e641808
rtc: s5m: add support for S2MPG10 RTC
andred Apr 9, 2025
972a3b4
rtc: s5m: fix a typo: peding -> pending
andred Apr 9, 2025
1dd6095
rtc: s5m: switch to devm_device_init_wakeup
andred Apr 9, 2025
f5adb1f
rtc: s5m: replace regmap_update_bits with regmap_clear/set_bits
andred Apr 9, 2025
b1248da
rtc: s5m: replace open-coded read/modify/write registers with regmap …
andred Apr 9, 2025
00a39d8
rtc: cmos: use spin_lock_irqsave in cmos_interrupt
matjon Jun 7, 2025
fa78e9b
rtc: pcf2127: fix SPI command byte for PCF2131
elenap08 May 30, 2025
08d82d0
rtc: pcf2127: add missing semicolon after statement
hvilleneuvedoo May 29, 2025
6f11adc
io_uring: gate REQ_F_ISREG on !S_ANON_INODE as well
axboe Jun 29, 2025
4b424a3
Merge tag 'rtc-6.16-fixes' of git://git.kernel.org/pub/scm/linux/kern…
torvalds Jun 30, 2025
6670175
Merge tag 'io_uring-6.16-20250630' of git://git.kernel.dk/linux
torvalds Jun 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions drivers/rtc/rtc-cmos.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -692,8 +692,12 @@ static irqreturn_t cmos_interrupt(int irq, void *p)
{
u8 irqstat;
u8 rtc_control;
unsigned long flags;

spin_lock(&rtc_lock);
/* We cannot use spin_lock() here, as cmos_interrupt() is also called
* in a non-irq context.
*/
spin_lock_irqsave(&rtc_lock, flags);

/* When the HPET interrupt handler calls us, the interrupt
* status is passed as arg1 instead of the irq number. But
Expand Down Expand Up @@ -727,7 +731,7 @@ static irqreturn_t cmos_interrupt(int irq, void *p)
hpet_mask_rtc_irq_bit(RTC_AIE);
CMOS_READ(RTC_INTR_FLAGS);
}
spin_unlock(&rtc_lock);
spin_unlock_irqrestore(&rtc_lock, flags);

if (is_intr(irqstat)) {
rtc_update_irq(p, 1, irqstat);
Expand Down Expand Up @@ -1295,9 +1299,7 @@ static void cmos_check_wkalrm(struct device *dev)
* ACK the rtc irq here
*/
if (t_now >= cmos->alarm_expires && cmos_use_acpi_alarm()) {
local_irq_disable();
cmos_interrupt(0, (void *)cmos->rtc);
local_irq_enable();
return;
}

Expand Down
7 changes: 6 additions & 1 deletion drivers/rtc/rtc-pcf2127.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1538,7 +1538,12 @@ static int pcf2127_spi_probe(struct spi_device *spi)
variant = &pcf21xx_cfg[type];
}

config.max_register = variant->max_register,
if (variant->type == PCF2131) {
config.read_flag_mask = 0x0;
config.write_flag_mask = 0x0;
}

config.max_register = variant->max_register;

regmap = devm_regmap_init_spi(spi, &config);
if (IS_ERR(regmap)) {
Expand Down
Loading