Merge branch 'topic/4.19/am65x' of git://git.ti.com/rpmsg/remoteproc into rpmsg-ti-linux-4.19.y

Pull in the dedicated AM65x remoteproc topic branch to bring in couple
of AM65x mailbox cleanup patches. Changes include mbox_msg_t type
simplification and the relocation of the AM65x Mailbox DT nodes from
the cbass_main interconnect node to the more accurate main_navss
interconnect node.

* 'topic/4.19/am65x' of git://git.ti.com/rpmsg/remoteproc:
  mailbox/omap: Simplify mbox_msg_t usage
  arm64: dts: ti: k3-am65-main: Move mailbox nodes to main_navss interconnect

Signed-off-by: Suman Anna <s-anna@ti.com>

arch/arm64/boot/dts/ti/k3-am65-main.dtsi

@@ -119,6 +119,126 @@
 			#hwlock-cells = <1>;
 		};
 
+		mailbox0_cluster0: mailbox@31f80000 {
+			compatible = "ti,am654-mailbox";
+			reg = <0x00 0x31f80000 0x00 0x200>;
+			#mbox-cells = <1>;
+			ti,mbox-num-users = <4>;
+			ti,mbox-num-fifos = <16>;
+			interrupt-parent = <&main_navss_intr>;
+			interrupts = <164 0 IRQ_TYPE_LEVEL_HIGH>;
+
+			mbox_mcu_r5fss0_core0: mbox-mcu-r5fss0-core0 {
+				ti,mbox-tx = <1 0 0>;
+				ti,mbox-rx = <0 0 0>;
+			};
+		};
+
+		mailbox0_cluster1: mailbox@31f81000 {
+			compatible = "ti,am654-mailbox";
+			reg = <0x00 0x31f81000 0x00 0x200>;
+			#mbox-cells = <1>;
+			ti,mbox-num-users = <4>;
+			ti,mbox-num-fifos = <16>;
+			interrupt-parent = <&main_navss_intr>;
+			interrupts = <165 0 IRQ_TYPE_LEVEL_HIGH>;
+
+			mbox_mcu_r5fss0_core1: mbox-mcu-r5fss0-core1 {
+				ti,mbox-tx = <1 0 0>;
+				ti,mbox-rx = <0 0 0>;
+			};
+		};
+
+		mailbox0_cluster2: mailbox@31f82000 {
+			compatible = "ti,am654-mailbox";
+			reg = <0x00 0x31f82000 0x00 0x200>;
+			#mbox-cells = <1>;
+			ti,mbox-num-users = <4>;
+			ti,mbox-num-fifos = <16>;
+			status = "disabled";
+		};
+
+		mailbox0_cluster3: mailbox@31f83000 {
+			compatible = "ti,am654-mailbox";
+			reg = <0x00 0x31f83000 0x00 0x200>;
+			#mbox-cells = <1>;
+			ti,mbox-num-users = <4>;
+			ti,mbox-num-fifos = <16>;
+			status = "disabled";
+		};
+
+		mailbox0_cluster4: mailbox@31f84000 {
+			compatible = "ti,am654-mailbox";
+			reg = <0x00 0x31f84000 0x00 0x200>;
+			#mbox-cells = <1>;
+			ti,mbox-num-users = <4>;
+			ti,mbox-num-fifos = <16>;
+			status = "disabled";
+		};
+
+		mailbox0_cluster5: mailbox@31f85000 {
+			compatible = "ti,am654-mailbox";
+			reg = <0x00 0x31f85000 0x00 0x200>;
+			#mbox-cells = <1>;
+			ti,mbox-num-users = <4>;
+			ti,mbox-num-fifos = <16>;
+			status = "disabled";
+		};
+
+		mailbox0_cluster6: mailbox@31f86000 {
+			compatible = "ti,am654-mailbox";
+			reg = <0x00 0x31f86000 0x00 0x200>;
+			#mbox-cells = <1>;
+			ti,mbox-num-users = <4>;
+			ti,mbox-num-fifos = <16>;
+			status = "disabled";
+		};
+
+		mailbox0_cluster7: mailbox@31f87000 {
+			compatible = "ti,am654-mailbox";
+			reg = <0x00 0x31f87000 0x00 0x200>;
+			#mbox-cells = <1>;
+			ti,mbox-num-users = <4>;
+			ti,mbox-num-fifos = <16>;
+			status = "disabled";
+		};
+
+		mailbox0_cluster8: mailbox@31f88000 {
+			compatible = "ti,am654-mailbox";
+			reg = <0x00 0x31f88000 0x00 0x200>;
+			#mbox-cells = <1>;
+			ti,mbox-num-users = <4>;
+			ti,mbox-num-fifos = <16>;
+			status = "disabled";
+		};
+
+		mailbox0_cluster9: mailbox@31f89000 {
+			compatible = "ti,am654-mailbox";
+			reg = <0x00 0x31f89000 0x00 0x200>;
+			#mbox-cells = <1>;
+			ti,mbox-num-users = <4>;
+			ti,mbox-num-fifos = <16>;
+			status = "disabled";
+		};
+
+		mailbox0_cluster10: mailbox@31f8a000 {
+			compatible = "ti,am654-mailbox";
+			reg = <0x00 0x31f8a000 0x00 0x200>;
+			#mbox-cells = <1>;
+			ti,mbox-num-users = <4>;
+			ti,mbox-num-fifos = <16>;
+			status = "disabled";
+		};
+
+		mailbox0_cluster11: mailbox@31f8b000 {
+			compatible = "ti,am654-mailbox";
+			reg = <0x00 0x31f8b000 0x00 0x200>;
+			#mbox-cells = <1>;
+			ti,mbox-num-users = <4>;
+			ti,mbox-num-fifos = <16>;
+			status = "disabled";
+		};
+
 		ringacc: ringacc@3c000000 {
 			compatible = "ti,am654-navss-ringacc";
 			reg =	<0x0 0x3c000000 0x0 0x400000>,
@@ -344,126 +464,6 @@
 		clock-names = "gpio";
 	};
 
