Skip to content

Commit 6694c53

Browse files
AlessandroLuokartben
AlessandroLuo
authored and
kartben
committed
dts: ambiq: move compatible fields from board dts to dtsi
compatible fields should be defined in dtsi instead of overlays Signed-off-by: Hao Luo <[email protected]>
1 parent 7573ac5 commit 6694c53

File tree

8 files changed

+58
-11
lines changed

8 files changed

+58
-11
lines changed

‎boards/ambiq/apollo3_evb/apollo3_evb.dts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,6 @@
140140
};
141141

142142
&spi0 {
143-
compatible = "ambiq,spi";
144143
pinctrl-0 = <&spi0_default>;
145144
pinctrl-names = "default";
146145
cs-gpios = <&gpio0_31 11 GPIO_ACTIVE_LOW>;
@@ -149,7 +148,6 @@
149148
};
150149

151150
&i2c3 {
152-
compatible = "ambiq,i2c";
153151
pinctrl-0 = <&i2c3_default>;
154152
pinctrl-names = "default";
155153
clock-frequency = <I2C_BITRATE_STANDARD>;
@@ -196,7 +194,6 @@
196194
};
197195

198196
&adc0 {
199-
compatible = "ambiq,adc";
200197
pinctrl-0 = <&adc0_default>;
201198
pinctrl-names = "default";
202199
status = "disabled";

‎boards/ambiq/apollo3p_evb/apollo3p_evb.dts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@
118118
};
119119

120120
&spi0 {
121-
compatible = "ambiq,spi";
122121
pinctrl-0 = <&spi0_default>;
123122
pinctrl-names = "default";
124123
cs-gpios = <&gpio0_31 11 GPIO_ACTIVE_LOW>;
@@ -127,7 +126,6 @@
127126
};
128127

129128
&i2c3 {
130-
compatible = "ambiq,i2c";
131129
pinctrl-0 = <&i2c3_default>;
132130
pinctrl-names = "default";
133131
clock-frequency = <I2C_BITRATE_STANDARD>;
@@ -174,7 +172,6 @@
174172
};
175173

176174
&adc0 {
177-
compatible = "ambiq,adc";
178175
pinctrl-0 = <&adc0_default>;
179176
pinctrl-names = "default";
180177
status = "disabled";

‎boards/ambiq/apollo4p_blue_kxr_evb/apollo4p_blue_kxr_evb.dts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@
9090
};
9191

9292
&i2c0 {
93-
compatible = "ambiq,i2c";
9493
pinctrl-0 = <&i2c0_default>;
9594
pinctrl-names = "default";
9695
clock-frequency = <I2C_BITRATE_STANDARD>;
@@ -100,7 +99,6 @@
10099
};
101100

102101
&spi1 {
103-
compatible = "ambiq,spi";
104102
pinctrl-0 = <&spi1_default>;
105103
pinctrl-names = "default";
106104
cs-gpios = <&gpio0_31 11 GPIO_ACTIVE_LOW>;

‎boards/ambiq/apollo4p_evb/apollo4p_evb.dts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@
7676
};
7777

7878
&adc0 {
79-
compatible = "ambiq,adc";
8079
pinctrl-0 = <&adc0_default>;
8180
pinctrl-names = "default";
8281
status = "okay";
@@ -96,7 +95,6 @@
9695
};
9796

9897
&iom0_i2c {
99-
compatible = "ambiq,i2c";
10098
pinctrl-0 = <&i2c0_default>;
10199
pinctrl-names = "default";
102100
clock-frequency = <I2C_BITRATE_STANDARD>;
@@ -106,7 +104,6 @@
106104
};
107105

108106
&iom1_spi {
109-
compatible = "ambiq,spi";
110107
pinctrl-0 = <&spi1_default>;
111108
pinctrl-names = "default";
112109
cs-gpios = <&gpio0_31 11 GPIO_ACTIVE_LOW>;

‎dts/arm/ambiq/ambiq_apollo3_blue.dtsi‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,7 @@
209209
};
210210

211211
spi0: spi@50004000 {
212+
compatible = "ambiq,spi";
212213
reg = <0x50004000 0x1000>;
213214
#address-cells = <1>;
214215
#size-cells = <0>;
@@ -219,6 +220,7 @@
219220
};
220221

221222
spi1: spi@50005000 {
223+
compatible = "ambiq,spi";
222224
reg = <0x50005000 0x1000>;
223225
#address-cells = <1>;
224226
#size-cells = <0>;
@@ -229,6 +231,7 @@
229231
};
230232

231233
spi2: spi@50006000 {
234+
compatible = "ambiq,spi";
232235
reg = <0x50006000 0x1000>;
233236
#address-cells = <1>;
234237
#size-cells = <0>;
@@ -239,6 +242,7 @@
239242
};
240243

241244
spi3: spi@50007000 {
245+
compatible = "ambiq,spi";
242246
reg = <0x50007000 0x1000>;
243247
#address-cells = <1>;
244248
#size-cells = <0>;
@@ -249,6 +253,7 @@
249253
};
250254

251255
spi4: spi@50008000 {
256+
compatible = "ambiq,spi";
252257
reg = <0x50008000 0x1000>;
253258
#address-cells = <1>;
254259
#size-cells = <0>;
@@ -259,6 +264,7 @@
259264
};
260265

261266
spi5: spi@50009000 {
267+
compatible = "ambiq,spi";
262268
reg = <0x50009000 0x1000>;
263269
#address-cells = <1>;
264270
#size-cells = <0>;
@@ -269,6 +275,7 @@
269275
};
270276

