Skip to content

Commit ffbda1b

Browse files
bjarki-andreasennashif
bjarki-andreasen
authored and
nashif
committed
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]>
1 parent 211bdd9 commit ffbda1b

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
@@ -314,7 +314,6 @@
314314
reg = <0x40013000 0x1000>;
315315
interrupts = <19 NRF_DEFAULT_IRQ_PRIORITY>;
316316
status = "disabled";
317-
#io-channel-cells = <1>;
318317
};
319318

320319
egu0: swi0: egu@40014000 {

‎dts/arm/nordic/nrf52832.dtsi

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

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

325322
egu0: swi0: egu@40014000 {

‎dts/arm/nordic/nrf52833.dtsi

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

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

340337
egu0: swi0: egu@40014000 {

‎dts/arm/nordic/nrf52840.dtsi

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

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

327324
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
@@ -365,16 +365,13 @@ wdt1: watchdog@19000 {
365365

366366
comp: comparator@1a000 {
367367
/*
368-
* This comparator node can be COMP or LPCOMP,
369-
* for the user to pick:
370-
* compatible = "nordic,nrf-comp" or
371-
* "nordic,nrf-lpcomp".
368+
* Use compatible "nordic,nrf-comp" to configure as COMP
369+
* Use compatible "nordic,nrf-lpcomp" to configure as LPCOMP
372370
*/
373371
compatible = "nordic,nrf-comp";
374372
reg = <0x1a000 0x1000>;
375373
interrupts = <26 NRF_DEFAULT_IRQ_PRIORITY>;
376374
status = "disabled";
377-
#io-channel-cells = <1>;
378375
};
379376

380377
egu0: egu@1b000 {

‎dts/common/nordic/nrf54h20.dtsi

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -824,11 +824,14 @@
824824
};
825825

826826
comp: comparator@983000 {
827+
/*
828+
* Use compatible "nordic,nrf-comp" to configure as COMP
829+
* Use compatible "nordic,nrf-lpcomp" to configure as LPCOMP
830+
*/
827831
compatible = "nordic,nrf-comp";
828832
reg = <0x983000 0x1000>;
829833
status = "disabled";
830834
interrupts = <387 NRF_DEFAULT_IRQ_PRIORITY>;
831-
#io-channel-cells = <1>;
832835
};
833836

834837
temp: temperature-sensor@984000 {

‎dts/common/nordic/nrf54l15.dtsi

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -565,6 +565,17 @@
565565
frame-timeout-supported;
566566
};
567567

568+
comp: comparator@106000 {
569+
/*
570+
* Use compatible "nordic,nrf-comp" to configure as COMP
571+
* Use compatible "nordic,nrf-lpcomp" to configure as LPCOMP
572+
*/
573+
compatible = "nordic,nrf-comp";
574+
reg = <0x106000 0x1000>;
575+
status = "disabled";
576+
interrupts = <262 NRF_DEFAULT_IRQ_PRIORITY>;
577+
};
578+
568579
#ifdef USE_NON_SECURE_ADDRESS_MAP
569580
/* intentionally empty because WDT30 is hardware fixed to Secure */
570581
#else

‎dts/common/nordic/nrf9280.dtsi

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

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

746749
temp: temperature-sensor@984000 {

0 commit comments

Comments
 (0)