diff mbox series

[v6,10/11] arm64: dts: qcom: ipq5332: Add nodes to bringup multipd

Message ID 20231110091939.3025413-11-quic_mmanikan@quicinc.com (mailing list archive)
State Changes Requested
Headers show
Series Add multipd remoteproc support | expand

Commit Message

Manikanta Mylavarapu Nov. 10, 2023, 9:19 a.m. UTC 
Enable nodes required for multipd remoteproc bring up.

Signed-off-by: Manikanta Mylavarapu <quic_mmanikan@quicinc.com>
---
Changes in v6:
	- Added user pd remoteproc nodes in RDP442 dts

Changes in v5:
	- Rebased on linux-next

Changes in v4:
	- Rebased on linux-next

 arch/arm64/boot/dts/qcom/ipq5332-rdp441.dts | 21 ++++++++
 arch/arm64/boot/dts/qcom/ipq5332-rdp442.dts | 59 +++++++++++++++++++++
 arch/arm64/boot/dts/qcom/ipq5332.dtsi       | 59 +++++++++++++++++++++
 3 files changed, 139 insertions(+)
diff mbox series

Patch

diff --git a/arch/arm64/boot/dts/qcom/ipq5332-rdp441.dts b/arch/arm64/boot/dts/qcom/ipq5332-rdp441.dts
index e89e2e948603..e0e2f9238b47 100644
--- a/arch/arm64/boot/dts/qcom/ipq5332-rdp441.dts
+++ b/arch/arm64/boot/dts/qcom/ipq5332-rdp441.dts
@@ -21,6 +21,27 @@  &blsp1_i2c1 {
 	status = "okay";
 };
 
+&q6v5_wcss {
+	pd-1 {
+		firmware-name = "ath11k/IPQ5332/hw1.0/q6_fw1.mdt";
+		interrupts-extended = <&wcss_smp2p_in 8 IRQ_TYPE_NONE>,
+				      <&wcss_smp2p_in 9 IRQ_TYPE_NONE>,
+				      <&wcss_smp2p_in 12 IRQ_TYPE_NONE>,
+				      <&wcss_smp2p_in 11 IRQ_TYPE_NONE>;
+		interrupt-names = "fatal",
+				  "ready",
+				  "spawn-ack",
+				  "stop-ack";
+
+		qcom,smem-states = <&wcss_smp2p_out 8>,
+				   <&wcss_smp2p_out 9>,
+				   <&wcss_smp2p_out 10>;
+		qcom,smem-state-names = "shutdown",
+					"stop",
+					"spawn";
+	};
+};
+
 &sdhc {
 	bus-width = <4>;
 	max-frequency = <192000000>;
diff --git a/arch/arm64/boot/dts/qcom/ipq5332-rdp442.dts b/arch/arm64/boot/dts/qcom/ipq5332-rdp442.dts
index efd480a7afdf..9b145c62e18d 100644
--- a/arch/arm64/boot/dts/qcom/ipq5332-rdp442.dts
+++ b/arch/arm64/boot/dts/qcom/ipq5332-rdp442.dts
@@ -35,6 +35,65 @@  flash@0 {
 	};
 };
 
