soc/intel_adsp: Dedup device tree nodes
The dma nodes in device tree were entirely copy pasted. Rather than
doing that lets create a common intel_cavs.dtsi each specialization
then includes. This dedups the lpgpdma entries.
Signed-off-by: Tom Burdick <thomas.burdick@intel.com>
diff --git a/dts/xtensa/intel/intel_cavs.dtsi b/dts/xtensa/intel/intel_cavs.dtsi
new file mode 100644
index 0000000..b9b89fb
--- /dev/null
+++ b/dts/xtensa/intel/intel_cavs.dtsi
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2022 Intel Corporation
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <xtensa/xtensa.dtsi>
+
+/ {
+ soc {
+ lpgpdma0: dma@7c000 {
+ compatible = "intel,cavs-gpdma";
+ #dma-cells = <1>;
+ reg = <0x0007c000 0x1000>;
+ shim = <0x00078400 0x100>;
+ interrupts = <0x10 0 0>;
+ interrupt-parent = <&cavs3>;
+ label = "DMA_0";
+
+ status = "okay";
+ };
+
+ lpgpdma1: dma@7d000 {
+ compatible = "intel,cavs-gpdma";
+ #dma-cells = <1>;
+ reg = <0x0007d000 0x1000>;
+ shim = <0x00078500 0x100>;
+ interrupts = <0x0F 0 0>;
+ interrupt-parent = <&cavs3>;
+ label = "DMA_1";
+
+ status = "okay";
+ };
+ };
+};
diff --git a/dts/xtensa/intel/intel_cavs15.dtsi b/dts/xtensa/intel/intel_cavs15.dtsi
index fa9f488..2f2066e 100644
--- a/dts/xtensa/intel/intel_cavs15.dtsi
+++ b/dts/xtensa/intel/intel_cavs15.dtsi
@@ -4,8 +4,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
-#include <xtensa/xtensa.dtsi>
-#include <dt-bindings/i2c/i2c.h>
+#include <xtensa/intel/intel_cavs.dtsi>
#include <mem.h>
/ {
@@ -108,29 +107,5 @@
interrupts = <8 0 0>;
interrupt-parent = <&cavs0>;
};
-
- lpgpdma0: dma@7c000 {
- compatible = "intel,cavs-gpdma";
- #dma-cells = <1>;
- reg = <0x0007c000 0x1000>;
- shim = <0x00078400 0x100>;
- interrupts = <0x10 0 0>;
- interrupt-parent = <&cavs3>;
- label = "DMA_0";
-
- status = "okay";
- };
-
- lpgpdma1: dma@7d000 {
- compatible = "intel,cavs-gpdma";
- #dma-cells = <1>;
- reg = <0x0007d000 0x1000>;
- shim = <0x00078500 0x100>;
- interrupts = <0x0F 0 0>;
- interrupt-parent = <&cavs3>;
- label = "DMA_1";
-
- status = "okay";
- };
};
};
diff --git a/dts/xtensa/intel/intel_cavs18.dtsi b/dts/xtensa/intel/intel_cavs18.dtsi
index b68b716..82c3c88 100644
--- a/dts/xtensa/intel/intel_cavs18.dtsi
+++ b/dts/xtensa/intel/intel_cavs18.dtsi
@@ -4,8 +4,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
-#include <xtensa/xtensa.dtsi>
-#include <dt-bindings/i2c/i2c.h>
+#include <xtensa/intel/intel_cavs.dtsi>
#include <mem.h>
/ {
@@ -127,29 +126,5 @@
interrupts = <8 0 0>;
interrupt-parent = <&cavs0>;
};
-
- lpgpdma0: dma@7c000 {
- compatible = "intel,cavs-gpdma";
- #dma-cells = <1>;
- reg = <0x0007c000 0x1000>;
- shim = <0x00078400 0x100>;
- interrupts = <0x10 0 0>;
- interrupt-parent = <&cavs3>;
- label = "DMA_0";
-
- status = "okay";
- };
-
- lpgpdma1: dma@7d000 {
- compatible = "intel,cavs-gpdma";
- #dma-cells = <1>;
- reg = <0x0007d000 0x1000>;
- shim = <0x00078500 0x100>;
- interrupts = <0x0F 0 0>;
- interrupt-parent = <&cavs3>;
- label = "DMA_1";
-
- status = "okay";
- };
};
};
diff --git a/dts/xtensa/intel/intel_cavs20.dtsi b/dts/xtensa/intel/intel_cavs20.dtsi
index b68b716..f515b51 100644
--- a/dts/xtensa/intel/intel_cavs20.dtsi
+++ b/dts/xtensa/intel/intel_cavs20.dtsi
@@ -4,8 +4,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
-#include <xtensa/xtensa.dtsi>
-#include <dt-bindings/i2c/i2c.h>
+#include <xtensa/intel/intel_cavs.dtsi>
#include <mem.h>
/ {
@@ -128,28 +127,5 @@
interrupt-parent = <&cavs0>;
};
- lpgpdma0: dma@7c000 {
- compatible = "intel,cavs-gpdma";
- #dma-cells = <1>;
- reg = <0x0007c000 0x1000>;
- shim = <0x00078400 0x100>;
- interrupts = <0x10 0 0>;
- interrupt-parent = <&cavs3>;
- label = "DMA_0";
-
- status = "okay";
- };
-
- lpgpdma1: dma@7d000 {
- compatible = "intel,cavs-gpdma";
- #dma-cells = <1>;
- reg = <0x0007d000 0x1000>;
- shim = <0x00078500 0x100>;
- interrupts = <0x0F 0 0>;
- interrupt-parent = <&cavs3>;
- label = "DMA_1";
-
- status = "okay";
- };
};
};
diff --git a/dts/xtensa/intel/intel_cavs25.dtsi b/dts/xtensa/intel/intel_cavs25.dtsi
index 67f718e..b4a8966 100644
--- a/dts/xtensa/intel/intel_cavs25.dtsi
+++ b/dts/xtensa/intel/intel_cavs25.dtsi
@@ -4,8 +4,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
-#include <xtensa/xtensa.dtsi>
-#include <dt-bindings/i2c/i2c.h>
+#include <xtensa/intel/intel_cavs.dtsi>
#include <mem.h>
/ {
@@ -132,29 +131,5 @@
compatible = "intel,adsp-tlb";
reg = <0x3000 0x1000>;
};
-
- lpgpdma0: dma@7c000 {
- compatible = "intel,cavs-gpdma";
- #dma-cells = <1>;
- reg = <0x0007c000 0x1000>;
- shim = <0x00078400 0x100>;
- interrupts = <0x10 0 0>;
- interrupt-parent = <&cavs3>;
- label = "DMA_0";
-
- status = "okay";
- };
-
- lpgpdma1: dma@7d000 {
- compatible = "intel,cavs-gpdma";
- #dma-cells = <1>;
- reg = <0x0007d000 0x1000>;
- shim = <0x00078500 0x100>;
- interrupts = <0x0F 0 0>;
- interrupt-parent = <&cavs3>;
- label = "DMA_1";
-
- status = "okay";
- };
};
};
diff --git a/dts/xtensa/intel/intel_cavs25_tgph.dtsi b/dts/xtensa/intel/intel_cavs25_tgph.dtsi
index a97dac5..0715001 100644
--- a/dts/xtensa/intel/intel_cavs25_tgph.dtsi
+++ b/dts/xtensa/intel/intel_cavs25_tgph.dtsi
@@ -4,8 +4,7 @@
* SPDX-License-Identifier: Apache-2.0
*/
-#include <xtensa/xtensa.dtsi>
-#include <dt-bindings/i2c/i2c.h>
+#include <xtensa/intel/intel_cavs.dtsi>
#include <mem.h>
/ {
@@ -113,29 +112,5 @@
compatible = "intel,adsp-tlb";
reg = <0x3000 0x1000>;
};
-
- lpgpdma0: dma@7c000 {
- compatible = "intel,cavs-gpdma";
- #dma-cells = <1>;
- reg = <0x0007c000 0x1000>;
- shim = <0x00078400 0x100>;
- interrupts = <0x10 0 0>;
- interrupt-parent = <&cavs3>;
- label = "DMA_0";
-
- status = "okay";
- };
-
- lpgpdma1: dma@7d000 {
- compatible = "intel,cavs-gpdma";
- #dma-cells = <1>;
- reg = <0x0007d000 0x1000>;
- shim = <0x00078500 0x100>;
- interrupts = <0x0F 0 0>;
- interrupt-parent = <&cavs3>;
- label = "DMA_1";
-
- status = "okay";
- };
};
};
