diff --git a/qcom/pineapple.dtsi b/qcom/pineapple.dtsi
index 22a0c56b..6dc8e185 100644
--- a/qcom/pineapple.dtsi
+++ b/qcom/pineapple.dtsi
@@ -969,6 +969,10 @@
 		status = "ok";
 
 		memory-region = <&spss_region_mem>;
+
+		qcom,signal-aop;
+		qcom,qmp = <&aoss_qmp>;
+
 		qcom,spss-scsr-bits = <24 25>;
 		qcom,extra-size = <4096>;
 
@@ -2356,54 +2360,6 @@
 		};
 	};
 
-	spss_pas: remoteproc-spss@1880000 {
-		compatible = "qcom,pineapple-spss-pas";
-		ranges;
-		reg = <0x188101c 0x4>,
-		      <0x1881024 0x4>,
-		      <0x1881028 0x4>,
-		      <0x188103c 0x4>,
-		      <0x1881100 0x4>,
-		      <0x1882014 0x4>;
-		reg-names = "sp2soc_irq_status", "sp2soc_irq_clr", "sp2soc_irq_mask",
-			    "rmb_err", "rmb_general_purpose", "rmb_err_spare2";
-		interrupts = <0 352 1>;
-
-		cx-supply = <&VDD_CX_LEVEL>;
-		cx-uV-uA = <RPMH_REGULATOR_LEVEL_TURBO 100000>;
-
-		clocks = <&rpmhcc RPMH_CXO_CLK>;
-		clock-names = "xo";
-		qcom,proxy-clock-names = "xo";
-		status = "ok";
-
-		memory-region = <&spss_region_mem>;
-		qcom,spss-scsr-bits = <24 25>;
-		qcom,extra-size = <4096>;
-
-		interconnects = <&aggre2_noc MASTER_CRYPTO &mc_virt SLAVE_EBI1>;
-		interconnect-names = "crypto_ddr";
-
-		glink-edge {
-			qcom,remote-pid = <8>;
-			mboxes = <&ipcc_mproc IPCC_CLIENT_SPSS
-				  IPCC_MPROC_SIGNAL_GLINK_QMP>;
-			mbox-names = "spss_spss";
-			interrupt-parent = <&ipcc_mproc>;
-			interrupts = <IPCC_CLIENT_SPSS
-				      IPCC_MPROC_SIGNAL_GLINK_QMP
-				      IRQ_TYPE_EDGE_RISING>;
-
-			reg = <0x1885008 0x8>,
-			      <0x1885010 0x4>;
-			reg-names = "qcom,spss-addr",
-				    "qcom,spss-size";
-
-			label = "spss";
-			qcom,glink-label = "spss";
-		};
-	};
-
 	gic-interrupt-router {
 		compatible = "qcom,gic-intr-routing";
 		/* keep silver core only to avoid wakeup of gold cores */