From 2f6c2b740e0642d56990dd89e568b677f035dbc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Stasiak?= Date: Thu, 20 Mar 2025 10:32:38 +0100 Subject: [PATCH 1/3] Revert "[nrf fromlist] dts: nordic: nrf54: add TDM support for nRF54" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 7d44195bccf5158e9e13d3e4f38582b5c2670753. Signed-off-by: Michał Stasiak --- dts/bindings/i2s/nordic,nrf-tdm.yaml | 48 ---------------------------- dts/common/nordic/nrf54h20.dtsi | 28 ---------------- dts/common/nordic/nrf54l20.dtsi | 19 ----------- 3 files changed, 95 deletions(-) delete mode 100644 dts/bindings/i2s/nordic,nrf-tdm.yaml diff --git a/dts/bindings/i2s/nordic,nrf-tdm.yaml b/dts/bindings/i2s/nordic,nrf-tdm.yaml deleted file mode 100644 index 82f51147848..00000000000 --- a/dts/bindings/i2s/nordic,nrf-tdm.yaml +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright (c) 2024 Nordic Semiconductor ASA -# SPDX-License-Identifier: Apache-2.0 - -description: Nordic TDM (Time division multiplexed audio interface) - -compatible: "nordic,nrf-tdm" - -include: [i2s-controller.yaml, pinctrl-device.yaml, nordic-clockpin.yaml, "memory-region.yaml"] - -properties: - reg: - required: true - - interrupts: - required: true - - mck-frequency: - type: int - description: | - Frequency of the MCK clock. Configured independently of SCK. - - pinctrl-0: - required: true - - pinctrl-names: - required: true - - easydma-maxcnt-bits: - type: int - required: true - description: | - Maximum number of bits available in the EasyDMA MAXCNT register. This - property must be set at SoC level DTS files. - - clock-source: - type: string - default: "PCLK" - description: | - Clock source to be used by the TDM peripheral. The following options - are available: - - "PCLK": Peripheral clock - - "ACLK": Audio PLL clock with configurable frequency (frequency for - this clock must be set via the "hfclkaudio-frequency" property - in the "nordic,nrf-clock" node); this clock source is only available - in the nRF53 Series SoCs and it requires the use of HFXO - enum: - - "PCLK" - - "ACLK" diff --git a/dts/common/nordic/nrf54h20.dtsi b/dts/common/nordic/nrf54h20.dtsi index bfce794ff3c..9ddb657c4da 100644 --- a/dts/common/nordic/nrf54h20.dtsi +++ b/dts/common/nordic/nrf54h20.dtsi @@ -1491,34 +1491,6 @@ endtx-stoptx-supported; frame-timeout-supported; }; - - tdm130: tdm@992000 { - compatible = "nordic,nrf-tdm"; - easydma-maxcnt-bits = <15>; - #address-cells = <1>; - #size-cells = <0>; - reg = <0x992000 0x1000>; - interrupts = <402 NRF_DEFAULT_IRQ_PRIORITY>; - status = "disabled"; - clocks = <&fll16m>; - power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>; - nordic,clockpin-enable = , - ; - }; - - tdm131: tdm@997000 { - compatible = "nordic,nrf-tdm"; - easydma-maxcnt-bits = <15>; - #address-cells = <1>; - #size-cells = <0>; - reg = <0x997000 0x1000>; - interrupts = <407 NRF_DEFAULT_IRQ_PRIORITY>; - status = "disabled"; - clocks = <&fll16m>; - power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>; - nordic,clockpin-enable = , - ; - }; }; }; diff --git a/dts/common/nordic/nrf54l20.dtsi b/dts/common/nordic/nrf54l20.dtsi index 2d8f892e07e..d95ea80da26 100644 --- a/dts/common/nordic/nrf54l20.dtsi +++ b/dts/common/nordic/nrf54l20.dtsi @@ -53,12 +53,6 @@ clock-frequency = ; }; - pclk32m: pclk32m { - compatible = "fixed-clock"; - #clock-cells = <0>; - clock-frequency = ; - }; - lfxo: lfxo { compatible = "nordic,nrf-lfxo"; #clock-cells = <0>; @@ -690,19 +684,6 @@ frame-timeout-supported; }; - tdm: tdm@e8000 { - compatible = "nordic,nrf-tdm"; - easydma-maxcnt-bits = <15>; - #address-cells = <1>; - #size-cells = <0>; - reg = <0xe8000 0x1000>; - interrupts = <232 NRF_DEFAULT_IRQ_PRIORITY>; - status = "disabled"; - clocks = <&pclk32m>; - nordic,clockpin-enable = , - ; - }; - wdt30: watchdog@108000 { compatible = "nordic,nrf-wdt"; reg = <0x108000 0x620>; From 1e543e33344e04d0eddbf7c16b23b6ffa064d793 Mon Sep 17 00:00:00 2001 From: Adam Kondraciuk Date: Wed, 27 Nov 2024 16:06:44 +0100 Subject: [PATCH 2/3] [nrf fromlist] dts: nordic: nrf54: add TDM support for nRF54 Add TDM support for nRF54H20 and nRF54L20 Upstream PR #: 82144 Signed-off-by: Adam Kondraciuk --- dts/bindings/i2s/nordic,nrf-tdm.yaml | 48 ++++++++++++++++++++++++++++ dts/common/nordic/nrf54h20.dtsi | 28 ++++++++++++++++ dts/common/nordic/nrf54l20.dtsi | 19 +++++++++++ 3 files changed, 95 insertions(+) create mode 100644 dts/bindings/i2s/nordic,nrf-tdm.yaml diff --git a/dts/bindings/i2s/nordic,nrf-tdm.yaml b/dts/bindings/i2s/nordic,nrf-tdm.yaml new file mode 100644 index 00000000000..82f51147848 --- /dev/null +++ b/dts/bindings/i2s/nordic,nrf-tdm.yaml @@ -0,0 +1,48 @@ +# Copyright (c) 2024 Nordic Semiconductor ASA +# SPDX-License-Identifier: Apache-2.0 + +description: Nordic TDM (Time division multiplexed audio interface) + +compatible: "nordic,nrf-tdm" + +include: [i2s-controller.yaml, pinctrl-device.yaml, nordic-clockpin.yaml, "memory-region.yaml"] + +properties: + reg: + required: true + + interrupts: + required: true + + mck-frequency: + type: int + description: | + Frequency of the MCK clock. Configured independently of SCK. + + pinctrl-0: + required: true + + pinctrl-names: + required: true + + easydma-maxcnt-bits: + type: int + required: true + description: | + Maximum number of bits available in the EasyDMA MAXCNT register. This + property must be set at SoC level DTS files. + + clock-source: + type: string + default: "PCLK" + description: | + Clock source to be used by the TDM peripheral. The following options + are available: + - "PCLK": Peripheral clock + - "ACLK": Audio PLL clock with configurable frequency (frequency for + this clock must be set via the "hfclkaudio-frequency" property + in the "nordic,nrf-clock" node); this clock source is only available + in the nRF53 Series SoCs and it requires the use of HFXO + enum: + - "PCLK" + - "ACLK" diff --git a/dts/common/nordic/nrf54h20.dtsi b/dts/common/nordic/nrf54h20.dtsi index 9ddb657c4da..bfce794ff3c 100644 --- a/dts/common/nordic/nrf54h20.dtsi +++ b/dts/common/nordic/nrf54h20.dtsi @@ -1491,6 +1491,34 @@ endtx-stoptx-supported; frame-timeout-supported; }; + + tdm130: tdm@992000 { + compatible = "nordic,nrf-tdm"; + easydma-maxcnt-bits = <15>; + #address-cells = <1>; + #size-cells = <0>; + reg = <0x992000 0x1000>; + interrupts = <402 NRF_DEFAULT_IRQ_PRIORITY>; + status = "disabled"; + clocks = <&fll16m>; + power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>; + nordic,clockpin-enable = , + ; + }; + + tdm131: tdm@997000 { + compatible = "nordic,nrf-tdm"; + easydma-maxcnt-bits = <15>; + #address-cells = <1>; + #size-cells = <0>; + reg = <0x997000 0x1000>; + interrupts = <407 NRF_DEFAULT_IRQ_PRIORITY>; + status = "disabled"; + clocks = <&fll16m>; + power-domains = <&gpd NRF_GPD_SLOW_ACTIVE>; + nordic,clockpin-enable = , + ; + }; }; }; diff --git a/dts/common/nordic/nrf54l20.dtsi b/dts/common/nordic/nrf54l20.dtsi index d95ea80da26..8377e1cebca 100644 --- a/dts/common/nordic/nrf54l20.dtsi +++ b/dts/common/nordic/nrf54l20.dtsi @@ -53,6 +53,12 @@ clock-frequency = ; }; + pclk32m: pclk32m { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = ; + }; + lfxo: lfxo { compatible = "nordic,nrf-lfxo"; #clock-cells = <0>; @@ -555,6 +561,19 @@ status = "disabled"; }; + tdm: tdm@e8000 { + compatible = "nordic,nrf-tdm"; + easydma-maxcnt-bits = <15>; + #address-cells = <1>; + #size-cells = <0>; + reg = <0xe8000 0x1000>; + interrupts = <232 NRF_DEFAULT_IRQ_PRIORITY>; + status = "disabled"; + clocks = <&pclk32m>; + nordic,clockpin-enable = , + ; + }; + i2c23: i2c@ed000 { compatible = "nordic,nrf-twim"; #address-cells = <1>; From e16d9375be6ca2f912bb9023435c7852c9686c54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Stasiak?= Date: Wed, 19 Mar 2025 15:31:26 +0100 Subject: [PATCH 3/3] [nrf fromlist] dts: nordic: nrf54l20: add comparator node MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Added missing comparator node to nRF54L20 devicetree. Upstream PR #: 87352 Signed-off-by: Michał Stasiak --- dts/common/nordic/nrf54l20.dtsi | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dts/common/nordic/nrf54l20.dtsi b/dts/common/nordic/nrf54l20.dtsi index 8377e1cebca..3dc439394ff 100644 --- a/dts/common/nordic/nrf54l20.dtsi +++ b/dts/common/nordic/nrf54l20.dtsi @@ -703,6 +703,17 @@ frame-timeout-supported; }; + comp: comparator@106000 { + /* + * Use compatible "nordic,nrf-comp" to configure as COMP + * Use compatible "nordic,nrf-lpcomp" to configure as LPCOMP + */ + compatible = "nordic,nrf-comp"; + reg = <0x106000 0x1000>; + status = "disabled"; + interrupts = <262 NRF_DEFAULT_IRQ_PRIORITY>; + }; + wdt30: watchdog@108000 { compatible = "nordic,nrf-wdt"; reg = <0x108000 0x620>;