271277
i2c0: i2c@50004000 {
278+
compatible = "ambiq,i2c";
272279
reg = <0x50004000 0x1000>;
273280
#address-cells = <1>;
274281
#size-cells = <0>;
@@ -279,6 +286,7 @@
279286
};
280287

281288
i2c1: i2c@50005000 {
289+
compatible = "ambiq,i2c";
282290
reg = <0x50005000 0x1000>;
283291
#address-cells = <1>;
284292
#size-cells = <0>;
@@ -289,6 +297,7 @@
289297
};
290298

291299
i2c2: i2c@50006000 {
300+
compatible = "ambiq,i2c";
292301
reg = <0x50006000 0x1000>;
293302
#address-cells = <1>;
294303
#size-cells = <0>;
@@ -299,6 +308,7 @@
299308
};
300309

301310
i2c3: i2c@50007000 {
311+
compatible = "ambiq,i2c";
302312
reg = <0x50007000 0x1000>;
303313
#address-cells = <1>;
304314
#size-cells = <0>;
@@ -309,6 +319,7 @@
309319
};
310320

311321
i2c4: i2c@50008000 {
322+
compatible = "ambiq,i2c";
312323
reg = <0x50008000 0x1000>;
313324
#address-cells = <1>;
314325
#size-cells = <0>;
@@ -319,6 +330,7 @@
319330
};
320331

321332
i2c5: i2c@50009000 {
333+
compatible = "ambiq,i2c";
322334
reg = <0x50009000 0x1000>;
323335
#address-cells = <1>;
324336
#size-cells = <0>;
@@ -329,6 +341,7 @@
329341
};
330342

331343
adc0: adc@50010000 {
344+
compatible = "ambiq,adc";
332345
reg = <0x50010000 0x400>;
333346
interrupts = <18 0>;
334347
interrupt-names = "ADC";

‎dts/arm/ambiq/ambiq_apollo3p_blue.dtsi‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,7 @@
227227
};
228228

229229
spi0: spi@50004000 {
230+
compatible = "ambiq,spi";
230231
reg = <0x50004000 0x1000>;
231232
#address-cells = <1>;
232233
#size-cells = <0>;
@@ -237,6 +238,7 @@
237238
};
238239

239240
spi1: spi@50005000 {
241+
compatible = "ambiq,spi";
240242
reg = <0x50005000 0x1000>;
241243
#address-cells = <1>;
242244
#size-cells = <0>;
@@ -247,6 +249,7 @@
247249
};
248250

249251
spi2: spi@50006000 {
252+
compatible = "ambiq,spi";
250253
reg = <0x50006000 0x1000>;
251254
#address-cells = <1>;
252255
#size-cells = <0>;
@@ -257,6 +260,7 @@
257260
};
258261

259262
spi3: spi@50007000 {
263+
compatible = "ambiq,spi";
260264
reg = <0x50007000 0x1000>;
261265
#address-cells = <1>;
262266
#size-cells = <0>;
@@ -267,6 +271,7 @@
267271
};
268272

269273
spi4: spi@50008000 {
274+
compatible = "ambiq,spi";
270275
reg = <0x50008000 0x1000>;
271276
#address-cells = <1>;
272277
#size-cells = <0>;
@@ -277,6 +282,7 @@
277282
};
278283

279284
spi5: spi@50009000 {
285+
compatible = "ambiq,spi";
280286
reg = <0x50009000 0x1000>;
281287
#address-cells = <1>;
282288
#size-cells = <0>;
@@ -287,6 +293,7 @@
287293
};
288294

289295
i2c0: i2c@50004000 {
296+
compatible = "ambiq,i2c";
290297
reg = <0x50004000 0x1000>;
291298
#address-cells = <1>;
292299
#size-cells = <0>;
@@ -297,6 +304,7 @@
297304
};
298305

299306
i2c1: i2c@50005000 {
307+
compatible = "ambiq,i2c";
300308
reg = <0x50005000 0x1000>;
301309
#address-cells = <1>;
302310
#size-cells = <0>;
@@ -307,6 +315,7 @@
307315
};
308316

309317
i2c2: i2c@50006000 {
318+
compatible = "ambiq,i2c";
310319
reg = <0x50006000 0x1000>;
311320
#address-cells = <1>;
312321
#size-cells = <0>;
@@ -317,6 +326,7 @@
317326
};
318327

319328
i2c3: i2c@50007000 {
329+
compatible = "ambiq,i2c";
320330
reg = <0x50007000 0x1000>;
321331
#address-cells = <1>;
322332
#size-cells = <0>;
@@ -327,6 +337,7 @@
327337
};
328338

329339
i2c4: i2c@50008000 {
340+
compatible = "ambiq,i2c";
330341
reg = <0x50008000 0x1000>;
331342
#address-cells = <1>;
332343
#size-cells = <0>;
@@ -337,6 +348,7 @@
337348
};
338349

339350
i2c5: i2c@50009000 {
351+
compatible = "ambiq,i2c";
340352
reg = <0x50009000 0x1000>;
341353
#address-cells = <1>;
342354
#size-cells = <0>;
@@ -347,6 +359,7 @@
347359
};
348360

349361
adc0: adc@50010000 {
362+
compatible = "ambiq,adc";
350363
reg = <0x50010000 0x400>;
351364
interrupts = <18 0>;
352365
interrupt-names = "ADC";

0 commit comments

Comments
 (0)