diff --git a/Kbuild b/Kbuild
index 6efa2e2a..7d2ad2c1 100644
--- a/Kbuild
+++ b/Kbuild
@@ -18,10 +18,6 @@ dtbo-y += sun/sun-dsp.dtbo
 endif
 endif
 
-ifeq ($(CONFIG_ARCH_NIOBE), y)
-dtbo-y += niobe/niobe-dsp.dtbo
-endif
-
 always-y	:= $(dtb-y) $(dtbo-y)
 subdir-y	:= $(dts-dirs)
 clean-files	:= *.dtb *.dtbo
diff --git a/niobe/niobe-dsp.dts b/niobe/niobe-dsp.dts
deleted file mode 100644
index 702b3ce0..00000000
--- a/niobe/niobe-dsp.dts
+++ /dev/null
@@ -1,11 +0,0 @@
-/dts-v1/;
-/plugin/;
-
-#include "niobe-dsp.dtsi"
-
-/ {
-	model = "Qualcomm Technologies, Inc. Niobe SoC";
-	compatible = "qcom,niobe";
-	qcom,msm-id = <629 0x10000>, <652 0x10000>;
-	qcom,board-id = <0 0>;
-};
diff --git a/niobe/niobe-dsp.dtsi b/niobe/niobe-dsp.dtsi
deleted file mode 100644
index f061ca4f..00000000
--- a/niobe/niobe-dsp.dtsi
+++ /dev/null
@@ -1,224 +0,0 @@
-&remoteproc_adsp_glink {
-	qcom,fastrpc {
-		compatible = "qcom,fastrpc";
-		qcom,glink-channels = "fastrpcglink-apps-dsp";
-		qcom,intents = <0x64 64>;
-		label = "adsp";
-		memory-region = <&adsp_mem_heap>;
-		qcom,vmids = <22 37>;
-
-		compute-cb@1 {
-			compatible = "qcom,fastrpc-compute-cb";
-			reg = <3>;
-			iommus = <&apps_smmu 0x1003 0x0000>,
-				 <&apps_smmu 0x1063 0x0000>;
-			qcom,iommu-dma-addr-pool = <0x10000000 0xF0000000>;
-			qcom,iommu-faults = "stall-disable", "HUPCF";
-			dma-coherent;
-			pd-type = <1>;	/* ROOT_PD */
-		};
-
-		compute-cb@2 {
-			compatible = "qcom,fastrpc-compute-cb";
-			reg = <4>;
-			iommus = <&apps_smmu 0x1004 0x0000>,
-				 <&apps_smmu 0x1064 0x0000>;
-			qcom,iommu-dma-addr-pool = <0x10000000 0xF0000000>;
-			qcom,iommu-faults = "stall-disable", "HUPCF";
-			dma-coherent;
-			pd-type = <2>;	/* AUDIO_STATICPD */
-		};
-
-		compute-cb@3 {
-			compatible = "qcom,fastrpc-compute-cb";
-			reg = <5>;
-			iommus = <&apps_smmu 0x1005 0x0000>,
-				 <&apps_smmu 0x1065 0x0000>;
-			qcom,iommu-dma-addr-pool = <0x10000000 0xF0000000>;
-			qcom,iommu-faults = "stall-disable", "HUPCF";
-			qcom,nsessions = <8>;
-			dma-coherent;
-			pd-type = <3>;	/* SENSORS_STATICPD */
-		};
-
-		compute-cb@4 {
-			compatible = "qcom,fastrpc-compute-cb";
-			reg = <6>;
-			iommus = <&apps_smmu 0x1006 0x0000>,
-				 <&apps_smmu 0x1066 0x0000>;
-			qcom,iommu-dma-addr-pool = <0x10000000 0xF0000000>;
-			qcom,iommu-faults = "stall-disable", "HUPCF";
-			dma-coherent;
-			pd-type = <7>;	/* USERPD */
-		};
-
-		compute-cb@5 {
-			compatible = "qcom,fastrpc-compute-cb";
-			reg = <7>;
-			iommus = <&apps_smmu 0x1007 0x0000>,
-				 <&apps_smmu 0x1067 0x0000>;
-			qcom,iommu-dma-addr-pool = <0x10000000 0xF0000000>;
-			qcom,iommu-faults = "stall-disable", "HUPCF";
-			dma-coherent;
-			pd-type = <7>;	/* USERPD */
-		};
-	};
-};
-
-&remoteproc_cdsp_glink {
-	qcom,fastrpc {
-		compatible = "qcom,fastrpc";
-		qcom,glink-channels = "fastrpcglink-apps-dsp";
-		qcom,intents = <0x64 64>;
-		label = "cdsp";
-		qcom,fastrpc-gids = <2908>;
-		qcom,rpc-latency-us = <235>;
-
-		compute-cb@1 {
-			compatible = "qcom,fastrpc-compute-cb";
-			reg = <1>;
-			iommus = <&apps_smmu 0x0C01 0x0040>,
-				 <&apps_smmu 0x0C21 0x0000>,
-				 <&apps_smmu 0x0C41 0x0040>;
-			qcom,iommu-dma-addr-pool = <0x10000000 0xF0000000>;
-			qcom,iommu-faults = "stall-disable", "HUPCF";
-			dma-coherent;
-			pd-type = <1>;	/* ROOT_PD */
-		};
-
-		compute-cb@2 {
-			compatible = "qcom,fastrpc-compute-cb";
-			reg = <2>;
-			iommus = <&apps_smmu 0x0C02 0x0040>,
-				 <&apps_smmu 0x0C22 0x0000>,
-				 <&apps_smmu 0x0C42 0x0040>;
-			qcom,iommu-dma-addr-pool = <0x10000000 0xF0000000>;
-			qcom,iommu-faults = "stall-disable", "HUPCF";
-			dma-coherent;
-			pd-type = <7>;	/* USERPD */
-		};
-
-		compute-cb@3 {
-			compatible = "qcom,fastrpc-compute-cb";
-			reg = <3>;
-			iommus = <&apps_smmu 0x0C03 0x0040>,
-				 <&apps_smmu 0x0C23 0x0000>,
-				 <&apps_smmu 0x0C43 0x0040>;
-			qcom,iommu-dma-addr-pool = <0x10000000 0xF0000000>;
-			qcom,iommu-faults = "stall-disable", "HUPCF";
-			dma-coherent;
-			pd-type = <7>;	/* USERPD */
-		};
-
-		compute-cb@4 {
-			compatible = "qcom,fastrpc-compute-cb";
-			reg = <4>;
-			iommus = <&apps_smmu 0x0C04 0x0040>,
-				 <&apps_smmu 0x0C24 0x0000>,
-				 <&apps_smmu 0x0C44 0x0040>;
-			qcom,iommu-dma-addr-pool = <0x10000000 0xF0000000>;
-			qcom,iommu-faults = "stall-disable", "HUPCF";
-			dma-coherent;
-			pd-type = <7>;	/* USERPD */
-		};
-
-		compute-cb@5 {
-			compatible = "qcom,fastrpc-compute-cb";
-			reg = <5>;
-			iommus = <&apps_smmu 0x0C05 0x0040>,
-				 <&apps_smmu 0x0C25 0x0000>,
-				 <&apps_smmu 0x0C45 0x0040>;
-			qcom,iommu-dma-addr-pool = <0x10000000 0xF0000000>;
-			qcom,iommu-faults = "stall-disable", "HUPCF";
-			dma-coherent;
-			pd-type = <7>;	/* USERPD */
-		};
-
-		compute-cb@6 {
-			compatible = "qcom,fastrpc-compute-cb";
-			reg = <6>;
-			iommus = <&apps_smmu 0x0C06 0x0040>,
-				 <&apps_smmu 0x0C26 0x0000>,
-				 <&apps_smmu 0x0C46 0x0040>;
-			qcom,iommu-dma-addr-pool = <0x10000000 0xF0000000>;
-			qcom,iommu-faults = "stall-disable", "HUPCF";
-			dma-coherent;
-			pd-type = <7>;	/* USERPD */
-		};
-
-		compute-cb@7 {
-			compatible = "qcom,fastrpc-compute-cb";
-			reg = <7>;
-			iommus = <&apps_smmu 0x0C07 0x0040>,
-				 <&apps_smmu 0x0C27 0x0000>,
-				 <&apps_smmu 0x0C47 0x0040>;
-			qcom,iommu-dma-addr-pool = <0x10000000 0xF0000000>;
-			qcom,iommu-faults = "stall-disable", "HUPCF";
-			dma-coherent;
-			pd-type = <7>;	/* USERPD */
-		};
-
-		compute-cb@8 {
-			compatible = "qcom,fastrpc-compute-cb";
-			reg = <8>;
-			iommus = <&apps_smmu 0x0C08 0x0040>,
-				 <&apps_smmu 0x0C28 0x0000>,
-				 <&apps_smmu 0x0C48 0x0040>;
-			qcom,iommu-dma-addr-pool = <0x10000000 0xF0000000>;
-			qcom,iommu-faults = "stall-disable", "HUPCF";
-			dma-coherent;
-			pd-type = <7>;	/* USERPD */
-		};
-
-		compute-cb@9 {
-			compatible = "qcom,fastrpc-compute-cb";
-			reg = <9>;
-			qcom,secure-context-bank;
-			iommus = <&apps_smmu 0x0C09 0x0040>,
-				 <&apps_smmu 0x0C29 0x0000>,
-				 <&apps_smmu 0x0C49 0x0040>;
-			qcom,iommu-dma-addr-pool = <0x10000000 0xF0000000>;
-			qcom,iommu-faults = "stall-disable", "HUPCF";
-			qcom,iommu-vmid = <0xA>;	/* VMID_CP_PIXEL */
-			qcom,nsessions = <3>;
-			dma-coherent;
-			pd-type = <6>;	/* CPZ_USERPD */
-		};
-
-		compute-cb@10 {
-			compatible = "qcom,fastrpc-compute-cb";
-			reg = <12>;
-			iommus = <&apps_smmu 0x0C0C 0x0040>,
-				 <&apps_smmu 0x0C2C 0x0000>,
-				 <&apps_smmu 0x0C4C 0x0040>;
-			qcom,iommu-dma-addr-pool = <0x10000000 0xF0000000>;
-			qcom,iommu-faults = "stall-disable", "HUPCF";
-			dma-coherent;
-			pd-type = <7>;	/* USERPD */
-		};
-
-		compute-cb@11 {
-			compatible = "qcom,fastrpc-compute-cb";
-			reg = <13>;
-			iommus = <&apps_smmu 0x0C0D 0x0040>,
-				 <&apps_smmu 0x0C2D 0x0000>,
-				 <&apps_smmu 0x0C4D 0x0040>;
-			qcom,iommu-dma-addr-pool = <0x10000000 0xF0000000>;
-			qcom,iommu-faults = "stall-disable", "HUPCF";
-			dma-coherent;
-			pd-type = <7>;	/* USERPD */
-		};
-
-		compute-cb@12 {
-			compatible = "qcom,fastrpc-compute-cb";
-			reg = <14>;
-			iommus = <&apps_smmu 0x0C0E 0x0040>,
-				 <&apps_smmu 0x0C2E 0x0000>,
-				 <&apps_smmu 0x0C4E 0x0040>;
-			qcom,iommu-dma-addr-pool = <0x10000000 0xF0000000>;
-			qcom,iommu-faults = "stall-disable", "HUPCF";
-			dma-coherent;
-			pd-type = <7>;	/* USERPD */
-		};
-	};
-};
\ No newline at end of file