diff options
| author | Mark Brown <broonie@kernel.org> | 2026-09-14 14:46:27 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-09-14 14:46:27 +0100 |
| commit | 1c1a7ea24531d39900d1a0679fd4b8f175d531cc (patch) | |
| tree | 424277f99a1169dcbafa2a0e712f90d2cae67dfd | |
| parent | 72c1b71f14fea80de187b865ef6a08d7cc5b1a5f (diff) | |
| parent | aba7b41faeecb7692458095ce6fafc341fe0b80e (diff) | |
| download | linux-next-1c1a7ea24531d39900d1a0679fd4b8f175d531cc.tar.gz linux-next-1c1a7ea24531d39900d1a0679fd4b8f175d531cc.zip | |
Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git
| -rw-r--r-- | drivers/soundwire/cadence_master.c | 7 | ||||
| -rw-r--r-- | drivers/soundwire/dmi-quirks.c | 7 |
2 files changed, 14 insertions, 0 deletions
diff --git a/drivers/soundwire/cadence_master.c b/drivers/soundwire/cadence_master.c index e690237fe981..a0a63b76793e 100644 --- a/drivers/soundwire/cadence_master.c +++ b/drivers/soundwire/cadence_master.c @@ -1702,6 +1702,13 @@ int sdw_cdns_clock_stop(struct sdw_cdns *cdns, bool block_wake) } /* + * wait for any in-flight peripheral event handling to complete before stopping the clock. + * No need to disable peripheral interrupts before canceling the work, as the peripheral + * interrupts are already masked before the work is scheduled. + */ + cancel_work_sync(&cdns->work); + + /* * Before entering clock stop we mask the Slave * interrupts. This helps avoid having to deal with e.g. a * Slave becoming UNATTACHED while the clock is being stopped diff --git a/drivers/soundwire/dmi-quirks.c b/drivers/soundwire/dmi-quirks.c index 768255dd12db..62fa64b22412 100644 --- a/drivers/soundwire/dmi-quirks.c +++ b/drivers/soundwire/dmi-quirks.c @@ -203,6 +203,13 @@ static const struct dmi_system_id adr_remap_quirk_table[] = { { .matches = { DMI_MATCH(DMI_SYS_VENDOR, "ASUS"), + DMI_MATCH(DMI_BOARD_NAME, "GX651AX"), + }, + .driver_data = (void *)ghost_realtek, + }, + { + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "ASUS"), DMI_MATCH(DMI_BOARD_NAME, "UX5406AA"), }, .driver_data = (void *)ghost_realtek, |