Skip to content

Commit 1ceb53b

Browse files
bjarki-andreasenbjarki-andreasen
committed
[nrf fromtree] dts: common: nordic: adjust comparator nodes
Adjust comparator nodes of nrf SoCs to exclude the unused io-channel-cells property and simplify the comment describing how to configure the comparator hardware block as COMP or LPCOMP for SoCs which support this. Signed-off-by: Bjarki Arge Andreasen <[email protected]> (cherry picked from commit ffbda1b)
1 parent 9a8c830 commit 1ceb53b

File tree

10 files changed

+27
-25
lines changed

10 files changed

+27
-25
lines changed

‎dts/arm/nordic/nrf52810.dtsi‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,6 @@
268268
reg = <0x40013000 0x1000>;
269269
interrupts = <19 NRF_DEFAULT_IRQ_PRIORITY>;
270270
status = "disabled";
271-
#io-channel-cells = <1>;
272271
};
273272

274273
egu0: swi0: egu@40014000 {

‎dts/arm/nordic/nrf52811.dtsi‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,6 @@
300300
reg = <0x40013000 0x1000>;
301301
interrupts = <19 NRF_DEFAULT_IRQ_PRIORITY>;
302302
status = "disabled";
303-
#io-channel-cells = <1>;
304303
};
305304

306305
egu0: swi0: egu@40014000 {

‎dts/arm/nordic/nrf52820.dtsi‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,6 @@
313313
reg = <0x40013000 0x1000>;
314314
interrupts = <19 NRF_DEFAULT_IRQ_PRIORITY>;
315315
status = "disabled";
316-
#io-channel-cells = <1>;
317316
};
318317

319318
egu0: swi0: egu@40014000 {

‎dts/arm/nordic/nrf52832.dtsi‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -309,16 +309,13 @@
309309

310310
comp: comparator@40013000 {
311311
/*
312-
* This comparator node can be COMP or LPCOMP,
313-
* for the user to pick:
314-
* compatible = "nordic,nrf-comp" or
315-
* "nordic,nrf-lpcomp".
312+
* Use compatible "nordic,nrf-comp" to configure as COMP
313+
* Use compatible "nordic,nrf-lpcomp" to configure as LPCOMP
316314
*/
317315
compatible = "nordic,nrf-comp";
318316
reg = <0x40013000 0x1000>;
319317
interrupts = <19 NRF_DEFAULT_IRQ_PRIORITY>;
320318
status = "disabled";
321-
#io-channel-cells = <1>;
322319
};
323320

324321
egu0: swi0: egu@40014000 {

‎dts/arm/nordic/nrf52833.dtsi‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -324,16 +324,13 @@
324324

325325
comp: comparator@40013000 {
326326
/*
327-
* This comparator node can be COMP or LPCOMP,
328-
* for the user to pick:
329-
* compatible = "nordic,nrf-comp" or
330-
* "nordic,nrf-lpcomp".
327+
* Use compatible "nordic,nrf-comp" to configure as COMP
328+
* Use compatible "nordic,nrf-lpcomp" to configure as LPCOMP
331329
*/
332330
compatible = "nordic,nrf-comp";
333331
reg = <0x40013000 0x1000>;
334332
interrupts = <19 NRF_DEFAULT_IRQ_PRIORITY>;
335333
status = "disabled";
336-
#io-channel-cells = <1>;
337334
};
338335

339336
egu0: swi0: egu@40014000 {

‎dts/arm/nordic/nrf52840.dtsi‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -311,16 +311,13 @@
311311

312312
comp: comparator@40013000 {
313313
/*
314-
* This comparator node can be COMP or LPCOMP,
315-
* for the user to pick:
316-
* compatible = "nordic,nrf-comp" or
317-
* "nordic,nrf-lpcomp".
314+
* Use compatible "nordic,nrf-comp" to configure as COMP
315+
* Use compatible "nordic,nrf-lpcomp" to configure as LPCOMP
318316
*/
319317
compatible = "nordic,nrf-comp";
320318
reg = <0x40013000 0x1000>;
321319
interrupts = <19 NRF_DEFAULT_IRQ_PRIORITY>;
322320
status = "disabled";
323-
#io-channel-cells = <1>;
324321
};
325322

326323
egu0: swi0: egu@40014000 {

‎dts/arm/nordic/nrf5340_cpuapp_peripherals.dtsi‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -350,16 +350,13 @@ wdt1: watchdog@19000 {
350350

351351
comp: comparator@1a000 {
352352
/*
353-
* This comparator node can be COMP or LPCOMP,
354-
* for the user to pick:
355-
* compatible = "nordic,nrf-comp" or
356-
* "nordic,nrf-lpcomp".
353+
* Use compatible "nordic,nrf-comp" to configure as COMP
354+
* Use compatible "nordic,nrf-lpcomp" to configure as LPCOMP
357355
*/
358356
compatible = "nordic,nrf-comp";
359357
reg = <0x1a000 0x1000>;
360358
interrupts = <26 NRF_DEFAULT_IRQ_PRIORITY>;
361359
status = "disabled";
362-
#io-channel-cells = <1>;
363360
};
364361

365362
egu0: egu@1b000 {

‎dts/common/nordic/nrf54h20.dtsi‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -835,11 +835,14 @@
835835
};
836836

837837
comp: comparator@983000 {
838+
/*
839+
* Use compatible "nordic,nrf-comp" to configure as COMP
840+
* Use compatible "nordic,nrf-lpcomp" to configure as LPCOMP
841+
*/
838842
compatible = "nordic,nrf-comp";
839843
reg = <0x983000 0x1000>;
840844
status = "disabled";
841845
interrupts = <387 NRF_DEFAULT_IRQ_PRIORITY>;
842-
#io-channel-cells = <1>;
843846
};
844847

845848
temp: temperature-sensor@984000 {

‎dts/common/nordic/nrf54l15.dtsi‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -557,6 +557,17 @@
557557
endtx-stoptx-supported;
558558
};
559559

560+
comp: comparator@106000 {
561+
/*
562+
* Use compatible "nordic,nrf-comp" to configure as COMP
563+
* Use compatible "nordic,nrf-lpcomp" to configure as LPCOMP
564+
*/
565+
compatible = "nordic,nrf-comp";
566+
reg = <0x106000 0x1000>;
567+
status = "disabled";
568+
interrupts = <262 NRF_DEFAULT_IRQ_PRIORITY>;
569+
};
570+
560571
#ifdef USE_NON_SECURE_ADDRESS_MAP
561572
/* intentionally empty because WDT30 is hardware fixed to Secure */
562573
#else

‎dts/common/nordic/nrf9280.dtsi‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -735,11 +735,14 @@
735735
};
736736

737737
comp: comparator@983000 {
738+
/*
739+
* Use compatible "nordic,nrf-comp" to configure as COMP
740+
* Use compatible "nordic,nrf-lpcomp" to configure as LPCOMP
741+
*/
738742
compatible = "nordic,nrf-comp";
739743
reg = <0x983000 0x1000>;
740744
status = "disabled";
741745
interrupts = <387 NRF_DEFAULT_IRQ_PRIORITY>;
742-
#io-channel-cells = <1>;
743746
};
744747

745748
temp: temperature-sensor@984000 {

0 commit comments

Comments
 (0)