Unverified Commit 419a620d authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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: default avatarArnd Bergmann <arnd@arndb.de>
parents f8d91cfb 1f58ad77

drivers/cpuidle/cpuidle-zynq.c

+1 −1
Original line number Diff line number Diff line
@@ -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>

drivers/soc/xilinx/zynqmp_power.c

+3 −3
Original line number Diff line number Diff line
@@ -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 */