diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2026-01-21 16:37:44 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2026-01-21 16:37:44 +0100 |
| commit | 419a620dc452b9cd6aa684d99bcff352f7ab7f13 (patch) | |
| tree | f71450a8992aababaaf575a695bec804c47c61d4 | |
| parent | f8d91cfb93a292724352747b24ca2b6ad756107a (diff) | |
| parent | 1f58ad77a8b49638ad2b95b364cddc12f20cd011 (diff) | |
Merge tag 'zynqmp-soc-for-6.20' of https://github.com/Xilinx/linux-xlnx into soc/drivers
arm64: Xilinx SOC changes for 6.20
- Fix Michal's email in cpuidle driver
- s/system_unbound_wq/system_dfl_wq/g in zynqmp_power
* tag 'zynqmp-soc-for-6.20' of https://github.com/Xilinx/linux-xlnx:
cpuidle: zynq: Switch Michal Simek's email to new one
soc/xilinx: replace use of system_unbound_wq with system_dfl_wq
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| -rw-r--r-- | drivers/cpuidle/cpuidle-zynq.c | 2 | ||||
| -rw-r--r-- | drivers/soc/xilinx/zynqmp_power.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/cpuidle/cpuidle-zynq.c b/drivers/cpuidle/cpuidle-zynq.c index a79610e723b3..89448ae4845c 100644 --- a/drivers/cpuidle/cpuidle-zynq.c +++ b/drivers/cpuidle/cpuidle-zynq.c @@ -11,7 +11,7 @@ * #1 wait-for-interrupt * #2 wait-for-interrupt and RAM self refresh * - * Maintainer: Michal Simek <michal.simek@xilinx.com> + * Maintainer: Michal Simek <michal.simek@amd.com> */ #include <linux/init.h> diff --git a/drivers/soc/xilinx/zynqmp_power.c b/drivers/soc/xilinx/zynqmp_power.c index 9b7b2858b22a..9085db1b480a 100644 --- a/drivers/soc/xilinx/zynqmp_power.c +++ b/drivers/soc/xilinx/zynqmp_power.c @@ -82,7 +82,7 @@ static void subsystem_restart_event_callback(const u32 *payload, void *data) memcpy(zynqmp_pm_init_restart_work->args, &payload[0], sizeof(zynqmp_pm_init_restart_work->args)); - queue_work(system_unbound_wq, &zynqmp_pm_init_restart_work->callback_work); + queue_work(system_dfl_wq, &zynqmp_pm_init_restart_work->callback_work); } static void suspend_event_callback(const u32 *payload, void *data) @@ -95,7 +95,7 @@ static void suspend_event_callback(const u32 *payload, void *data) memcpy(zynqmp_pm_init_suspend_work->args, &payload[1], sizeof(zynqmp_pm_init_suspend_work->args)); - queue_work(system_unbound_wq, &zynqmp_pm_init_suspend_work->callback_work); + queue_work(system_dfl_wq, &zynqmp_pm_init_suspend_work->callback_work); } static irqreturn_t zynqmp_pm_isr(int irq, void *data) @@ -140,7 +140,7 @@ static void ipi_receive_callback(struct mbox_client *cl, void *data) memcpy(zynqmp_pm_init_suspend_work->args, &payload[1], sizeof(zynqmp_pm_init_suspend_work->args)); - queue_work(system_unbound_wq, + queue_work(system_dfl_wq, &zynqmp_pm_init_suspend_work->callback_work); /* Send NULL message to mbox controller to ack the message */ |