Skip to content

Commit 31ea29e

Browse files
bjarki-andreasengmarull
bjarki-andreasen
authored and
gmarull
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 c8fd566 commit 31ea29e

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
@@ -269,7 +269,6 @@
269269
reg = <0x40013000 0x1000>;
270270
interrupts = <19 NRF_DEFAULT_IRQ_PRIORITY>;
271271
status = "disabled";
272-
#io-channel-cells = <1>;
273272
};
274273

275274
egu0: swi0: egu@40014000 {

‎dts/arm/nordic/nrf52811.dtsi‎

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

307306
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
@@ -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
@@ -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
@@ -828,11 +828,14 @@
828828
};
829829

830830
comp: comparator@983000 {
831+
/*
832+
* Use compatible "nordic,nrf-comp" to configure as COMP
833+
* Use compatible "nordic,nrf-lpcomp" to configure as LPCOMP
834+
*/
831835
compatible = "nordic,nrf-comp";
832836
reg = <0x983000 0x1000>;
833837
status = "disabled";
834838
interrupts = <387 NRF_DEFAULT_IRQ_PRIORITY>;
835-
#io-channel-cells = <1>;
836839
};
837840

838841
temp: temperature-sensor@984000 {

‎dts/common/nordic/nrf54l15.dtsi‎

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

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

‎dts/common/nordic/nrf9280.dtsi‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -727,11 +727,14 @@
727727
};
728728

729729
comp: comparator@983000 {
730+
/*
731+
* Use compatible "nordic,nrf-comp" to configure as COMP
732+
* Use compatible "nordic,nrf-lpcomp" to configure as LPCOMP
733+
*/
730734
compatible = "nordic,nrf-comp";
731735
reg = <0x983000 0x1000>;
732736
status = "disabled";
733737
interrupts = <387 NRF_DEFAULT_IRQ_PRIORITY>;
734-
#io-channel-cells = <1>;
735738
};
736739

737740
temp: temperature-sensor@984000 {

0 commit comments

Comments
 (0)