Skip to content

Commit 9c29839

Browse files
abonislawskikartben
authored andcommitted
dts: intel_adsp_ace30: merge and cleanup ace30 dtsi files
The new ace30 files structure is organized as follows: intel_adsp_ace30.dtsi - main file for all variants intel_adsp_ace30_ptl.dtsi - additional file for PTL variant intel_adsp_ace30_wcl.dtsi - additional file for WCL variant The main ace30.dtsi file contains most of the fields, with only the differences specified in the ace30_ptl.dtsi and ace30_wcl.dtsi files. Signed-off-by: Adrian Bonislawski <adrian.bonislawski@intel.com>
1 parent 7918839 commit 9c29839

File tree

3 files changed

+16
-1543
lines changed

3 files changed

+16
-1543
lines changed

dts/xtensa/intel/intel_adsp_ace30.dtsi

Lines changed: 14 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -35,20 +35,6 @@
3535
cpu-power-states = <&d0i3 &d3>;
3636
};
3737

38-
cpu3: cpu@3 {
39-
device_type = "cpu";
40-
compatible = "cdns,tensilica-xtensa-lx7";
41-
reg = <3>;
42-
cpu-power-states = <&d0i3 &d3>;
43-
};
44-
45-
cpu4: cpu@4 {
46-
device_type = "cpu";
47-
compatible = "cdns,tensilica-xtensa-lx7";
48-
reg = <4>;
49-
cpu-power-states = <&d0i3 &d3>;
50-
};
51-
5238
power-states {
5339
d0i3: idle {
5440
compatible = "zephyr,power-state";
@@ -69,12 +55,6 @@
6955
};
7056
};
7157

72-
sram0: memory@a0020000 {
73-
device_type = "memory";
74-
compatible = "mmio-sram";
75-
reg = <0xa0020000 DT_SIZE_K(4608)>;
76-
};
77-
7858
sram0virtual: virtualmemory@a0020000 {
7959
device_type = "memory";
8060
compatible = "mmio-sram";
@@ -139,6 +119,11 @@
139119
reg = <0x3fe80088 0x4>;
140120
};
141121

122+
hsbcap: hsbcap@71d00 {
123+
compatible = "intel,adsp-hsbcap";
124+
reg = <0x71d00 0x4>;
125+
};
126+
142127
lsbpm: lsbpm@71d80 {
143128
compatible = "intel,adsp-lsbpm";
144129
reg = <0x71d80 0x0008>;
@@ -441,6 +426,14 @@
441426
};
442427
};
443428

429+
mic_privacy: mic-prv@71a40 {
430+
compatible = "intel,adsp-mic-privacy";
431+
reg = <0x71a40 0x8000>;
432+
interrupts = <29 0 0>;
433+
interrupt-parent = <&ace_intc>;
434+
status = "okay";
435+
};
436+
444437
mem_window0: mem_window@70200 {
445438
compatible = "intel,adsp-mem-window";
446439
reg = <0x70200 0x8>;
@@ -618,7 +611,7 @@
618611
interrupt-controller;
619612
#interrupt-cells = <3>;
620613
interrupts = <4 0 0>;
621-
num-irqs = <28>;
614+
num-irqs = <30>;
622615
interrupt-parent = <&core_intc>;
623616
};
624617

0 commit comments

Comments
 (0)