soc: intel_adsp: Avoid duplicate header

adsp_memory.h is pretty much the same for all ace platforms. Generalize it getting register address from devicetree and and move it to a common place. Signed-off-by: Flavio Ceolin <[email protected]>
zephyrproject-rtos · Jun 5, 2024 · c29a050 · c29a050
1 parent 7975db4
commit c29a050
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 356 deletions.
diff --git a/dts/xtensa/intel/intel_adsp_ace15_mtpm.dtsi b/dts/xtensa/intel/intel_adsp_ace15_mtpm.dtsi
@@ -111,6 +111,21 @@
 
 	soc {
 
+		l1ccap: l1ccap@1fe80080 {
+			compatible = "intel,adsp-l1ccap";
+			reg = <0x1fe80080 0x4>;
+		};
+
+		l1ccfg: l1ccfg@1fe80084 {
+			compatible = "intel,adsp-l1ccfg";
+			reg = <0x1fe80084 0x4>;
+		};
+
+		l1pcfg: l1pcfg@1fe80088 {
+			compatible = "intel,adsp-l1pcfg";
+			reg = <0x1fe80088 0x4>;
+		};
+
 		lsbpm: lsbpm@71d80 {
 			compatible = "intel,adsp-lsbpm";
 			reg = <0x71d80 0x0008>;

diff --git a/dts/xtensa/intel/intel_adsp_ace20_lnl.dtsi b/dts/xtensa/intel/intel_adsp_ace20_lnl.dtsi
@@ -130,6 +130,21 @@
 
 	soc {
 
+		l1ccap: l1ccap@1fe80080 {
+			compatible = "intel,adsp-l1ccap";
+			reg = <0x1fe80080 0x4>;
+		};
+
+		l1ccfg: l1ccfg@1fe80084 {
+			compatible = "intel,adsp-l1ccfg";
+			reg = <0x1fe80084 0x4>;
+		};
+
+		l1pcfg: l1pcfg@1fe80088 {
+			compatible = "intel,adsp-l1pcfg";
+			reg = <0x1fe80088 0x4>;
+		};
+
 		lsbpm: lsbpm@71d80 {
 			compatible = "intel,adsp-lsbpm";
 			reg = <0x71d80 0x0008>;

diff --git a/dts/xtensa/intel/intel_adsp_ace30_ptl.dtsi b/dts/xtensa/intel/intel_adsp_ace30_ptl.dtsi
@@ -124,6 +124,21 @@
 	};
 
 	soc {
+		l1ccap: l1ccap@3fe80080 {
+			compatible = "intel,adsp-l1ccap";
+			reg = <0x3fe80080 0x4>;
+		};
+
+		l1ccfg: l1ccfg@3fe80084 {
+			compatible = "intel,adsp-l1ccfg";
+			reg = <0x3fe80084 0x4>;
+		};
+
+		l1pcfg: l1pcfg@3fe80088 {
+			compatible = "intel,adsp-l1pcfg";
+			reg = <0x3fe80088 0x4>;
+		};
+
 		lsbpm: lsbpm@71d80 {
 			compatible = "intel,adsp-lsbpm";
 			reg = <0x71d80 0x0008>;

diff --git a/soc/intel/intel_adsp/ace/include/ace15_mtpm/adsp_memory.h b/soc/intel/intel_adsp/ace/include/ace15_mtpm/adsp_memory.h