mailbox: zynqmp: Move struct zynqmp_ipi_msg from sys_proto.h

Mailbox driver might be need for Versal and other future platforms.
To remove the dependency, move struct zynqmp_ipi_msg to
zynqmp_firmware.h so that mailbox driver compiles for other platforms
easily.

Signed-off-by: Ashok Reddy Soma <ashok.reddy.soma@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@amd.com>
Link: https://lore.kernel.org/r/20220722084658.30995-5-ashok.reddy.soma@xilinx.com

diff --git a/arch/arm/mach-zynqmp/include/mach/sys_proto.h b/arch/arm/mach-zynqmp/include/mach/sys_proto.h
index 1c12eac715e560106bf487a9227b836c17cddf1d..9fffb4e541c942567814d844f40c5dc3a1e5959e 100644 (file)
--- a/arch/arm/mach-zynqmp/include/mach/sys_proto.h
+++ b/arch/arm/mach-zynqmp/include/mach/sys_proto.h
@@ -46,11 +46,6 @@ enum {
        TCM_SPLIT,
 };
 
-struct zynqmp_ipi_msg {
-       size_t len;
-       u32 *buf;
-};
-
 int zynq_board_read_rom_ethaddr(unsigned char *ethaddr);
 unsigned int zynqmp_get_silicon_version(void);
 

diff --git a/drivers/mailbox/zynqmp-ipi.c b/drivers/mailbox/zynqmp-ipi.c
index 959cce923c5982266003be5396f487ce49697e64..3e4ec47389ff292d815daa9f18563acb99b64848 100644 (file)
--- a/drivers/mailbox/zynqmp-ipi.c
+++ b/drivers/mailbox/zynqmp-ipi.c
@@ -11,10 +11,10 @@
 #include <dm.h>
 #include <mailbox-uclass.h>
 #include <dm/device_compat.h>
-#include <mach/sys_proto.h>
 #include <linux/ioport.h>
 #include <linux/io.h>
 #include <wait_bit.h>
+#include <zynqmp_firmware.h>
 
 /* IPI bitmasks, register base */
 /* TODO: move reg base to DT */

diff --git a/include/zynqmp_firmware.h b/include/zynqmp_firmware.h
index 52bc20f195e73e1b5237546ac746af83eadb9a5f..f7a4a39d350b002a52caa5b9013fe527bf2c1c7c 100644 (file)
--- a/include/zynqmp_firmware.h
+++ b/include/zynqmp_firmware.h
@@ -490,4 +490,9 @@ enum zynqmp_pm_request_ack {
 /* PM API versions */
 #define PM_API_VERSION_2               2
 
+struct zynqmp_ipi_msg {
+       size_t len;
+       u32 *buf;
+};
+
 #endif /* _ZYNQMP_FIRMWARE_H_ */