-	mailbox0_cluster0: mailbox@31f80000 {
-		compatible = "ti,am654-mailbox";
-		reg = <0x00 0x31f80000 0x00 0x200>;
-		#mbox-cells = <1>;
-		ti,mbox-num-users = <4>;
-		ti,mbox-num-fifos = <16>;
-		interrupt-parent = <&main_navss_intr>;
-		interrupts = <164 0 IRQ_TYPE_LEVEL_HIGH>;
-
-		mbox_mcu_r5fss0_core0: mbox-mcu-r5fss0-core0 {
-			ti,mbox-tx = <1 0 0>;
-			ti,mbox-rx = <0 0 0>;
-		};
-	};
-
-	mailbox0_cluster1: mailbox@31f81000 {
-		compatible = "ti,am654-mailbox";
-		reg = <0x00 0x31f81000 0x00 0x200>;
-		#mbox-cells = <1>;
-		ti,mbox-num-users = <4>;
-		ti,mbox-num-fifos = <16>;
-		interrupt-parent = <&main_navss_intr>;
-		interrupts = <165 0 IRQ_TYPE_LEVEL_HIGH>;
-
-		mbox_mcu_r5fss0_core1: mbox-mcu-r5fss0-core1 {
-			ti,mbox-tx = <1 0 0>;
-			ti,mbox-rx = <0 0 0>;
-		};
-	};
-
-	mailbox0_cluster2: mailbox@31f82000 {
-		compatible = "ti,am654-mailbox";
-		reg = <0x00 0x31f82000 0x00 0x200>;
-		#mbox-cells = <1>;
-		ti,mbox-num-users = <4>;
-		ti,mbox-num-fifos = <16>;
-		status = "disabled";
-	};
-
-	mailbox0_cluster3: mailbox@31f83000 {
-		compatible = "ti,am654-mailbox";
-		reg = <0x00 0x31f83000 0x00 0x200>;
-		#mbox-cells = <1>;
-		ti,mbox-num-users = <4>;
-		ti,mbox-num-fifos = <16>;
-		status = "disabled";
-	};
-
-	mailbox0_cluster4: mailbox@31f84000 {
-		compatible = "ti,am654-mailbox";
-		reg = <0x00 0x31f84000 0x00 0x200>;
-		#mbox-cells = <1>;
-		ti,mbox-num-users = <4>;
-		ti,mbox-num-fifos = <16>;
-		status = "disabled";
-	};
-
-	mailbox0_cluster5: mailbox@31f85000 {
-		compatible = "ti,am654-mailbox";
-		reg = <0x00 0x31f85000 0x00 0x200>;
-		#mbox-cells = <1>;
-		ti,mbox-num-users = <4>;
-		ti,mbox-num-fifos = <16>;
-		status = "disabled";
-	};
-
-	mailbox0_cluster6: mailbox@31f86000 {
-		compatible = "ti,am654-mailbox";
-		reg = <0x00 0x31f86000 0x00 0x200>;
-		#mbox-cells = <1>;
-		ti,mbox-num-users = <4>;
-		ti,mbox-num-fifos = <16>;
-		status = "disabled";
-	};
-
-	mailbox0_cluster7: mailbox@31f87000 {
-		compatible = "ti,am654-mailbox";
-		reg = <0x00 0x31f87000 0x00 0x200>;
-		#mbox-cells = <1>;
-		ti,mbox-num-users = <4>;
-		ti,mbox-num-fifos = <16>;
-		status = "disabled";
-	};
-
-	mailbox0_cluster8: mailbox@31f88000 {
-		compatible = "ti,am654-mailbox";
-		reg = <0x00 0x31f88000 0x00 0x200>;
-		#mbox-cells = <1>;
-		ti,mbox-num-users = <4>;
-		ti,mbox-num-fifos = <16>;
-		status = "disabled";
-	};
-
-	mailbox0_cluster9: mailbox@31f89000 {
-		compatible = "ti,am654-mailbox";
-		reg = <0x00 0x31f89000 0x00 0x200>;
-		#mbox-cells = <1>;
-		ti,mbox-num-users = <4>;
-		ti,mbox-num-fifos = <16>;
-		status = "disabled";
-	};
-
-	mailbox0_cluster10: mailbox@31f8a000 {
-		compatible = "ti,am654-mailbox";
-		reg = <0x00 0x31f8a000 0x00 0x200>;
-		#mbox-cells = <1>;
-		ti,mbox-num-users = <4>;
-		ti,mbox-num-fifos = <16>;
-		status = "disabled";
-	};
-
-	mailbox0_cluster11: mailbox@31f8b000 {
-		compatible = "ti,am654-mailbox";
-		reg = <0x00 0x31f8b000 0x00 0x200>;
-		#mbox-cells = <1>;
-		ti,mbox-num-users = <4>;
-		ti,mbox-num-fifos = <16>;
-		status = "disabled";
-	};
-
 	icssg_soc_bus0: pruss-soc-bus@b026004 {
 		compatible = "ti,am654-icssg-soc-bus";
 		reg = <0x00 0x0b026004 0x00 0x4>;

include/linux/omap-mailbox.h

@@ -6,13 +6,9 @@
 #ifndef OMAP_MAILBOX_H
 #define OMAP_MAILBOX_H
 
-#if defined(CONFIG_ARCH_K3)
-typedef u64 mbox_msg_t;
-#else
-typedef u32 mbox_msg_t;
-#endif
+typedef uintptr_t mbox_msg_t;
 
-#define to_omap_mbox_msg(data) (u32)(*(mbox_msg_t *)(&(data)))
+#define to_omap_mbox_msg(data) (u32)(mbox_msg_t)(data)
 
 typedef int __bitwise omap_mbox_irq_t;
 #define IRQ_TX ((__force omap_mbox_irq_t) 1)