+&q6v5_wcss {
+	pd-1 {
+		firmware-name = "ath11k/IPQ5332/hw1.0/q6_fw1.mdt";
+		interrupts-extended = <&wcss_smp2p_in 8 IRQ_TYPE_NONE>,
+				      <&wcss_smp2p_in 9 IRQ_TYPE_NONE>,
+				      <&wcss_smp2p_in 12 IRQ_TYPE_NONE>,
+				      <&wcss_smp2p_in 11 IRQ_TYPE_NONE>;
+		interrupt-names = "fatal",
+				  "ready",
+				  "spawn-ack",
+				  "stop-ack";
+
+		qcom,smem-states = <&wcss_smp2p_out 8>,
+				   <&wcss_smp2p_out 9>,
+				   <&wcss_smp2p_out 10>;
+		qcom,smem-state-names = "shutdown",
+					"stop",
+					"spawn";
+	};
+
+	pd-2 {
+		firmware-name = "ath11k/IPQ5332/hw1.0/q6_fw2.mdt";
+		interrupts-extended = <&wcss_smp2p_in 16 IRQ_TYPE_NONE>,
+				      <&wcss_smp2p_in 17 IRQ_TYPE_NONE>,
+				      <&wcss_smp2p_in 20 IRQ_TYPE_NONE>,
+				      <&wcss_smp2p_in 19 IRQ_TYPE_NONE>;
+		interrupt-names = "fatal",
+				  "ready",
+				  "spawn-ack",
+				  "stop-ack";
+
+		qcom,smem-states = <&wcss_smp2p_out 16>,
+				   <&wcss_smp2p_out 17>,
+				   <&wcss_smp2p_out 18>;
+		qcom,smem-state-names = "shutdown",
+					"stop",
+					"spawn";
+	};
+
+	pd-3 {
+		firmware-name = "ath11k/IPQ5332/hw1.0/q6_fw3.mdt";
+		interrupts-extended = <&wcss_smp2p_in 24 IRQ_TYPE_NONE>,
+				      <&wcss_smp2p_in 25 IRQ_TYPE_NONE>,
+				      <&wcss_smp2p_in 28 IRQ_TYPE_NONE>,
+				      <&wcss_smp2p_in 27 IRQ_TYPE_NONE>;
+		interrupt-names = "fatal",
+				  "ready",
+				  "spawn-ack",
+				  "stop-ack";
+
+		qcom,smem-states = <&wcss_smp2p_out 24>,
+				   <&wcss_smp2p_out 25>,
+				   <&wcss_smp2p_out 26>;
+		qcom,smem-state-names = "shutdown",
+					"stop",
+					"spawn";
+	};
+};
+
 &sdhc {
 	bus-width = <4>;
 	max-frequency = <192000000>;
diff --git a/arch/arm64/boot/dts/qcom/ipq5332.dtsi b/arch/arm64/boot/dts/qcom/ipq5332.dtsi
index 42e2e48b2bc3..0fdaece3dc8f 100644
--- a/arch/arm64/boot/dts/qcom/ipq5332.dtsi
+++ b/arch/arm64/boot/dts/qcom/ipq5332.dtsi
@@ -145,6 +145,11 @@  smem@4a800000 {
 
 			hwlocks = <&tcsr_mutex 3>;
 		};
+
+		q6_region: wcnss@4a900000 {
+			reg = <0x0 0x4a900000 0x0 0x2b00000>;
+			no-map;
+		};
 	};
 
 	soc@0 {
@@ -473,6 +478,36 @@  frame@b128000 {
 				status = "disabled";
 			};
 		};
+
+		q6v5_wcss: remoteproc@d100000 {
+			compatible = "qcom,ipq5332-q6-mpd";
+			reg = <0xd100000 0x4040>;
+			firmware-name = "ath11k/IPQ5332/hw1.0/q6_fw0.mdt",
+					"ath11k/IPQ5332/hw1.0/iu_fw.mdt";
+			interrupts-extended = <&intc GIC_SPI 421 IRQ_TYPE_EDGE_RISING>,
+					      <&wcss_smp2p_in 0 IRQ_TYPE_NONE>,
+					      <&wcss_smp2p_in 1 IRQ_TYPE_NONE>,
+					      <&wcss_smp2p_in 2 IRQ_TYPE_NONE>,
+					      <&wcss_smp2p_in 3 IRQ_TYPE_NONE>;
+			interrupt-names = "wdog",
+					  "fatal",
+					  "ready",
+					  "handover",
+					  "stop-ack";
+			qcom,smem-states = <&wcss_smp2p_out 0>,
+					   <&wcss_smp2p_out 1>;
+			qcom,smem-state-names = "shutdown",
+						"stop";
+
+			memory-region = <&q6_region>;
+
+			glink-edge {
+				interrupts = <GIC_SPI 417 IRQ_TYPE_EDGE_RISING>;
+				label = "rtr";
+				qcom,remote-pid = <1>;
+				mboxes = <&apcs_glb 8>;
+			};
+		};
 	};
 
 	timer {
@@ -482,4 +517,28 @@  timer {
 			     <GIC_PPI 4 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
 			     <GIC_PPI 1 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>;
 	};
+
+	wcss: wcss-smp2p {
+		compatible = "qcom,smp2p";
+		qcom,smem = <435>, <428>;
+
+		interrupt-parent = <&intc>;
+		interrupts = <GIC_SPI 418 IRQ_TYPE_EDGE_RISING>;
+
+		mboxes = <&apcs_glb 9>;
+
+		qcom,local-pid = <0>;
+		qcom,remote-pid = <1>;
+
+		wcss_smp2p_out: master-kernel {
+			qcom,entry-name = "master-kernel";
+			#qcom,smem-state-cells = <1>;
+		};
+
+		wcss_smp2p_in: slave-kernel {
+			qcom,entry-name = "slave-kernel";
+			interrupt-controller;
+			#interrupt-cells = <2>;
+		};
+	};
 };