Skip to content

Commit 419a620

Browse files
committed
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>
2 parents f8d91cf + 1f58ad7 commit 419a620

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

drivers/cpuidle/cpuidle-zynq.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* #1 wait-for-interrupt
1212
* #2 wait-for-interrupt and RAM self refresh
1313
*
14-
* Maintainer: Michal Simek <michal.simek@xilinx.com>
14+
* Maintainer: Michal Simek <michal.simek@amd.com>
1515
*/
1616

1717
#include <linux/init.h>

drivers/soc/xilinx/zynqmp_power.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ static void subsystem_restart_event_callback(const u32 *payload, void *data)
8282
memcpy(zynqmp_pm_init_restart_work->args, &payload[0],
8383
sizeof(zynqmp_pm_init_restart_work->args));
8484

85-
queue_work(system_unbound_wq, &zynqmp_pm_init_restart_work->callback_work);
85+
queue_work(system_dfl_wq, &zynqmp_pm_init_restart_work->callback_work);
8686
}
8787

8888
static void suspend_event_callback(const u32 *payload, void *data)
@@ -95,7 +95,7 @@ static void suspend_event_callback(const u32 *payload, void *data)
9595
memcpy(zynqmp_pm_init_suspend_work->args, &payload[1],
9696
sizeof(zynqmp_pm_init_suspend_work->args));
9797

98-
queue_work(system_unbound_wq, &zynqmp_pm_init_suspend_work->callback_work);
98+
queue_work(system_dfl_wq, &zynqmp_pm_init_suspend_work->callback_work);
9999
}
100100

101101
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)
140140
memcpy(zynqmp_pm_init_suspend_work->args, &payload[1],
141141
sizeof(zynqmp_pm_init_suspend_work->args));
142142

143-
queue_work(system_unbound_wq,
143+
queue_work(system_dfl_wq,
144144
&zynqmp_pm_init_suspend_work->callback_work);
145145

146146
/* Send NULL message to mbox controller to ack the message */

0 commit comments

Comments
 (0)