Skip to content

Commit 52cc73d

Browse files
kwd-doodlingcfriedt
authored andcommitted
dts: intel_ish: Improve and extend ISH dts files
- Add uart1 and uart2 nodes to intel_ish5.dtsi with all required properties. - Consistently place properties for all nodes. - Add #interrupt-cells to the soc node. - Update intel_ish5_8.dtsi: overrides interrupt and status for uart1, uart2, and dma0. These changes add missing peripherals, unify property layout, and improve clarity for Intel ISH platforms. Signed-off-by: Dong Wang <[email protected]>
1 parent d0cba34 commit 52cc73d

File tree

2 files changed

+61
-14
lines changed

2 files changed

+61
-14
lines changed

dts/x86/intel/intel_ish5.dtsi

Lines changed: 43 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@
7777
soc {
7878
#address-cells = <1>;
7979
#size-cells = <1>;
80+
#interrupt-cells = <3>;
8081
compatible = "simple-bus";
8182
ranges;
8283

@@ -85,13 +86,14 @@
8586
reg = <0x04700000 0x400>;
8687
interrupt-parent = <&intc>;
8788
interrupts = <14 IRQ_TYPE_FIXED_LEVEL_HIGH 2>;
89+
8890
status = "okay";
8991
};
9092

9193
ipmhost: ipm@4100000 {
9294
compatible = "intel,sedi-ipm";
93-
reg = <0x4100000 0x1000>;
9495
peripheral-id = <0>;
96+
reg = <0x4100000 0x1000>;
9597
interrupt-parent = <&intc>;
9698
interrupts = <0 IRQ_TYPE_LOWEST_LEVEL_HIGH 2>;
9799

@@ -100,48 +102,74 @@
100102

101103
uart0: uart@8100000 {
102104
compatible = "intel,sedi-uart";
105+
peripheral-id = <0>;
103106
reg = <0x08100000 0x1000>;
104107
interrupt-parent = <&intc>;
105108
interrupts = <23 IRQ_TYPE_LOWEST_EDGE_RISING 6>;
106-
peripheral-id = <0>;
107-
current-speed = <115200>;
109+
108110
status = "okay";
111+
current-speed = <115200>;
112+
};
113+
114+
uart1: uart@8102000 {
115+
compatible = "intel,sedi-uart";
116+
peripheral-id = <1>;
117+
reg = <0x08102000 0x1000>;
118+
interrupt-parent = <&intc>;
119+
interrupts = <24 IRQ_TYPE_LOWEST_EDGE_RISING 6>;
120+
121+
status = "disabled";
122+
current-speed = <115200>;
123+
};
124+
125+
uart2: uart@8104000 {
126+
compatible = "intel,sedi-uart";
127+
peripheral-id = <2>;
128+
reg = <0x08104000 0x1000>;
129+
interrupt-parent = <&intc>;
130+
interrupts = <25 IRQ_TYPE_LOWEST_EDGE_RISING 6>;
131+
132+
status = "disabled";
133+
current-speed = <115200>;
109134
};
110135

111136
i2c0: i2c@0 {
112137
compatible = "intel,sedi-i2c";
138+
peripheral-id = <0>;
113139
#address-cells = <1>;
114140
#size-cells = <0>;
115141
reg = <0x0 0x1000>;
116-
peripheral-id = <0>;
117142
interrupt-parent = <&intc>;
118143
interrupts = <15 IRQ_TYPE_LOWEST_LEVEL_HIGH 2>;
119-
clock-frequency = <I2C_BITRATE_FAST>;
144+
120145
status = "okay";
146+
clock-frequency = <I2C_BITRATE_FAST>;
121147
};
122148

123149
i2c1: i2c@2000 {
124150
compatible = "intel,sedi-i2c";
151+
peripheral-id = <1>;
125152
#address-cells = <1>;
126153
#size-cells = <0>;
127154
reg = <0x00002000 0x1000>;
128-
peripheral-id = <1>;
129155
interrupt-parent = <&intc>;
130156
interrupts = <16 IRQ_TYPE_LOWEST_LEVEL_HIGH 2>;
131-
clock-frequency = <I2C_BITRATE_FAST>;
157+
132158
status = "okay";
159+
clock-frequency = <I2C_BITRATE_FAST>;
133160
};
134161

135162
i2c2: i2c@4000 {
136163
compatible = "intel,sedi-i2c";
164+
peripheral-id = <2>;
137165
#address-cells = <1>;
138166
#size-cells = <0>;
139167
reg = <0x00004000 0x1000>;
140-
peripheral-id = <2>;
141168
interrupt-parent = <&intc>;
142169
interrupts = <17 IRQ_TYPE_LOWEST_LEVEL_HIGH 2>;
143-
clock-frequency = <I2C_BITRATE_FAST>;
170+
144171
status = "disabled";
172+
clock-frequency = <I2C_BITRATE_FAST>;
145173
};
146174

147175
gpio0: gpio@100000 {
@@ -151,18 +179,18 @@
151179
peripheral-id = <0>;
152180
reg = <0x00100000 0x1000>;
153181
interrupt-parent = <&intc>;
154-
ngpios = <32>;
155182
interrupts = <13 IRQ_TYPE_LOWEST_LEVEL_HIGH 2>;
183+
ngpios = <32>;
156184

157185
status = "okay";
158186
};
159187

160188
spi0: spi@8000000 {
161189
compatible = "intel,sedi-spi";
190+
peripheral-id = <0>;
162191
#address-cells = <1>;
163192
#size-cells = <0>;
164193
reg = <0x8000000 0x1000>;
165-
peripheral-id = <0>;
166194
interrupt-parent = <&intc>;
167195
interrupts = <19 IRQ_TYPE_LOWEST_LEVEL_HIGH 2>;
168196

@@ -171,10 +199,10 @@
171199

172200
spi1: spi@8002000 {
173201
compatible = "intel,sedi-spi";
202+
peripheral-id = <1>;
174203
#address-cells = <1>;
175204
#size-cells = <0>;
176205
reg = <0x8002000 0x1000>;
177-
peripheral-id = <1>;
178206
interrupt-parent = <&intc>;
179207
interrupts = <20 IRQ_TYPE_LOWEST_LEVEL_HIGH 2>;
180208

@@ -183,14 +211,15 @@
183211

184212
dma0: dma@10100000 {
185213
compatible = "intel,sedi-dma";
186-
#dma-cells = <2>;
187-
dma-channels = <8>;
188214
peripheral-id = <0>;
189215
reg = <0x10100000 0x1000>;
190216
interrupts = <11 IRQ_TYPE_LOWEST_LEVEL_HIGH 2>;
191217
interrupt-parent = <&intc>;
218+
#dma-cells = <2>;
219+
dma-channels = <8>;
192220
dma-buf-size-alignment = <4>;
193221
dma-copy-alignment = <4>;
222+
194223
status = "okay";
195224
};
196225
};

dts/x86/intel/intel_ish5_8.dtsi

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,18 @@
1818
status = "okay";
1919
};
2020

21+
&uart1 {
22+
interrupts = <29 IRQ_TYPE_LOWEST_EDGE_RISING 6>;
23+
24+
status = "disabled";
25+
};
26+
27+
&uart2 {
28+
interrupts = <30 IRQ_TYPE_LOWEST_EDGE_RISING 6>;
29+
30+
status = "disabled";
31+
};
32+
2133
&i2c0 {
2234
interrupts = <18 IRQ_TYPE_LOWEST_LEVEL_HIGH 2>;
2335

@@ -53,3 +65,9 @@
5365

5466
status = "disabled";
5567
};
68+
69+
&dma0 {
70+
interrupts = <14 IRQ_TYPE_LOWEST_LEVEL_HIGH 2>;
71+
72+
status = "disabled";
73+
};

0 commit comments

Comments
 (0)