From 6a966bce64fe0351559783a5a263d73dcc2d98ef Mon Sep 17 00:00:00 2001 From: Kamil Piszczek Date: Fri, 22 Nov 2024 14:55:07 +0100 Subject: [PATCH] applications: nrf_desktop: define dts file for each build type Defined a dedicated DTS overlay file for each build type in the nRF Desktop application. Ref: NCSDK-13953 Signed-off-by: Kamil Piszczek --- .../nrf52840dk_nrf52840/app.overlay | 144 +---------------- .../nrf52840dk_nrf52840/app_common.dtsi | 143 +++++++++++++++++ .../nrf52840dk_nrf52840/app_dongle.overlay | 144 +---------------- .../nrf52840dk_nrf52840/app_keyboard.overlay | 144 +---------------- .../app_mcuboot_qspi.overlay | 146 +----------------- .../nrf52840dongle_nrf52840/app.overlay | 77 +-------- .../app_3bleconn.overlay | 80 +--------- .../app_4llpmconn.overlay | 80 +--------- .../nrf52840dongle_nrf52840/app_common.dtsi | 79 ++++++++++ .../app_release_4llpmconn.overlay | 80 +--------- .../nrf54h20dk_nrf54h20_cpuapp/app.overlay | 83 +--------- .../app_common.dtsi | 83 ++++++++++ .../app_release.overlay | 12 ++ .../nrf54l15dk_nrf54l15_cpuapp/app.overlay | 112 +------------- .../app_common.dtsi | 112 ++++++++++++++ .../app_release.overlay | 12 ++ .../releases/release-notes-changelog.rst | 7 + 17 files changed, 514 insertions(+), 1024 deletions(-) create mode 100644 applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app_common.dtsi create mode 100644 applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app_common.dtsi create mode 100644 applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpuapp/app_common.dtsi create mode 100644 applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpuapp/app_release.overlay create mode 100644 applications/nrf_desktop/configuration/nrf54l15dk_nrf54l15_cpuapp/app_common.dtsi create mode 100644 applications/nrf_desktop/configuration/nrf54l15dk_nrf54l15_cpuapp/app_release.overlay diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app.overlay b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app.overlay index 472963d9248c..ef06923755da 100644 --- a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app.overlay +++ b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app.overlay @@ -1,15 +1,12 @@ -/ { - chosen { - /* - * In some default configurations within the nRF Connect SDK, - * e.g. on nRF52840 and nRF9160, the chosen zephyr,entropy node - * is &cryptocell. This devicetree overlay ensures that default - * is overridden wherever it is set, as this application uses - * the RNG node for entropy exclusively. - */ - zephyr,entropy = &rng; - }; +/* + * Copyright (c) 2024 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +#include "app_common.dtsi" +/ { /* Configure DTS nodes used for USB next HID support. */ hid_dev_0: hid_dev_0 { compatible = "zephyr,hid-device"; @@ -18,129 +15,4 @@ in-polling-period-us = <1000>; in-report-size = <64>; }; - - pwmleds1 { - compatible = "pwm-leds"; - status = "okay"; - - pwm_led1: led_pwm_1 { - status = "okay"; - pwms = <&pwm1 0 PWM_MSEC(20) PWM_POLARITY_INVERTED>; - label = "LED Conn State"; - }; - }; - - pwmleds2 { - compatible = "pwm-leds"; - status = "okay"; - - pwm_led2: led_pwm_2 { - status = "okay"; - pwms = <&pwm2 0 PWM_MSEC(20) PWM_POLARITY_INVERTED>; - label = "LED Num Lock"; - }; - }; - - pwmleds3 { - compatible = "pwm-leds"; - status = "okay"; - - pwm_led3: led_pwm_3 { - status = "okay"; - pwms = <&pwm3 0 PWM_MSEC(20) PWM_POLARITY_INVERTED>; - label = "LED Caps Lock"; - }; - }; -}; - -&pwm0 { - status = "okay"; - pinctrl-0 = <&pwm0_default_alt>; - pinctrl-1 = <&pwm0_sleep_alt>; - pinctrl-names = "default", "sleep"; -}; - -&pwm1 { - status = "okay"; - pinctrl-0 = <&pwm1_default_alt>; - pinctrl-1 = <&pwm1_sleep_alt>; - pinctrl-names = "default", "sleep"; -}; - -&pwm2 { - status = "okay"; - pinctrl-0 = <&pwm2_default_alt>; - pinctrl-1 = <&pwm2_sleep_alt>; - pinctrl-names = "default", "sleep"; -}; - -&pwm3 { - status = "okay"; - pinctrl-0 = <&pwm3_default_alt>; - pinctrl-1 = <&pwm3_sleep_alt>; - pinctrl-names = "default", "sleep"; -}; - -&pwm_led0 { - status = "okay"; - pwms = <&pwm0 0 PWM_MSEC(20) PWM_POLARITY_INVERTED>; - label = "LED System State"; -}; - -&pinctrl { - pwm0_default_alt: pwm0_default_alt { - group1 { - psels = ; - nordic,invert; - }; - }; - - pwm0_sleep_alt: pwm0_sleep_alt { - group1 { - psels = ; - low-power-enable; - }; - }; - - pwm1_default_alt: pwm1_default_alt { - group1 { - psels = ; - nordic,invert; - }; - }; - - pwm1_sleep_alt: pwm1_sleep_alt { - group1 { - psels = ; - low-power-enable; - }; - }; - - pwm2_default_alt: pwm2_default_alt { - group1 { - psels = ; - nordic,invert; - }; - }; - - pwm2_sleep_alt: pwm2_sleep_alt { - group1 { - psels = ; - low-power-enable; - }; - }; - - pwm3_default_alt: pwm3_default_alt { - group1 { - psels = ; - nordic,invert; - }; - }; - - pwm3_sleep_alt: pwm3_sleep_alt { - group1 { - psels = ; - low-power-enable; - }; - }; }; diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app_common.dtsi b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app_common.dtsi new file mode 100644 index 000000000000..2f1cb5df3a50 --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app_common.dtsi @@ -0,0 +1,143 @@ +/* + * Copyright (c) 2024 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +/ { + chosen { + /* + * In some default configurations within the nRF Connect SDK, + * e.g. on nRF52840 and nRF9160, the chosen zephyr,entropy node + * is &cryptocell. This devicetree overlay ensures that default + * is overridden wherever it is set, as this application uses + * the RNG node for entropy exclusively. + */ + zephyr,entropy = &rng; + }; + + pwmleds1 { + compatible = "pwm-leds"; + status = "okay"; + + pwm_led1: led_pwm_1 { + status = "okay"; + pwms = <&pwm1 0 PWM_MSEC(20) PWM_POLARITY_INVERTED>; + label = "LED Conn State"; + }; + }; + + pwmleds2 { + compatible = "pwm-leds"; + status = "okay"; + + pwm_led2: led_pwm_2 { + status = "okay"; + pwms = <&pwm2 0 PWM_MSEC(20) PWM_POLARITY_INVERTED>; + label = "LED Num Lock"; + }; + }; + + pwmleds3 { + compatible = "pwm-leds"; + status = "okay"; + + pwm_led3: led_pwm_3 { + status = "okay"; + pwms = <&pwm3 0 PWM_MSEC(20) PWM_POLARITY_INVERTED>; + label = "LED Caps Lock"; + }; + }; +}; + +&pwm0 { + status = "okay"; + pinctrl-0 = <&pwm0_default_alt>; + pinctrl-1 = <&pwm0_sleep_alt>; + pinctrl-names = "default", "sleep"; +}; + +&pwm1 { + status = "okay"; + pinctrl-0 = <&pwm1_default_alt>; + pinctrl-1 = <&pwm1_sleep_alt>; + pinctrl-names = "default", "sleep"; +}; + +&pwm2 { + status = "okay"; + pinctrl-0 = <&pwm2_default_alt>; + pinctrl-1 = <&pwm2_sleep_alt>; + pinctrl-names = "default", "sleep"; +}; + +&pwm3 { + status = "okay"; + pinctrl-0 = <&pwm3_default_alt>; + pinctrl-1 = <&pwm3_sleep_alt>; + pinctrl-names = "default", "sleep"; +}; + +&pwm_led0 { + status = "okay"; + pwms = <&pwm0 0 PWM_MSEC(20) PWM_POLARITY_INVERTED>; + label = "LED System State"; +}; + +&pinctrl { + pwm0_default_alt: pwm0_default_alt { + group1 { + psels = ; + nordic,invert; + }; + }; + + pwm0_sleep_alt: pwm0_sleep_alt { + group1 { + psels = ; + low-power-enable; + }; + }; + + pwm1_default_alt: pwm1_default_alt { + group1 { + psels = ; + nordic,invert; + }; + }; + + pwm1_sleep_alt: pwm1_sleep_alt { + group1 { + psels = ; + low-power-enable; + }; + }; + + pwm2_default_alt: pwm2_default_alt { + group1 { + psels = ; + nordic,invert; + }; + }; + + pwm2_sleep_alt: pwm2_sleep_alt { + group1 { + psels = ; + low-power-enable; + }; + }; + + pwm3_default_alt: pwm3_default_alt { + group1 { + psels = ; + nordic,invert; + }; + }; + + pwm3_sleep_alt: pwm3_sleep_alt { + group1 { + psels = ; + low-power-enable; + }; + }; +}; diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app_dongle.overlay b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app_dongle.overlay index bc0d63e8e8c1..2e14b99149b9 100644 --- a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app_dongle.overlay +++ b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app_dongle.overlay @@ -1,15 +1,12 @@ -/ { - chosen { - /* - * In some default configurations within the nRF Connect SDK, - * e.g. on nRF52840 and nRF9160, the chosen zephyr,entropy node - * is &cryptocell. This devicetree overlay ensures that default - * is overridden wherever it is set, as this application uses - * the RNG node for entropy exclusively. - */ - zephyr,entropy = &rng; - }; +/* + * Copyright (c) 2024 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +#include "app_common.dtsi" +/ { /* Configure DTS nodes used for USB next HID support. */ hid_dev_0: hid_dev_0 { compatible = "zephyr,hid-device"; @@ -25,129 +22,4 @@ in-polling-period-us = <1000>; in-report-size = <64>; }; - - pwmleds1 { - compatible = "pwm-leds"; - status = "okay"; - - pwm_led1: led_pwm_1 { - status = "okay"; - pwms = <&pwm1 0 PWM_MSEC(20) PWM_POLARITY_INVERTED>; - label = "LED Conn State"; - }; - }; - - pwmleds2 { - compatible = "pwm-leds"; - status = "okay"; - - pwm_led2: led_pwm_2 { - status = "okay"; - pwms = <&pwm2 0 PWM_MSEC(20) PWM_POLARITY_INVERTED>; - label = "LED Num Lock"; - }; - }; - - pwmleds3 { - compatible = "pwm-leds"; - status = "okay"; - - pwm_led3: led_pwm_3 { - status = "okay"; - pwms = <&pwm3 0 PWM_MSEC(20) PWM_POLARITY_INVERTED>; - label = "LED Caps Lock"; - }; - }; -}; - -&pwm0 { - status = "okay"; - pinctrl-0 = <&pwm0_default_alt>; - pinctrl-1 = <&pwm0_sleep_alt>; - pinctrl-names = "default", "sleep"; -}; - -&pwm1 { - status = "okay"; - pinctrl-0 = <&pwm1_default_alt>; - pinctrl-1 = <&pwm1_sleep_alt>; - pinctrl-names = "default", "sleep"; -}; - -&pwm2 { - status = "okay"; - pinctrl-0 = <&pwm2_default_alt>; - pinctrl-1 = <&pwm2_sleep_alt>; - pinctrl-names = "default", "sleep"; -}; - -&pwm3 { - status = "okay"; - pinctrl-0 = <&pwm3_default_alt>; - pinctrl-1 = <&pwm3_sleep_alt>; - pinctrl-names = "default", "sleep"; -}; - -&pwm_led0 { - status = "okay"; - pwms = <&pwm0 0 PWM_MSEC(20) PWM_POLARITY_INVERTED>; - label = "LED System State"; -}; - -&pinctrl { - pwm0_default_alt: pwm0_default_alt { - group1 { - psels = ; - nordic,invert; - }; - }; - - pwm0_sleep_alt: pwm0_sleep_alt { - group1 { - psels = ; - low-power-enable; - }; - }; - - pwm1_default_alt: pwm1_default_alt { - group1 { - psels = ; - nordic,invert; - }; - }; - - pwm1_sleep_alt: pwm1_sleep_alt { - group1 { - psels = ; - low-power-enable; - }; - }; - - pwm2_default_alt: pwm2_default_alt { - group1 { - psels = ; - nordic,invert; - }; - }; - - pwm2_sleep_alt: pwm2_sleep_alt { - group1 { - psels = ; - low-power-enable; - }; - }; - - pwm3_default_alt: pwm3_default_alt { - group1 { - psels = ; - nordic,invert; - }; - }; - - pwm3_sleep_alt: pwm3_sleep_alt { - group1 { - psels = ; - low-power-enable; - }; - }; }; diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app_keyboard.overlay b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app_keyboard.overlay index 2c71c9afa1cd..5bf5cbb6ab44 100644 --- a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app_keyboard.overlay +++ b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app_keyboard.overlay @@ -1,15 +1,12 @@ -/ { - chosen { - /* - * In some default configurations within the nRF Connect SDK, - * e.g. on nRF52840 and nRF9160, the chosen zephyr,entropy node - * is &cryptocell. This devicetree overlay ensures that default - * is overridden wherever it is set, as this application uses - * the RNG node for entropy exclusively. - */ - zephyr,entropy = &rng; - }; +/* + * Copyright (c) 2024 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +#include "app_common.dtsi" +/ { /* Configure DTS nodes used for USB next HID support. */ hid_dev_0: hid_dev_0 { compatible = "zephyr,hid-device"; @@ -18,129 +15,4 @@ in-polling-period-us = <1000>; in-report-size = <64>; }; - - pwmleds1 { - compatible = "pwm-leds"; - status = "okay"; - - pwm_led1: led_pwm_1 { - status = "okay"; - pwms = <&pwm1 0 PWM_MSEC(20) PWM_POLARITY_INVERTED>; - label = "LED Conn State"; - }; - }; - - pwmleds2 { - compatible = "pwm-leds"; - status = "okay"; - - pwm_led2: led_pwm_2 { - status = "okay"; - pwms = <&pwm2 0 PWM_MSEC(20) PWM_POLARITY_INVERTED>; - label = "LED Num Lock"; - }; - }; - - pwmleds3 { - compatible = "pwm-leds"; - status = "okay"; - - pwm_led3: led_pwm_3 { - status = "okay"; - pwms = <&pwm3 0 PWM_MSEC(20) PWM_POLARITY_INVERTED>; - label = "LED Caps Lock"; - }; - }; -}; - -&pwm0 { - status = "okay"; - pinctrl-0 = <&pwm0_default_alt>; - pinctrl-1 = <&pwm0_sleep_alt>; - pinctrl-names = "default", "sleep"; -}; - -&pwm1 { - status = "okay"; - pinctrl-0 = <&pwm1_default_alt>; - pinctrl-1 = <&pwm1_sleep_alt>; - pinctrl-names = "default", "sleep"; -}; - -&pwm2 { - status = "okay"; - pinctrl-0 = <&pwm2_default_alt>; - pinctrl-1 = <&pwm2_sleep_alt>; - pinctrl-names = "default", "sleep"; -}; - -&pwm3 { - status = "okay"; - pinctrl-0 = <&pwm3_default_alt>; - pinctrl-1 = <&pwm3_sleep_alt>; - pinctrl-names = "default", "sleep"; -}; - -&pwm_led0 { - status = "okay"; - pwms = <&pwm0 0 PWM_MSEC(20) PWM_POLARITY_INVERTED>; - label = "LED System State"; -}; - -&pinctrl { - pwm0_default_alt: pwm0_default_alt { - group1 { - psels = ; - nordic,invert; - }; - }; - - pwm0_sleep_alt: pwm0_sleep_alt { - group1 { - psels = ; - low-power-enable; - }; - }; - - pwm1_default_alt: pwm1_default_alt { - group1 { - psels = ; - nordic,invert; - }; - }; - - pwm1_sleep_alt: pwm1_sleep_alt { - group1 { - psels = ; - low-power-enable; - }; - }; - - pwm2_default_alt: pwm2_default_alt { - group1 { - psels = ; - nordic,invert; - }; - }; - - pwm2_sleep_alt: pwm2_sleep_alt { - group1 { - psels = ; - low-power-enable; - }; - }; - - pwm3_default_alt: pwm3_default_alt { - group1 { - psels = ; - nordic,invert; - }; - }; - - pwm3_sleep_alt: pwm3_sleep_alt { - group1 { - psels = ; - low-power-enable; - }; - }; }; diff --git a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app_mcuboot_qspi.overlay b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app_mcuboot_qspi.overlay index 8b22ad455860..9846c556ea74 100644 --- a/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app_mcuboot_qspi.overlay +++ b/applications/nrf_desktop/configuration/nrf52840dk_nrf52840/app_mcuboot_qspi.overlay @@ -1,19 +1,14 @@ -/ { - chosen { - nordic,pm-ext-flash = &mx25r64; - }; -}; +/* + * Copyright (c) 2024 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +#include "app_common.dtsi" / { chosen { - /* - * In some default configurations within the nRF Connect SDK, - * e.g. on nRF52840 and nRF9160, the chosen zephyr,entropy node - * is &cryptocell. This devicetree overlay ensures that default - * is overridden wherever it is set, as this application uses - * the RNG node for entropy exclusively. - */ - zephyr,entropy = &rng; + nordic,pm-ext-flash = &mx25r64; }; /* Configure DTS nodes used for USB next HID support. */ @@ -24,133 +19,8 @@ in-polling-period-us = <1000>; in-report-size = <64>; }; - - pwmleds1 { - compatible = "pwm-leds"; - status = "okay"; - - pwm_led1: led_pwm_1 { - status = "okay"; - pwms = <&pwm1 0 PWM_MSEC(20) PWM_POLARITY_INVERTED>; - label = "LED Conn State"; - }; - }; - - pwmleds2 { - compatible = "pwm-leds"; - status = "okay"; - - pwm_led2: led_pwm_2 { - status = "okay"; - pwms = <&pwm2 0 PWM_MSEC(20) PWM_POLARITY_INVERTED>; - label = "LED Num Lock"; - }; - }; - - pwmleds3 { - compatible = "pwm-leds"; - status = "okay"; - - pwm_led3: led_pwm_3 { - status = "okay"; - pwms = <&pwm3 0 PWM_MSEC(20) PWM_POLARITY_INVERTED>; - label = "LED Caps Lock"; - }; - }; -}; - -&pwm0 { - status = "okay"; - pinctrl-0 = <&pwm0_default_alt>; - pinctrl-1 = <&pwm0_sleep_alt>; - pinctrl-names = "default", "sleep"; -}; - -&pwm1 { - status = "okay"; - pinctrl-0 = <&pwm1_default_alt>; - pinctrl-1 = <&pwm1_sleep_alt>; - pinctrl-names = "default", "sleep"; -}; - -&pwm2 { - status = "okay"; - pinctrl-0 = <&pwm2_default_alt>; - pinctrl-1 = <&pwm2_sleep_alt>; - pinctrl-names = "default", "sleep"; -}; - -&pwm3 { - status = "okay"; - pinctrl-0 = <&pwm3_default_alt>; - pinctrl-1 = <&pwm3_sleep_alt>; - pinctrl-names = "default", "sleep"; -}; - -&pwm_led0 { - status = "okay"; - pwms = <&pwm0 0 PWM_MSEC(20) PWM_POLARITY_INVERTED>; - label = "LED System State"; }; &qspi { status = "okay"; }; - -&pinctrl { - pwm0_default_alt: pwm0_default_alt { - group1 { - psels = ; - nordic,invert; - }; - }; - - pwm0_sleep_alt: pwm0_sleep_alt { - group1 { - psels = ; - low-power-enable; - }; - }; - - pwm1_default_alt: pwm1_default_alt { - group1 { - psels = ; - nordic,invert; - }; - }; - - pwm1_sleep_alt: pwm1_sleep_alt { - group1 { - psels = ; - low-power-enable; - }; - }; - - pwm2_default_alt: pwm2_default_alt { - group1 { - psels = ; - nordic,invert; - }; - }; - - pwm2_sleep_alt: pwm2_sleep_alt { - group1 { - psels = ; - low-power-enable; - }; - }; - - pwm3_default_alt: pwm3_default_alt { - group1 { - psels = ; - nordic,invert; - }; - }; - - pwm3_sleep_alt: pwm3_sleep_alt { - group1 { - psels = ; - low-power-enable; - }; - }; -}; diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app.overlay b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app.overlay index 3374688633f6..d8f0047799be 100644 --- a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app.overlay +++ b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app.overlay @@ -1,13 +1,13 @@ +/* + * Copyright (c) 2024 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +#include "app_common.dtsi" + / { chosen { - /* - * In some default configurations within the nRF Connect SDK, - * e.g. on nRF52840 and nRF9160, the chosen zephyr,entropy node - * is &cryptocell. This devicetree overlay ensures that default - * is overridden wherever it is set, as this application uses - * the RNG node for entropy exclusively. - */ - zephyr,entropy = &rng; ncs,ble-qos-uart = &cdc_acm_uart; }; @@ -26,69 +26,8 @@ in-polling-period-us = <1000>; in-report-size = <64>; }; - - pwmleds { - red_pwm_led: pwm_led_0 { - pwms = <&pwm0 0 PWM_MSEC(1) PWM_POLARITY_INVERTED>; - }; - green_pwm_led: pwm_led_1 { - pwms = <&pwm0 1 PWM_MSEC(1) PWM_POLARITY_INVERTED>; - }; - blue_pwm_led: pwm_led_2 { - pwms = <&pwm0 2 PWM_MSEC(1) PWM_POLARITY_INVERTED>; - }; - }; - - pwmleds1 { - compatible = "pwm-leds"; - status = "okay"; - - pwm_led1: led_pwm_4 { - status = "okay"; - pwms = <&pwm1 0 PWM_MSEC(20) PWM_POLARITY_INVERTED>; - label = "LED System State"; - }; - }; -}; - -&usbd { - compatible = "nordic,nrf-usbd"; - status = "okay"; - num-bidir-endpoints = <0>; - num-in-endpoints = <7>; - num-out-endpoints = <2>; - num-isoin-endpoints = <0>; - num-isoout-endpoints = <0>; }; &cdc_acm_uart { status = "okay"; }; - -&pwm0 { - status = "okay"; -}; - -&pwm1 { - status = "okay"; - pinctrl-0 = <&pwm1_default_alt>; - pinctrl-1 = <&pwm1_sleep_alt>; - pinctrl-names = "default", "sleep"; -}; - -&pinctrl { - pwm1_default_alt: pwm1_default_alt { - group1 { - psels = ; - nordic,invert; - }; - }; - - pwm1_sleep_alt: pwm1_sleep_alt { - group1 { - psels = ; - low-power-enable; - }; - }; - -}; diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app_3bleconn.overlay b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app_3bleconn.overlay index c3a61cfa68ce..07ad1dddc79d 100644 --- a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app_3bleconn.overlay +++ b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app_3bleconn.overlay @@ -1,15 +1,12 @@ -/ { - chosen { - /* - * In some default configurations within the nRF Connect SDK, - * e.g. on nRF52840 and nRF9160, the chosen zephyr,entropy node - * is &cryptocell. This devicetree overlay ensures that default - * is overridden wherever it is set, as this application uses - * the RNG node for entropy exclusively. - */ - zephyr,entropy = &rng; - }; +/* + * Copyright (c) 2024 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +#include "app_common.dtsi" +/ { /* Configure DTS nodes used for USB next HID support. */ hid_dev_0: hid_dev_0 { compatible = "zephyr,hid-device"; @@ -53,65 +50,4 @@ in-polling-period-us = <1000>; in-report-size = <64>; }; - - pwmleds { - red_pwm_led: pwm_led_0 { - pwms = <&pwm0 0 PWM_MSEC(1) PWM_POLARITY_INVERTED>; - }; - green_pwm_led: pwm_led_1 { - pwms = <&pwm0 1 PWM_MSEC(1) PWM_POLARITY_INVERTED>; - }; - blue_pwm_led: pwm_led_2 { - pwms = <&pwm0 2 PWM_MSEC(1) PWM_POLARITY_INVERTED>; - }; - }; - - pwmleds1 { - compatible = "pwm-leds"; - status = "okay"; - - pwm_led1: led_pwm_4 { - status = "okay"; - pwms = <&pwm1 0 PWM_MSEC(20) PWM_POLARITY_INVERTED>; - label = "LED System State"; - }; - }; -}; - -&usbd { - compatible = "nordic,nrf-usbd"; - status = "okay"; - num-bidir-endpoints = <0>; - num-in-endpoints = <7>; - num-out-endpoints = <2>; - num-isoin-endpoints = <0>; - num-isoout-endpoints = <0>; -}; - -&pwm0 { - status = "okay"; -}; - -&pwm1 { - status = "okay"; - pinctrl-0 = <&pwm1_default_alt>; - pinctrl-1 = <&pwm1_sleep_alt>; - pinctrl-names = "default", "sleep"; -}; - -&pinctrl { - pwm1_default_alt: pwm1_default_alt { - group1 { - psels = ; - nordic,invert; - }; - }; - - pwm1_sleep_alt: pwm1_sleep_alt { - group1 { - psels = ; - low-power-enable; - }; - }; - }; diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app_4llpmconn.overlay b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app_4llpmconn.overlay index c3a61cfa68ce..07ad1dddc79d 100644 --- a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app_4llpmconn.overlay +++ b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app_4llpmconn.overlay @@ -1,15 +1,12 @@ -/ { - chosen { - /* - * In some default configurations within the nRF Connect SDK, - * e.g. on nRF52840 and nRF9160, the chosen zephyr,entropy node - * is &cryptocell. This devicetree overlay ensures that default - * is overridden wherever it is set, as this application uses - * the RNG node for entropy exclusively. - */ - zephyr,entropy = &rng; - }; +/* + * Copyright (c) 2024 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +#include "app_common.dtsi" +/ { /* Configure DTS nodes used for USB next HID support. */ hid_dev_0: hid_dev_0 { compatible = "zephyr,hid-device"; @@ -53,65 +50,4 @@ in-polling-period-us = <1000>; in-report-size = <64>; }; - - pwmleds { - red_pwm_led: pwm_led_0 { - pwms = <&pwm0 0 PWM_MSEC(1) PWM_POLARITY_INVERTED>; - }; - green_pwm_led: pwm_led_1 { - pwms = <&pwm0 1 PWM_MSEC(1) PWM_POLARITY_INVERTED>; - }; - blue_pwm_led: pwm_led_2 { - pwms = <&pwm0 2 PWM_MSEC(1) PWM_POLARITY_INVERTED>; - }; - }; - - pwmleds1 { - compatible = "pwm-leds"; - status = "okay"; - - pwm_led1: led_pwm_4 { - status = "okay"; - pwms = <&pwm1 0 PWM_MSEC(20) PWM_POLARITY_INVERTED>; - label = "LED System State"; - }; - }; -}; - -&usbd { - compatible = "nordic,nrf-usbd"; - status = "okay"; - num-bidir-endpoints = <0>; - num-in-endpoints = <7>; - num-out-endpoints = <2>; - num-isoin-endpoints = <0>; - num-isoout-endpoints = <0>; -}; - -&pwm0 { - status = "okay"; -}; - -&pwm1 { - status = "okay"; - pinctrl-0 = <&pwm1_default_alt>; - pinctrl-1 = <&pwm1_sleep_alt>; - pinctrl-names = "default", "sleep"; -}; - -&pinctrl { - pwm1_default_alt: pwm1_default_alt { - group1 { - psels = ; - nordic,invert; - }; - }; - - pwm1_sleep_alt: pwm1_sleep_alt { - group1 { - psels = ; - low-power-enable; - }; - }; - }; diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app_common.dtsi b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app_common.dtsi new file mode 100644 index 000000000000..64343af587e4 --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app_common.dtsi @@ -0,0 +1,79 @@ +/* + * Copyright (c) 2024 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +/ { + chosen { + /* + * In some default configurations within the nRF Connect SDK, + * e.g. on nRF52840 and nRF9160, the chosen zephyr,entropy node + * is &cryptocell. This devicetree overlay ensures that default + * is overridden wherever it is set, as this application uses + * the RNG node for entropy exclusively. + */ + zephyr,entropy = &rng; + }; + + pwmleds { + red_pwm_led: pwm_led_0 { + pwms = <&pwm0 0 PWM_MSEC(1) PWM_POLARITY_INVERTED>; + }; + green_pwm_led: pwm_led_1 { + pwms = <&pwm0 1 PWM_MSEC(1) PWM_POLARITY_INVERTED>; + }; + blue_pwm_led: pwm_led_2 { + pwms = <&pwm0 2 PWM_MSEC(1) PWM_POLARITY_INVERTED>; + }; + }; + + pwmleds1 { + compatible = "pwm-leds"; + status = "okay"; + + pwm_led1: led_pwm_4 { + status = "okay"; + pwms = <&pwm1 0 PWM_MSEC(20) PWM_POLARITY_INVERTED>; + label = "LED System State"; + }; + }; +}; + +&usbd { + compatible = "nordic,nrf-usbd"; + status = "okay"; + num-bidir-endpoints = <0>; + num-in-endpoints = <7>; + num-out-endpoints = <2>; + num-isoin-endpoints = <0>; + num-isoout-endpoints = <0>; +}; + +&pwm0 { + status = "okay"; +}; + +&pwm1 { + status = "okay"; + pinctrl-0 = <&pwm1_default_alt>; + pinctrl-1 = <&pwm1_sleep_alt>; + pinctrl-names = "default", "sleep"; +}; + +&pinctrl { + pwm1_default_alt: pwm1_default_alt { + group1 { + psels = ; + nordic,invert; + }; + }; + + pwm1_sleep_alt: pwm1_sleep_alt { + group1 { + psels = ; + low-power-enable; + }; + }; + +}; diff --git a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app_release_4llpmconn.overlay b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app_release_4llpmconn.overlay index c3a61cfa68ce..07ad1dddc79d 100644 --- a/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app_release_4llpmconn.overlay +++ b/applications/nrf_desktop/configuration/nrf52840dongle_nrf52840/app_release_4llpmconn.overlay @@ -1,15 +1,12 @@ -/ { - chosen { - /* - * In some default configurations within the nRF Connect SDK, - * e.g. on nRF52840 and nRF9160, the chosen zephyr,entropy node - * is &cryptocell. This devicetree overlay ensures that default - * is overridden wherever it is set, as this application uses - * the RNG node for entropy exclusively. - */ - zephyr,entropy = &rng; - }; +/* + * Copyright (c) 2024 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +#include "app_common.dtsi" +/ { /* Configure DTS nodes used for USB next HID support. */ hid_dev_0: hid_dev_0 { compatible = "zephyr,hid-device"; @@ -53,65 +50,4 @@ in-polling-period-us = <1000>; in-report-size = <64>; }; - - pwmleds { - red_pwm_led: pwm_led_0 { - pwms = <&pwm0 0 PWM_MSEC(1) PWM_POLARITY_INVERTED>; - }; - green_pwm_led: pwm_led_1 { - pwms = <&pwm0 1 PWM_MSEC(1) PWM_POLARITY_INVERTED>; - }; - blue_pwm_led: pwm_led_2 { - pwms = <&pwm0 2 PWM_MSEC(1) PWM_POLARITY_INVERTED>; - }; - }; - - pwmleds1 { - compatible = "pwm-leds"; - status = "okay"; - - pwm_led1: led_pwm_4 { - status = "okay"; - pwms = <&pwm1 0 PWM_MSEC(20) PWM_POLARITY_INVERTED>; - label = "LED System State"; - }; - }; -}; - -&usbd { - compatible = "nordic,nrf-usbd"; - status = "okay"; - num-bidir-endpoints = <0>; - num-in-endpoints = <7>; - num-out-endpoints = <2>; - num-isoin-endpoints = <0>; - num-isoout-endpoints = <0>; -}; - -&pwm0 { - status = "okay"; -}; - -&pwm1 { - status = "okay"; - pinctrl-0 = <&pwm1_default_alt>; - pinctrl-1 = <&pwm1_sleep_alt>; - pinctrl-names = "default", "sleep"; -}; - -&pinctrl { - pwm1_default_alt: pwm1_default_alt { - group1 { - psels = ; - nordic,invert; - }; - }; - - pwm1_sleep_alt: pwm1_sleep_alt { - group1 { - psels = ; - low-power-enable; - }; - }; - }; diff --git a/applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpuapp/app.overlay b/applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpuapp/app.overlay index e9823ff39c8c..590035ad61b6 100644 --- a/applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpuapp/app.overlay +++ b/applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpuapp/app.overlay @@ -4,85 +4,4 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ -/* For nRF54H, watchdog status is disabled by default. Needs to be enabled in DTS overlay. */ -&wdt010 { - status = "okay"; -}; - -/ { - /* Redefine leds to fit CAF requirements. */ - /delete-node/ leds; - - leds0 { - compatible = "gpio-leds"; - status = "okay"; - label = "System State LED"; - - led0: led_0 { - gpios = < &gpio9 0 GPIO_ACTIVE_HIGH >; - label = "Green LED 0"; - }; - }; - - leds1 { - compatible = "gpio-leds"; - status = "okay"; - label = "Peer State LED"; - - led1: led_1 { - gpios = < &gpio9 1 GPIO_ACTIVE_HIGH >; - label = "Green LED 1"; - }; - }; - - leds2 { - compatible = "gpio-leds"; - status = "disabled"; - label = "Unused LED 2"; - - led2: led_2 { - gpios = < &gpio9 2 GPIO_ACTIVE_HIGH >; - label = "Green LED 2"; - }; - }; - - leds3 { - compatible = "gpio-leds"; - status = "disabled"; - label = "Unused LED 3"; - - led3: led_3 { - gpios = < &gpio9 3 GPIO_ACTIVE_HIGH >; - label = "Green LED 3"; - }; - }; - - hid_dev_0: hid_dev_0 { - compatible = "zephyr,hid-device"; - interface-name = "HID0"; - protocol-code = "mouse"; - in-polling-period-us = <125>; - in-report-size = <64>; - }; - - aliases { - nrfdesktop-dvfs-clock = &cpuapp_hsfll; - }; -}; - -&cpusec_cpuapp_ipc { - status = "okay"; -}; - -&cpusec_bellboard { - status = "okay"; -}; - -/* Shrink ppr partition as ppr core is not used and extend app core code partition. */ -&cpuppr_code_partition { - reg = < 0xf8000 DT_SIZE_K(32) >; -}; - -&cpuapp_slot0_partition { - reg = < 0xa6000 DT_SIZE_K(328) >; -}; +#include "app_common.dtsi" diff --git a/applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpuapp/app_common.dtsi b/applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpuapp/app_common.dtsi new file mode 100644 index 000000000000..d8cfa64a41c3 --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpuapp/app_common.dtsi @@ -0,0 +1,83 @@ +/* + * Copyright (c) 2024 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +/ { + /* Redefine leds to fit CAF requirements. */ + /delete-node/ leds; + + leds0 { + compatible = "gpio-leds"; + status = "okay"; + label = "System State LED"; + + led0: led_0 { + gpios = < &gpio9 0 GPIO_ACTIVE_HIGH >; + label = "Green LED 0"; + }; + }; + + leds1 { + compatible = "gpio-leds"; + status = "okay"; + label = "Peer State LED"; + + led1: led_1 { + gpios = < &gpio9 1 GPIO_ACTIVE_HIGH >; + label = "Green LED 1"; + }; + }; + + leds2 { + compatible = "gpio-leds"; + status = "disabled"; + label = "Unused LED 2"; + + led2: led_2 { + gpios = < &gpio9 2 GPIO_ACTIVE_HIGH >; + label = "Green LED 2"; + }; + }; + + leds3 { + compatible = "gpio-leds"; + status = "disabled"; + label = "Unused LED 3"; + + led3: led_3 { + gpios = < &gpio9 3 GPIO_ACTIVE_HIGH >; + label = "Green LED 3"; + }; + }; + + hid_dev_0: hid_dev_0 { + compatible = "zephyr,hid-device"; + interface-name = "HID0"; + protocol-code = "mouse"; + in-polling-period-us = <125>; + in-report-size = <64>; + }; + + aliases { + nrfdesktop-dvfs-clock = &cpuapp_hsfll; + }; +}; + +&cpusec_cpuapp_ipc { + status = "okay"; +}; + +&cpusec_bellboard { + status = "okay"; +}; + +/* Shrink ppr partition as ppr core is not used and extend app core code partition. */ +&cpuppr_code_partition { + reg = < 0xf8000 DT_SIZE_K(32) >; +}; + +&cpuapp_slot0_partition { + reg = < 0xa6000 DT_SIZE_K(328) >; +}; diff --git a/applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpuapp/app_release.overlay b/applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpuapp/app_release.overlay new file mode 100644 index 000000000000..8f655f74ac05 --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf54h20dk_nrf54h20_cpuapp/app_release.overlay @@ -0,0 +1,12 @@ +/* + * Copyright (c) 2024 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +#include "app_common.dtsi" + +/* For nRF54H, watchdog status is disabled by default. Needs to be enabled in DTS overlay. */ +&wdt010 { + status = "okay"; +}; diff --git a/applications/nrf_desktop/configuration/nrf54l15dk_nrf54l15_cpuapp/app.overlay b/applications/nrf_desktop/configuration/nrf54l15dk_nrf54l15_cpuapp/app.overlay index a773a2afeccd..590035ad61b6 100644 --- a/applications/nrf_desktop/configuration/nrf54l15dk_nrf54l15_cpuapp/app.overlay +++ b/applications/nrf_desktop/configuration/nrf54l15dk_nrf54l15_cpuapp/app.overlay @@ -4,114 +4,4 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ -/* For nRF54L, watchdog status is disabled by default. Needs to be enabled in DTS overlay. */ -&wdt31 { - status = "okay"; -}; - -/* Application does not use cpuflpr core. Assign whole RRAM to cpuapp. */ -&cpuapp_rram { - reg = < 0x0 DT_SIZE_K(1524) >; -}; - -/ { - /* Disable pwmleds and redefine them to align configuration with CAF LEDs requirements. - * The configuration needs to match the used board revision. - */ - /delete-node/ pwmleds; - - pwmleds0 { - compatible = "pwm-leds"; - status = "okay"; - - pwm_led0: led_pwm_0 { - status = "okay"; - pwms = <&pwm20 0 PWM_MSEC(20) PWM_POLARITY_NORMAL>; - label = "LED System State"; - }; - }; - - pwmleds1 { - compatible = "pwm-leds"; - status = "okay"; - - pwm_led1: led_pwm_1 { - status = "okay"; - pwms = <&pwm21 0 PWM_MSEC(20) PWM_POLARITY_NORMAL>; - label = "LED Conn State"; - }; - }; - - pwmleds2 { - compatible = "pwm-leds"; - status = "okay"; - - pwm_led2: led_pwm_2 { - status = "okay"; - pwms = <&pwm22 0 PWM_MSEC(20) PWM_POLARITY_NORMAL>; - label = "LED Num Lock"; - }; - }; -}; - -&pwm20 { - status = "okay"; - pinctrl-0 = <&pwm20_default_alt>; - pinctrl-1 = <&pwm20_sleep_alt>; - pinctrl-names = "default", "sleep"; -}; - -&pwm21 { - status = "okay"; - pinctrl-0 = <&pwm21_default_alt>; - pinctrl-1 = <&pwm21_sleep_alt>; - pinctrl-names = "default", "sleep"; -}; - -&pwm22 { - status = "okay"; - pinctrl-0 = <&pwm22_default_alt>; - pinctrl-1 = <&pwm22_sleep_alt>; - pinctrl-names = "default", "sleep"; -}; - -&pinctrl { - pwm20_default_alt: pwm20_default_alt { - group1 { - psels = ; - }; - }; - - pwm20_sleep_alt: pwm20_sleep_alt { - group1 { - psels = ; - low-power-enable; - }; - }; - - pwm21_default_alt: pwm21_default_alt { - group1 { - psels = ; - }; - }; - - pwm21_sleep_alt: pwm21_sleep_alt { - group1 { - psels = ; - low-power-enable; - }; - }; - - pwm22_default_alt: pwm22_default_alt { - group1 { - psels = ; - }; - }; - - pwm22_sleep_alt: pwm22_sleep_alt { - group1 { - psels = ; - low-power-enable; - }; - }; -}; +#include "app_common.dtsi" diff --git a/applications/nrf_desktop/configuration/nrf54l15dk_nrf54l15_cpuapp/app_common.dtsi b/applications/nrf_desktop/configuration/nrf54l15dk_nrf54l15_cpuapp/app_common.dtsi new file mode 100644 index 000000000000..db42a3e6b3fb --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf54l15dk_nrf54l15_cpuapp/app_common.dtsi @@ -0,0 +1,112 @@ +/* + * Copyright (c) 2024 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +/* Application does not use cpuflpr core. Assign whole RRAM to cpuapp. */ +&cpuapp_rram { + reg = < 0x0 DT_SIZE_K(1524) >; +}; + +/ { + /* Disable pwmleds and redefine them to align configuration with CAF LEDs requirements. + * The configuration needs to match the used board revision. + */ + /delete-node/ pwmleds; + + pwmleds0 { + compatible = "pwm-leds"; + status = "okay"; + + pwm_led0: led_pwm_0 { + status = "okay"; + pwms = <&pwm20 0 PWM_MSEC(20) PWM_POLARITY_NORMAL>; + label = "LED System State"; + }; + }; + + pwmleds1 { + compatible = "pwm-leds"; + status = "okay"; + + pwm_led1: led_pwm_1 { + status = "okay"; + pwms = <&pwm21 0 PWM_MSEC(20) PWM_POLARITY_NORMAL>; + label = "LED Conn State"; + }; + }; + + pwmleds2 { + compatible = "pwm-leds"; + status = "okay"; + + pwm_led2: led_pwm_2 { + status = "okay"; + pwms = <&pwm22 0 PWM_MSEC(20) PWM_POLARITY_NORMAL>; + label = "LED Num Lock"; + }; + }; +}; + +&pwm20 { + status = "okay"; + pinctrl-0 = <&pwm20_default_alt>; + pinctrl-1 = <&pwm20_sleep_alt>; + pinctrl-names = "default", "sleep"; +}; + +&pwm21 { + status = "okay"; + pinctrl-0 = <&pwm21_default_alt>; + pinctrl-1 = <&pwm21_sleep_alt>; + pinctrl-names = "default", "sleep"; +}; + +&pwm22 { + status = "okay"; + pinctrl-0 = <&pwm22_default_alt>; + pinctrl-1 = <&pwm22_sleep_alt>; + pinctrl-names = "default", "sleep"; +}; + +&pinctrl { + pwm20_default_alt: pwm20_default_alt { + group1 { + psels = ; + }; + }; + + pwm20_sleep_alt: pwm20_sleep_alt { + group1 { + psels = ; + low-power-enable; + }; + }; + + pwm21_default_alt: pwm21_default_alt { + group1 { + psels = ; + }; + }; + + pwm21_sleep_alt: pwm21_sleep_alt { + group1 { + psels = ; + low-power-enable; + }; + }; + + pwm22_default_alt: pwm22_default_alt { + group1 { + psels = ; + }; + }; + + pwm22_sleep_alt: pwm22_sleep_alt { + group1 { + psels = ; + low-power-enable; + }; + }; +}; diff --git a/applications/nrf_desktop/configuration/nrf54l15dk_nrf54l15_cpuapp/app_release.overlay b/applications/nrf_desktop/configuration/nrf54l15dk_nrf54l15_cpuapp/app_release.overlay new file mode 100644 index 000000000000..cba8d3d84b6b --- /dev/null +++ b/applications/nrf_desktop/configuration/nrf54l15dk_nrf54l15_cpuapp/app_release.overlay @@ -0,0 +1,12 @@ +/* + * Copyright (c) 2024 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +#include "app_common.dtsi" + +/* For nRF54L, watchdog status is disabled by default. Needs to be enabled in DTS overlay. */ +&wdt31 { + status = "okay"; +}; diff --git a/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst b/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst index 008e71e2b746..45cc6b77389a 100644 --- a/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst +++ b/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst @@ -209,6 +209,13 @@ nRF Desktop As a result, all :ref:`zephyr:nrf54h20dk_nrf54h20` configurations were migrated from the NVS settings backend to the ZMS settings backend. * The :ref:`zephyr:nrf54h20dk_nrf54h20` release configuration to enable the :ref:`nrf_desktop_watchdog`. * The configuration files of the :ref:`nrf_desktop_click_detector` (:file:`click_detector_def.h`) to allow using them also when Bluetooth LE peer control using a dedicated button (:ref:`CONFIG_DESKTOP_BLE_PEER_CONTROL `) is disabled. + * The DTS description for board targets with a different DTS overlay file for each build type to isolate the common configuration that is now defined in the :file:`app_common.dtsi` file. + The following board configurations have been updated: + + * :ref:`zephyr:nrf52840dk_nrf52840` + * :ref:`zephyr:nrf52840dongle_nrf52840` + * :ref:`zephyr:nrf54l15dk_nrf54l15` + * :ref:`zephyr:nrf54h20dk_nrf54h20` nRF Machine Learning (Edge Impulse) -----------------------------------