From f64d92ff5cb485bf3d45a932812e9d6bb2e29d7f Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Thu, 24 Apr 2025 10:19:48 +0100 Subject: [PATCH] boards: nordic: Fix devicetree styling issues Fixes issues to make files compliant with the Zephyr devicetree guidelines Signed-off-by: Jamie McCrae --- .../nrf21540dk_nrf52840-pinctrl.dtsi | 3 ++- .../nordic/nrf21540dk/nrf21540dk_nrf52840.dts | 14 ++++++++-- .../nrf51dk/nrf51dk_nrf51822-pinctrl.dtsi | 1 - boards/nordic/nrf51dk/nrf51dk_nrf51822.dts | 13 +++++++++- .../nrf51dongle_nrf51822-pinctrl.dtsi | 1 - .../nrf51dongle/nrf51dongle_nrf51822.dts | 8 +++++- .../nrf52833dk_nrf52820-pinctrl.dtsi | 2 +- .../nordic/nrf52833dk/nrf52833dk_nrf52820.dts | 13 +++++++++- .../nrf52833dk_nrf52833-pinctrl.dtsi | 3 ++- .../nordic/nrf52833dk/nrf52833dk_nrf52833.dts | 13 +++++++++- .../nrf52840dk_nrf52811-pinctrl.dtsi | 2 +- .../nordic/nrf52840dk/nrf52840dk_nrf52811.dts | 13 +++++++++- .../nrf52840dk_nrf52840-pinctrl.dtsi | 4 ++- .../nordic/nrf52840dk/nrf52840dk_nrf52840.dts | 10 +++++++ .../nordic/nrf52840dongle/fstab-debugger.dtsi | 2 ++ boards/nordic/nrf52840dongle/fstab-stock.dtsi | 2 ++ .../nrf52840dongle_nrf52840-pinctrl.dtsi | 2 +- .../nrf52840dongle_nrf52840.dts | 12 +++++++-- .../nrf52dk/nrf52dk_nrf52805-pinctrl.dtsi | 1 - boards/nordic/nrf52dk/nrf52dk_nrf52805.dts | 11 ++++++++ .../nrf52dk/nrf52dk_nrf52810-pinctrl.dtsi | 1 - boards/nordic/nrf52dk/nrf52dk_nrf52810.dts | 12 ++++++++- .../nrf52dk/nrf52dk_nrf52832-pinctrl.dtsi | 1 - boards/nordic/nrf52dk/nrf52dk_nrf52832.dts | 13 +++++++++- ...udio_dk_nrf5340_cpuapp_common-pinctrl.dtsi | 4 +++ ...rf5340_audio_dk_nrf5340_cpuapp_common.dtsi | 9 +++++-- ...f5340_audio_dk_nrf5340_cpunet-pinctrl.dtsi | 2 +- .../nrf5340_audio_dk_nrf5340_cpunet.dts | 4 ++- .../nrf5340_audio_dk_nrf5340_shared.dtsi | 16 +++++++++++- .../nrf5340_cpuapp_common-pinctrl.dtsi | 4 ++- .../nrf5340dk/nrf5340_cpuapp_common.dtsi | 3 +++ boards/nordic/nrf5340dk/nrf5340dk_common.dtsi | 8 ++++++ .../nrf5340dk_nrf5340_cpunet-pinctrl.dtsi | 2 +- .../nrf5340dk/nrf5340dk_nrf5340_cpunet.dts | 4 ++- .../nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts | 1 + .../nrf54l09pdk/nrf54l09_cpuapp_common.dtsi | 6 +++++ .../nrf54l09pdk_nrf54l09-common.dtsi | 6 +++++ .../nrf54l09pdk_nrf54l09-pinctrl.dtsi | 1 + .../nordic/nrf54l15dk/nrf54l15dk_common.dtsi | 9 +++++++ .../nrf54l15dk/nrf54l15dk_nrf54l05_cpuapp.dts | 6 +++++ .../nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp.dts | 7 +++++ .../nrf54l15dk_nrf54l_05_10_15-pinctrl.dtsi | 2 ++ .../nrf54l20pdk/nrf54l20_cpuapp_common.dtsi | 6 +++++ .../nrf54l20pdk_nrf54l20-common.dtsi | 9 +++++++ .../nrf54l20pdk_nrf54l20-pinctrl.dtsi | 1 + .../nrf7002dk/nrf5340_cpuapp_common.dtsi | 7 +++++ .../nrf5340_cpuapp_common_pinctrl.dtsi | 2 ++ .../nrf7002dk/nrf7002dk_nrf5340_cpunet.dts | 26 ++++++++++++------- .../nrf7002dk_nrf5340_cpunet_pinctrl.dtsi | 1 + .../nrf9131ek_nrf9131_common-pinctrl.dtsi | 2 ++ .../nrf9131ek/nrf9131ek_nrf9131_common.dtsi | 10 +++++++ .../nrf9151dk_nrf9151_common-pinctrl.dtsi | 2 ++ .../nrf9151dk/nrf9151dk_nrf9151_common.dtsi | 9 +++++++ .../nrf9160dk/nrf9160dk_nrf52840-pinctrl.dtsi | 2 +- .../nrf9160dk_nrf9160_common-pinctrl.dtsi | 2 ++ .../nrf9160dk/nrf9160dk_nrf9160_common.dtsi | 9 +++++++ .../nrf9160dk_nrf9160_common_0_14_0.dtsi | 1 + .../nrf9161dk_nrf9161_common-pinctrl.dtsi | 2 ++ .../nrf9161dk/nrf9161dk_nrf9161_common.dtsi | 9 +++++++ .../nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts | 1 + .../nrf9280pdk/nrf9280pdk_nrf9280_cpurad.dts | 1 + .../thingy52/thingy52_nrf52832-pinctrl.dtsi | 1 - boards/nordic/thingy52/thingy52_nrf52832.dts | 14 ++++++---- .../thingy53_nrf5340_common-pinctrl.dtsi | 1 - .../thingy53/thingy53_nrf5340_common.dtsi | 13 ++++++++-- .../thingy53/thingy53_nrf5340_cpunet.dts | 14 +++++++--- 66 files changed, 343 insertions(+), 53 deletions(-) diff --git a/boards/nordic/nrf21540dk/nrf21540dk_nrf52840-pinctrl.dtsi b/boards/nordic/nrf21540dk/nrf21540dk_nrf52840-pinctrl.dtsi index 73083fd5d95..d1da980ec5c 100644 --- a/boards/nordic/nrf21540dk/nrf21540dk_nrf52840-pinctrl.dtsi +++ b/boards/nordic/nrf21540dk/nrf21540dk_nrf52840-pinctrl.dtsi @@ -9,6 +9,7 @@ psels = , ; }; + group2 { psels = , ; @@ -31,6 +32,7 @@ psels = ; bias-pull-up; }; + group2 { psels = ; }; @@ -155,5 +157,4 @@ low-power-enable; }; }; - }; diff --git a/boards/nordic/nrf21540dk/nrf21540dk_nrf52840.dts b/boards/nordic/nrf21540dk/nrf21540dk_nrf52840.dts index f4dc3058b2b..0874ef8fdf2 100644 --- a/boards/nordic/nrf21540dk/nrf21540dk_nrf52840.dts +++ b/boards/nordic/nrf21540dk/nrf21540dk_nrf52840.dts @@ -28,18 +28,22 @@ leds { compatible = "gpio-leds"; + led0: led_0 { gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; label = "Green LED 0"; }; + led1: led_1 { gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; label = "Green LED 1"; }; + led2: led_2 { gpios = <&gpio0 15 GPIO_ACTIVE_LOW>; label = "Green LED 2"; }; + led3: led_3 { gpios = <&gpio0 16 GPIO_ACTIVE_LOW>; label = "Green LED 3"; @@ -48,6 +52,7 @@ pwmleds { compatible = "pwm-leds"; + pwm_led0: pwm_led_0 { pwms = <&pwm0 0 PWM_MSEC(20) PWM_POLARITY_INVERTED>; }; @@ -55,21 +60,25 @@ buttons { compatible = "gpio-keys"; + button0: button_0 { gpios = <&gpio0 11 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; label = "Push button switch 0"; zephyr,code = ; }; + button1: button_1 { gpios = <&gpio0 12 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; label = "Push button switch 1"; zephyr,code = ; }; + button2: button_2 { gpios = <&gpio0 24 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; label = "Push button switch 2"; zephyr,code = ; }; + button3: button_3 { gpios = <&gpio0 25 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; label = "Push button switch 3"; @@ -242,10 +251,10 @@ arduino_i2c: &i2c0 { fem_spi: &spi3 { status = "okay"; cs-gpios = <&gpio0 21 GPIO_ACTIVE_LOW>; - pinctrl-0 = <&spi3_default>; pinctrl-1 = <&spi3_sleep>; pinctrl-names = "default", "sleep"; + nrf_radio_fem_spi: nrf21540_fem_spi@0 { compatible = "nordic,nrf21540-fem-spi"; status = "okay"; @@ -263,7 +272,6 @@ fem_spi: &spi3 { }; &flash0 { - partitions { compatible = "fixed-partitions"; #address-cells = <1>; @@ -273,10 +281,12 @@ fem_spi: &spi3 { label = "mcuboot"; reg = <0x00000000 0x0000C000>; }; + slot0_partition: partition@c000 { label = "image-0"; reg = <0x0000C000 0x00076000>; }; + slot1_partition: partition@82000 { label = "image-1"; reg = <0x00082000 0x00076000>; diff --git a/boards/nordic/nrf51dk/nrf51dk_nrf51822-pinctrl.dtsi b/boards/nordic/nrf51dk/nrf51dk_nrf51822-pinctrl.dtsi index 4b82a01feab..c806e25f8ce 100644 --- a/boards/nordic/nrf51dk/nrf51dk_nrf51822-pinctrl.dtsi +++ b/boards/nordic/nrf51dk/nrf51dk_nrf51822-pinctrl.dtsi @@ -86,5 +86,4 @@ low-power-enable; }; }; - }; diff --git a/boards/nordic/nrf51dk/nrf51dk_nrf51822.dts b/boards/nordic/nrf51dk/nrf51dk_nrf51822.dts index 15e74d15f40..fed633e30ee 100644 --- a/boards/nordic/nrf51dk/nrf51dk_nrf51822.dts +++ b/boards/nordic/nrf51dk/nrf51dk_nrf51822.dts @@ -26,18 +26,22 @@ leds { compatible = "gpio-leds"; + led0: led_0 { gpios = <&gpio0 21 GPIO_ACTIVE_LOW>; label = "Green LED 0"; }; + led1: led_1 { gpios = <&gpio0 22 GPIO_ACTIVE_LOW>; label = "Green LED 1"; }; + led2: led_2 { gpios = <&gpio0 23 GPIO_ACTIVE_LOW>; label = "Green LED 2"; }; + led3: led_3 { gpios = <&gpio0 24 GPIO_ACTIVE_LOW>; label = "Green LED 3"; @@ -46,6 +50,7 @@ pwmleds { compatible = "pwm-leds"; + pwm_led0: pwm_led_0 { pwms = <&sw_pwm 0 PWM_MSEC(20) PWM_POLARITY_INVERTED>; }; @@ -53,21 +58,25 @@ buttons { compatible = "gpio-keys"; + button0: button_0 { gpios = <&gpio0 17 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; label = "Push button switch 0"; zephyr,code = ; }; + button1: button_1 { gpios = <&gpio0 18 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; label = "Push button switch 1"; zephyr,code = ; }; + button2: button_2 { gpios = <&gpio0 19 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; label = "Push button switch 2"; zephyr,code = ; }; + button3: button_3 { gpios = <&gpio0 20 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; label = "Push button switch 3"; @@ -151,7 +160,6 @@ }; &flash0 { - partitions { compatible = "fixed-partitions"; #address-cells = <1>; @@ -161,14 +169,17 @@ label = "mcuboot"; reg = <0x00000000 0x8000>; }; + slot0_partition: partition@8000 { label = "image-0"; reg = <0x00008000 0x1b000>; }; + slot1_partition: partition@23000 { label = "image-1"; reg = <0x00023000 0x1b000>; }; + storage_partition: partition@3e000 { label = "storage"; reg = <0x0003e000 0x00002000>; diff --git a/boards/nordic/nrf51dongle/nrf51dongle_nrf51822-pinctrl.dtsi b/boards/nordic/nrf51dongle/nrf51dongle_nrf51822-pinctrl.dtsi index 410d78c37dc..8142a7e74b3 100644 --- a/boards/nordic/nrf51dongle/nrf51dongle_nrf51822-pinctrl.dtsi +++ b/boards/nordic/nrf51dongle/nrf51dongle_nrf51822-pinctrl.dtsi @@ -22,5 +22,4 @@ low-power-enable; }; }; - }; diff --git a/boards/nordic/nrf51dongle/nrf51dongle_nrf51822.dts b/boards/nordic/nrf51dongle/nrf51dongle_nrf51822.dts index 746b2ca767c..48f1d498723 100644 --- a/boards/nordic/nrf51dongle/nrf51dongle_nrf51822.dts +++ b/boards/nordic/nrf51dongle/nrf51dongle_nrf51822.dts @@ -25,14 +25,17 @@ leds { compatible = "gpio-leds"; + led0_red: led_0 { gpios = <&gpio0 21 GPIO_ACTIVE_LOW>; label = "Red LED 0"; }; + led0_green: led_1 { gpios = <&gpio0 22 GPIO_ACTIVE_LOW>; label = "Green LED 0"; }; + led0_blue: led_2 { gpios = <&gpio0 23 GPIO_ACTIVE_LOW>; label = "Blue LED 0"; @@ -41,6 +44,7 @@ pwmleds { compatible = "pwm-leds"; + pwm_led0: pwm_led_0 { pwms = <&sw_pwm 0 PWM_MSEC(20) PWM_POLARITY_INVERTED>; }; @@ -83,7 +87,6 @@ }; &flash0 { - partitions { compatible = "fixed-partitions"; #address-cells = <1>; @@ -93,14 +96,17 @@ label = "mcuboot"; reg = <0x00000000 0x8000>; }; + slot0_partition: partition@8000 { label = "image-0"; reg = <0x00008000 0x1b000>; }; + slot1_partition: partition@23000 { label = "image-1"; reg = <0x00023000 0x1b000>; }; + storage_partition: partition@3e000 { label = "storage"; reg = <0x0003e000 0x00002000>; diff --git a/boards/nordic/nrf52833dk/nrf52833dk_nrf52820-pinctrl.dtsi b/boards/nordic/nrf52833dk/nrf52833dk_nrf52820-pinctrl.dtsi index 89e33721507..0a2dd6da3ef 100644 --- a/boards/nordic/nrf52833dk/nrf52833dk_nrf52820-pinctrl.dtsi +++ b/boards/nordic/nrf52833dk/nrf52833dk_nrf52820-pinctrl.dtsi @@ -9,6 +9,7 @@ psels = , ; }; + group2 { psels = , ; @@ -57,5 +58,4 @@ low-power-enable; }; }; - }; diff --git a/boards/nordic/nrf52833dk/nrf52833dk_nrf52820.dts b/boards/nordic/nrf52833dk/nrf52833dk_nrf52820.dts index 0f9526fb21f..ddd49d23246 100644 --- a/boards/nordic/nrf52833dk/nrf52833dk_nrf52820.dts +++ b/boards/nordic/nrf52833dk/nrf52833dk_nrf52820.dts @@ -26,18 +26,22 @@ leds { compatible = "gpio-leds"; + led0: led_0 { gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; label = "Green LED 0"; }; + led1: led_1 { gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; label = "Green LED 1"; }; + led2: led_2 { gpios = <&gpio0 15 GPIO_ACTIVE_LOW>; label = "Green LED 2"; }; + led3: led_3 { gpios = <&gpio0 16 GPIO_ACTIVE_LOW>; label = "Green LED 3"; @@ -46,6 +50,7 @@ pwmleds { compatible = "pwm-leds"; + pwm_led0: pwm_led_0 { pwms = <&sw_pwm 0 PWM_MSEC(20) PWM_POLARITY_INVERTED>; }; @@ -53,21 +58,25 @@ buttons { compatible = "gpio-keys"; + button0: button_0 { gpios = <&gpio0 11 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; label = "Push button switch 0"; zephyr,code = ; }; + button1: button_1 { gpios = <&gpio0 12 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; label = "Push button switch 1"; zephyr,code = ; }; + button2: button_2 { gpios = <&gpio0 24 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; label = "Push button switch 2"; zephyr,code = ; }; + button3: button_3 { gpios = <&gpio0 25 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; label = "Push button switch 3"; @@ -152,7 +161,6 @@ }; &flash0 { - partitions { compatible = "fixed-partitions"; #address-cells = <1>; @@ -162,14 +170,17 @@ label = "mcuboot"; reg = <0x00000000 0xC000>; }; + slot0_partition: partition@C000 { label = "image-0"; reg = <0x0000C000 0x17000>; }; + slot1_partition: partition@23000 { label = "image-1"; reg = <0x00023000 0x17000>; }; + storage_partition: partition@3a000 { label = "storage"; reg = <0x0003a000 0x00006000>; diff --git a/boards/nordic/nrf52833dk/nrf52833dk_nrf52833-pinctrl.dtsi b/boards/nordic/nrf52833dk/nrf52833dk_nrf52833-pinctrl.dtsi index 420027e7073..9f6c5a920eb 100644 --- a/boards/nordic/nrf52833dk/nrf52833dk_nrf52833-pinctrl.dtsi +++ b/boards/nordic/nrf52833dk/nrf52833dk_nrf52833-pinctrl.dtsi @@ -9,6 +9,7 @@ psels = , ; }; + group2 { psels = , ; @@ -31,6 +32,7 @@ psels = ; bias-pull-up; }; + group2 { psels = ; }; @@ -138,5 +140,4 @@ low-power-enable; }; }; - }; diff --git a/boards/nordic/nrf52833dk/nrf52833dk_nrf52833.dts b/boards/nordic/nrf52833dk/nrf52833dk_nrf52833.dts index 386fac62e1d..f32ad7a220a 100644 --- a/boards/nordic/nrf52833dk/nrf52833dk_nrf52833.dts +++ b/boards/nordic/nrf52833dk/nrf52833dk_nrf52833.dts @@ -27,18 +27,22 @@ leds { compatible = "gpio-leds"; + led0: led_0 { gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; label = "Green LED 0"; }; + led1: led_1 { gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; label = "Green LED 1"; }; + led2: led_2 { gpios = <&gpio0 15 GPIO_ACTIVE_LOW>; label = "Green LED 2"; }; + led3: led_3 { gpios = <&gpio0 16 GPIO_ACTIVE_LOW>; label = "Green LED 3"; @@ -47,6 +51,7 @@ pwmleds { compatible = "pwm-leds"; + pwm_led0: pwm_led_0 { pwms = <&pwm0 0 PWM_MSEC(20) PWM_POLARITY_INVERTED>; }; @@ -54,21 +59,25 @@ buttons { compatible = "gpio-keys"; + button0: button_0 { gpios = <&gpio0 11 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; label = "Push button switch 0"; zephyr,code = ; }; + button1: button_1 { gpios = <&gpio0 12 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; label = "Push button switch 1"; zephyr,code = ; }; + button2: button_2 { gpios = <&gpio0 24 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; label = "Push button switch 2"; zephyr,code = ; }; + button3: button_3 { gpios = <&gpio0 25 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; label = "Push button switch 3"; @@ -221,7 +230,6 @@ arduino_spi: &spi3 { }; &flash0 { - partitions { compatible = "fixed-partitions"; #address-cells = <1>; @@ -231,14 +239,17 @@ arduino_spi: &spi3 { label = "mcuboot"; reg = <0x00000000 0xC000>; }; + slot0_partition: partition@c000 { label = "image-0"; reg = <0x0000C000 0x37000>; }; + slot1_partition: partition@43000 { label = "image-1"; reg = <0x00043000 0x37000>; }; + storage_partition: partition@7a000 { label = "storage"; reg = <0x0007A000 0x00006000>; diff --git a/boards/nordic/nrf52840dk/nrf52840dk_nrf52811-pinctrl.dtsi b/boards/nordic/nrf52840dk/nrf52840dk_nrf52811-pinctrl.dtsi index 2b0ab3e75d3..c3706043f4f 100644 --- a/boards/nordic/nrf52840dk/nrf52840dk_nrf52811-pinctrl.dtsi +++ b/boards/nordic/nrf52840dk/nrf52840dk_nrf52811-pinctrl.dtsi @@ -9,6 +9,7 @@ psels = , ; }; + group2 { psels = , ; @@ -88,5 +89,4 @@ low-power-enable; }; }; - }; diff --git a/boards/nordic/nrf52840dk/nrf52840dk_nrf52811.dts b/boards/nordic/nrf52840dk/nrf52840dk_nrf52811.dts index b6631dea9cf..3a2b5ed87bc 100644 --- a/boards/nordic/nrf52840dk/nrf52840dk_nrf52811.dts +++ b/boards/nordic/nrf52840dk/nrf52840dk_nrf52811.dts @@ -26,18 +26,22 @@ leds { compatible = "gpio-leds"; + led0: led_0 { gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; label = "Green LED 0"; }; + led1: led_1 { gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; label = "Green LED 1"; }; + led2: led_2 { gpios = <&gpio0 15 GPIO_ACTIVE_LOW>; label = "Green LED 2"; }; + led3: led_3 { gpios = <&gpio0 16 GPIO_ACTIVE_LOW>; label = "Green LED 3"; @@ -46,6 +50,7 @@ pwmleds { compatible = "pwm-leds"; + pwm_led0: pwm_led_0 { pwms = <&pwm0 0 PWM_MSEC(20) PWM_POLARITY_INVERTED>; }; @@ -53,21 +58,25 @@ buttons { compatible = "gpio-keys"; + button0: button_0 { gpios = <&gpio0 11 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; label = "Push button switch 0"; zephyr,code = ; }; + button1: button_1 { gpios = <&gpio0 12 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; label = "Push button switch 1"; zephyr,code = ; }; + button2: button_2 { gpios = <&gpio0 24 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; label = "Push button switch 2"; zephyr,code = ; }; + button3: button_3 { gpios = <&gpio0 25 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; label = "Push button switch 3"; @@ -155,7 +164,6 @@ }; &flash0 { - partitions { compatible = "fixed-partitions"; #address-cells = <1>; @@ -165,14 +173,17 @@ label = "mcuboot"; reg = <0x00000000 0xc000>; }; + slot0_partition: partition@c000 { label = "image-0"; reg = <0x0000C000 0xe000>; }; + slot1_partition: partition@1a000 { label = "image-1"; reg = <0x0001a000 0xe000>; }; + storage_partition: partition@28000 { label = "storage"; reg = <0x00028000 0x00008000>; diff --git a/boards/nordic/nrf52840dk/nrf52840dk_nrf52840-pinctrl.dtsi b/boards/nordic/nrf52840dk/nrf52840dk_nrf52840-pinctrl.dtsi index 779d0d518a8..5b868c84f18 100644 --- a/boards/nordic/nrf52840dk/nrf52840dk_nrf52840-pinctrl.dtsi +++ b/boards/nordic/nrf52840dk/nrf52840dk_nrf52840-pinctrl.dtsi @@ -9,6 +9,7 @@ psels = , ; }; + group2 { psels = , ; @@ -31,6 +32,7 @@ psels = ; bias-pull-up; }; + group2 { psels = ; }; @@ -160,6 +162,7 @@ ; low-power-enable; }; + group2 { psels = ; low-power-enable; @@ -183,5 +186,4 @@ low-power-enable; }; }; - }; diff --git a/boards/nordic/nrf52840dk/nrf52840dk_nrf52840.dts b/boards/nordic/nrf52840dk/nrf52840dk_nrf52840.dts index f19cd48bb40..cda7bb6164d 100644 --- a/boards/nordic/nrf52840dk/nrf52840dk_nrf52840.dts +++ b/boards/nordic/nrf52840dk/nrf52840dk_nrf52840.dts @@ -26,18 +26,22 @@ leds { compatible = "gpio-leds"; + led0: led_0 { gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; label = "Green LED 0"; }; + led1: led_1 { gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; label = "Green LED 1"; }; + led2: led_2 { gpios = <&gpio0 15 GPIO_ACTIVE_LOW>; label = "Green LED 2"; }; + led3: led_3 { gpios = <&gpio0 16 GPIO_ACTIVE_LOW>; label = "Green LED 3"; @@ -46,6 +50,7 @@ pwmleds { compatible = "pwm-leds"; + pwm_led0: pwm_led_0 { pwms = <&pwm0 0 PWM_MSEC(20) PWM_POLARITY_INVERTED>; }; @@ -53,21 +58,25 @@ buttons { compatible = "gpio-keys"; + button0: button_0 { gpios = <&gpio0 11 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; label = "Push button switch 0"; zephyr,code = ; }; + button1: button_1 { gpios = <&gpio0 12 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; label = "Push button switch 1"; zephyr,code = ; }; + button2: button_2 { gpios = <&gpio0 24 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; label = "Push button switch 2"; zephyr,code = ; }; + button3: button_3 { gpios = <&gpio0 25 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; label = "Push button switch 3"; @@ -243,6 +252,7 @@ arduino_i2c: &i2c0 { pinctrl-0 = <&qspi_default>; pinctrl-1 = <&qspi_sleep>; pinctrl-names = "default", "sleep"; + mx25r64: mx25r6435f@0 { compatible = "nordic,qspi-nor"; reg = <0>; diff --git a/boards/nordic/nrf52840dongle/fstab-debugger.dtsi b/boards/nordic/nrf52840dongle/fstab-debugger.dtsi index 9fbbe7cd91b..dd3d12403c6 100644 --- a/boards/nordic/nrf52840dongle/fstab-debugger.dtsi +++ b/boards/nordic/nrf52840dongle/fstab-debugger.dtsi @@ -24,10 +24,12 @@ label = "image-0"; reg = <0x00012000 0x00075000>; }; + slot1_partition: partition@87000 { label = "image-1"; reg = <0x00087000 0x00075000>; }; + storage_partition: partition@fc000 { label = "storage"; reg = <0x000fc000 0x00004000>; diff --git a/boards/nordic/nrf52840dongle/fstab-stock.dtsi b/boards/nordic/nrf52840dongle/fstab-stock.dtsi index 26863679f60..b487f02c153 100644 --- a/boards/nordic/nrf52840dongle/fstab-stock.dtsi +++ b/boards/nordic/nrf52840dongle/fstab-stock.dtsi @@ -26,10 +26,12 @@ label = "image-0"; reg = <0x00010000 0x00066000>; }; + slot1_partition: partition@76000 { label = "image-1"; reg = <0x00076000 0x00066000>; }; + storage_partition: partition@dc000 { label = "storage"; reg = <0x000dc000 0x00004000>; diff --git a/boards/nordic/nrf52840dongle/nrf52840dongle_nrf52840-pinctrl.dtsi b/boards/nordic/nrf52840dongle/nrf52840dongle_nrf52840-pinctrl.dtsi index ad2ce3463b4..cf2b8523b8e 100644 --- a/boards/nordic/nrf52840dongle/nrf52840dongle_nrf52840-pinctrl.dtsi +++ b/boards/nordic/nrf52840dongle/nrf52840dongle_nrf52840-pinctrl.dtsi @@ -9,6 +9,7 @@ psels = , ; }; + group2 { psels = , ; @@ -107,5 +108,4 @@ low-power-enable; }; }; - }; diff --git a/boards/nordic/nrf52840dongle/nrf52840dongle_nrf52840.dts b/boards/nordic/nrf52840dongle/nrf52840dongle_nrf52840.dts index 1f1de703ade..890570b7eee 100644 --- a/boards/nordic/nrf52840dongle/nrf52840dongle_nrf52840.dts +++ b/boards/nordic/nrf52840dongle/nrf52840dongle_nrf52840.dts @@ -23,18 +23,22 @@ leds { compatible = "gpio-leds"; + led0_green: led_0 { gpios = <&gpio0 6 GPIO_ACTIVE_LOW>; label = "Green LED 0"; }; + led1_red: led_1 { gpios = <&gpio0 8 GPIO_ACTIVE_LOW>; label = "Red LED 1"; }; + led1_green: led_2 { gpios = <&gpio1 9 GPIO_ACTIVE_LOW>; label = "Green LED 1"; }; + led1_blue: led_3 { gpios = <&gpio0 12 GPIO_ACTIVE_LOW>; label = "Blue LED 1"; @@ -43,12 +47,15 @@ pwmleds { compatible = "pwm-leds"; + red_pwm_led: pwm_led_0 { pwms = <&pwm0 0 PWM_MSEC(20) PWM_POLARITY_INVERTED>; }; + green_pwm_led: pwm_led_1 { pwms = <&pwm0 1 PWM_MSEC(20) PWM_POLARITY_INVERTED>; }; + blue_pwm_led: pwm_led_2 { pwms = <&pwm0 2 PWM_MSEC(20) PWM_POLARITY_INVERTED>; }; @@ -56,6 +63,7 @@ buttons { compatible = "gpio-keys"; + button0: button_0 { gpios = <&gpio1 6 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; label = "Push button switch 0"; @@ -71,9 +79,9 @@ led2 = &led1_green; led3 = &led1_blue; led0-green = &led0_green; - led1-red = &led1_red; + led1-red = &led1_red; led1-green = &led1_green; - led1-blue = &led1_blue; + led1-blue = &led1_blue; pwm-led0 = &red_pwm_led; pwm-led1 = &green_pwm_led; pwm-led2 = &blue_pwm_led; diff --git a/boards/nordic/nrf52dk/nrf52dk_nrf52805-pinctrl.dtsi b/boards/nordic/nrf52dk/nrf52dk_nrf52805-pinctrl.dtsi index 4ec1fa80a8c..00d60d2cbec 100644 --- a/boards/nordic/nrf52dk/nrf52dk_nrf52805-pinctrl.dtsi +++ b/boards/nordic/nrf52dk/nrf52dk_nrf52805-pinctrl.dtsi @@ -54,5 +54,4 @@ low-power-enable; }; }; - }; diff --git a/boards/nordic/nrf52dk/nrf52dk_nrf52805.dts b/boards/nordic/nrf52dk/nrf52dk_nrf52805.dts index fd84761fe1b..037c0c46e1c 100644 --- a/boards/nordic/nrf52dk/nrf52dk_nrf52805.dts +++ b/boards/nordic/nrf52dk/nrf52dk_nrf52805.dts @@ -26,18 +26,22 @@ leds { compatible = "gpio-leds"; + led0: led_0 { gpios = <&gpio0 17 GPIO_ACTIVE_LOW>; label = "Green LED 0"; }; + led1: led_1 { gpios = <&gpio0 18 GPIO_ACTIVE_LOW>; label = "Green LED 1"; }; + led2: led_2 { gpios = <&gpio0 19 GPIO_ACTIVE_LOW>; label = "Green LED 2"; }; + led3: led_3 { gpios = <&gpio0 20 GPIO_ACTIVE_LOW>; label = "Green LED 3"; @@ -46,21 +50,25 @@ buttons { compatible = "gpio-keys"; + button0: button_0 { label = "Push button switch 0"; gpios = <&gpio0 13 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; zephyr,code = ; }; + button1: button_1 { label = "Push button switch 1"; gpios = <&gpio0 14 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; zephyr,code = ; }; + button2: button_2 { label = "Push button switch 2"; gpios = <&gpio0 15 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; zephyr,code = ; }; + button3: button_3 { label = "Push button switch 3"; gpios = <&gpio0 16 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; @@ -140,14 +148,17 @@ label = "mcuboot"; reg = <0x00000000 0xc000>; }; + slot0_partition: partition@c000 { label = "image-0"; reg = <0x0000C000 0xe000>; }; + slot1_partition: partition@1a000 { label = "image-1"; reg = <0x0001a000 0xe000>; }; + storage_partition: partition@28000 { label = "storage"; reg = <0x00028000 0x00008000>; diff --git a/boards/nordic/nrf52dk/nrf52dk_nrf52810-pinctrl.dtsi b/boards/nordic/nrf52dk/nrf52dk_nrf52810-pinctrl.dtsi index 78f1f279ede..bec21acc20f 100644 --- a/boards/nordic/nrf52dk/nrf52dk_nrf52810-pinctrl.dtsi +++ b/boards/nordic/nrf52dk/nrf52dk_nrf52810-pinctrl.dtsi @@ -54,5 +54,4 @@ low-power-enable; }; }; - }; diff --git a/boards/nordic/nrf52dk/nrf52dk_nrf52810.dts b/boards/nordic/nrf52dk/nrf52dk_nrf52810.dts index 2bfcad26247..1e9901d60bb 100644 --- a/boards/nordic/nrf52dk/nrf52dk_nrf52810.dts +++ b/boards/nordic/nrf52dk/nrf52dk_nrf52810.dts @@ -28,18 +28,22 @@ leds { compatible = "gpio-leds"; + led0: led_0 { gpios = <&gpio0 17 GPIO_ACTIVE_LOW>; label = "Green LED 0"; }; + led1: led_1 { gpios = <&gpio0 18 GPIO_ACTIVE_LOW>; label = "Green LED 1"; }; + led2: led_2 { gpios = <&gpio0 19 GPIO_ACTIVE_LOW>; label = "Green LED 2"; }; + led3: led_3 { gpios = <&gpio0 20 GPIO_ACTIVE_LOW>; label = "Green LED 3"; @@ -48,21 +52,25 @@ buttons { compatible = "gpio-keys"; + button0: button_0 { label = "Push button switch 0"; gpios = <&gpio0 13 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; zephyr,code = ; }; + button1: button_1 { label = "Push button switch 1"; gpios = <&gpio0 14 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; zephyr,code = ; }; + button2: button_2 { label = "Push button switch 2"; gpios = <&gpio0 15 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; zephyr,code = ; }; + button3: button_3 { label = "Push button switch 3"; gpios = <&gpio0 16 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; @@ -133,7 +141,6 @@ }; &flash0 { - partitions { compatible = "fixed-partitions"; #address-cells = <1>; @@ -143,14 +150,17 @@ label = "mcuboot"; reg = <0x00000000 0xc000>; }; + slot0_partition: partition@c000 { label = "image-0"; reg = <0x0000C000 0xe000>; }; + slot1_partition: partition@1a000 { label = "image-1"; reg = <0x0001a000 0xe000>; }; + storage_partition: partition@28000 { label = "storage"; reg = <0x00028000 0x00008000>; diff --git a/boards/nordic/nrf52dk/nrf52dk_nrf52832-pinctrl.dtsi b/boards/nordic/nrf52dk/nrf52dk_nrf52832-pinctrl.dtsi index c859969e551..45b5ccb4e04 100644 --- a/boards/nordic/nrf52dk/nrf52dk_nrf52832-pinctrl.dtsi +++ b/boards/nordic/nrf52dk/nrf52dk_nrf52832-pinctrl.dtsi @@ -117,5 +117,4 @@ low-power-enable; }; }; - }; diff --git a/boards/nordic/nrf52dk/nrf52dk_nrf52832.dts b/boards/nordic/nrf52dk/nrf52dk_nrf52832.dts index d132db9f423..7d1a09eb357 100644 --- a/boards/nordic/nrf52dk/nrf52dk_nrf52832.dts +++ b/boards/nordic/nrf52dk/nrf52dk_nrf52832.dts @@ -27,18 +27,22 @@ leds { compatible = "gpio-leds"; + led0: led_0 { gpios = <&gpio0 17 GPIO_ACTIVE_LOW>; label = "Green LED 0"; }; + led1: led_1 { gpios = <&gpio0 18 GPIO_ACTIVE_LOW>; label = "Green LED 1"; }; + led2: led_2 { gpios = <&gpio0 19 GPIO_ACTIVE_LOW>; label = "Green LED 2"; }; + led3: led_3 { gpios = <&gpio0 20 GPIO_ACTIVE_LOW>; label = "Green LED 3"; @@ -47,6 +51,7 @@ pwmleds { compatible = "pwm-leds"; + pwm_led0: pwm_led_0 { pwms = <&pwm0 0 PWM_MSEC(20) PWM_POLARITY_INVERTED>; }; @@ -54,21 +59,25 @@ buttons { compatible = "gpio-keys"; + button0: button_0 { gpios = <&gpio0 13 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; label = "Push button switch 0"; zephyr,code = ; }; + button1: button_1 { gpios = <&gpio0 14 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; label = "Push button switch 1"; zephyr,code = ; }; + button2: button_2 { gpios = <&gpio0 15 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; label = "Push button switch 2"; zephyr,code = ; }; + button3: button_3 { gpios = <&gpio0 16 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; label = "Push button switch 3"; @@ -218,7 +227,6 @@ arduino_spi: &spi2 { }; &flash0 { - partitions { compatible = "fixed-partitions"; #address-cells = <1>; @@ -228,14 +236,17 @@ arduino_spi: &spi2 { label = "mcuboot"; reg = <0x00000000 0xc000>; }; + slot0_partition: partition@c000 { label = "image-0"; reg = <0x0000C000 0x37000>; }; + slot1_partition: partition@43000 { label = "image-1"; reg = <0x00043000 0x37000>; }; + storage_partition: partition@7a000 { label = "storage"; reg = <0x0007a000 0x00006000>; diff --git a/boards/nordic/nrf5340_audio_dk/nrf5340_audio_dk_nrf5340_cpuapp_common-pinctrl.dtsi b/boards/nordic/nrf5340_audio_dk/nrf5340_audio_dk_nrf5340_cpuapp_common-pinctrl.dtsi index 5247c04429b..6f835be43c6 100644 --- a/boards/nordic/nrf5340_audio_dk/nrf5340_audio_dk_nrf5340_cpuapp_common-pinctrl.dtsi +++ b/boards/nordic/nrf5340_audio_dk/nrf5340_audio_dk_nrf5340_cpuapp_common-pinctrl.dtsi @@ -10,6 +10,7 @@ psels = ; nordic,drive-mode = ; }; + group2 { psels = , , @@ -34,6 +35,7 @@ psels = , ; }; + group2 { psels = , ; @@ -56,6 +58,7 @@ psels = , ; }; + group2 { psels = , ; @@ -114,6 +117,7 @@ */ nordic,drive-mode = ; }; + group2 { psels = ; }; diff --git a/boards/nordic/nrf5340_audio_dk/nrf5340_audio_dk_nrf5340_cpuapp_common.dtsi b/boards/nordic/nrf5340_audio_dk/nrf5340_audio_dk_nrf5340_cpuapp_common.dtsi index 78a5020f31e..a607e2e797a 100644 --- a/boards/nordic/nrf5340_audio_dk/nrf5340_audio_dk_nrf5340_cpuapp_common.dtsi +++ b/boards/nordic/nrf5340_audio_dk/nrf5340_audio_dk_nrf5340_cpuapp_common.dtsi @@ -20,6 +20,7 @@ gpio_fwd: nrf-gpio-forwarder { compatible = "nordic,nrf-gpio-forwarder"; status = "okay"; + uart { gpios = <&gpio1 9 0>, <&gpio1 8 0>, <&gpio1 11 0>, <&gpio1 10 0>; }; @@ -51,12 +52,15 @@ pwmleds { compatible = "pwm-leds"; + rgb1_red_pwm_led: pwm_led_0 { pwms = <&pwm0 0 PWM_MSEC(20) PWM_POLARITY_NORMAL>; }; + rgb1_green_pwm_led: pwm_led_1 { pwms = <&pwm0 1 PWM_MSEC(20) PWM_POLARITY_NORMAL>; }; + rgb1_blue_pwm_led: pwm_led_2 { pwms = <&pwm0 2 PWM_MSEC(20) PWM_POLARITY_NORMAL>; }; @@ -212,17 +216,18 @@ arduino_spi: &spi4 { pinctrl-0 = <&spi4_default>; pinctrl-1 = <&spi4_sleep>; pinctrl-names = "default", "sleep"; + sdhc0: sdhc@1 { compatible = "zephyr,sdhc-spi-slot"; reg = <1>; status = "okay"; + spi-max-frequency = <8000000>; + sdmmc { compatible = "zephyr,sdmmc-disk"; disk-name = "SD"; status = "okay"; }; - - spi-max-frequency = <8000000>; }; cs47l63: cs47l63@2 { diff --git a/boards/nordic/nrf5340_audio_dk/nrf5340_audio_dk_nrf5340_cpunet-pinctrl.dtsi b/boards/nordic/nrf5340_audio_dk/nrf5340_audio_dk_nrf5340_cpunet-pinctrl.dtsi index 6804c040d12..86978843757 100644 --- a/boards/nordic/nrf5340_audio_dk/nrf5340_audio_dk_nrf5340_cpunet-pinctrl.dtsi +++ b/boards/nordic/nrf5340_audio_dk/nrf5340_audio_dk_nrf5340_cpunet-pinctrl.dtsi @@ -9,6 +9,7 @@ psels = , ; }; + group2 { psels = , ; @@ -42,5 +43,4 @@ low-power-enable; }; }; - }; diff --git a/boards/nordic/nrf5340_audio_dk/nrf5340_audio_dk_nrf5340_cpunet.dts b/boards/nordic/nrf5340_audio_dk/nrf5340_audio_dk_nrf5340_cpunet.dts index c50a51d3bc5..05ad7489ef4 100644 --- a/boards/nordic/nrf5340_audio_dk/nrf5340_audio_dk_nrf5340_cpunet.dts +++ b/boards/nordic/nrf5340_audio_dk/nrf5340_audio_dk_nrf5340_cpunet.dts @@ -58,7 +58,6 @@ arduino_spi: &spi0 { }; &flash1 { - partitions { compatible = "fixed-partitions"; #address-cells = <1>; @@ -68,14 +67,17 @@ arduino_spi: &spi0 { label = "mcuboot"; reg = <0x00000000 0xc000>; }; + slot0_partition: partition@c000 { label = "image-0"; reg = <0x0000C000 0x12000>; }; + slot1_partition: partition@1e000 { label = "image-1"; reg = <0x0001E000 0x12000>; }; + storage_partition: partition@3a000 { label = "storage"; reg = <0x0003a000 0x6000>; diff --git a/boards/nordic/nrf5340_audio_dk/nrf5340_audio_dk_nrf5340_shared.dtsi b/boards/nordic/nrf5340_audio_dk/nrf5340_audio_dk_nrf5340_shared.dtsi index 5d13b9288a6..aff29f4e9d3 100644 --- a/boards/nordic/nrf5340_audio_dk/nrf5340_audio_dk_nrf5340_shared.dtsi +++ b/boards/nordic/nrf5340_audio_dk/nrf5340_audio_dk_nrf5340_shared.dtsi @@ -1,40 +1,49 @@ #include / { - leds: leds { + leds: leds { compatible = "gpio-leds"; + rgb1_red: led_0 { gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>; label = "0 LED_RGB_RED"; }; + rgb1_green: led_1 { gpios = <&gpio0 25 GPIO_ACTIVE_HIGH>; label = "0 LED_RGB_GREEN"; }; + rgb1_blue: led_2 { gpios = <&gpio0 26 GPIO_ACTIVE_HIGH>; label = "0 LED_RGB_BLUE"; }; + rgb2_red: led_3 { gpios = <&gpio0 28 GPIO_ACTIVE_HIGH>; label = "1 LED_RGB_RED"; }; + rgb2_green: led_4 { gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>; label = "1 LED_RGB_GREEN"; }; + rgb2_blue: led_5 { gpios = <&gpio0 30 GPIO_ACTIVE_HIGH>; label = "1 LED_RGB_BLUE"; }; + led1_blue: led_6 { gpios = <&gpio0 31 GPIO_ACTIVE_HIGH>; label = "2 LED_MONO_BLUE"; }; + led2_green: led_7 { gpios = <&gpio1 0 GPIO_ACTIVE_HIGH>; label = "3 LED_MONO_GREEN"; }; + led3_green: led_8 { gpios = <&gpio1 1 GPIO_ACTIVE_HIGH>; label = "4 LED_MONO_GREEN"; @@ -43,26 +52,31 @@ buttons { compatible = "gpio-keys"; + button_1_vol_dn: button_1_vol_dn { gpios = <&gpio0 2 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; label = "Push button 1"; zephyr,code = ; }; + button_2_vol_up: button_2_vol_up { gpios = <&gpio0 3 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; label = "Push button 2"; zephyr,code = ; }; + button3: button_3 { gpios = <&gpio0 4 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; label = "Push button 3"; zephyr,code = ; }; + button4: button_4 { gpios = <&gpio0 6 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; label = "Push button 4"; zephyr,code = ; }; + button5: button_5 { gpios = <&gpio0 5 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; label = "Push button 5"; diff --git a/boards/nordic/nrf5340dk/nrf5340_cpuapp_common-pinctrl.dtsi b/boards/nordic/nrf5340dk/nrf5340_cpuapp_common-pinctrl.dtsi index f93e3a69402..10db7ee52e2 100644 --- a/boards/nordic/nrf5340dk/nrf5340_cpuapp_common-pinctrl.dtsi +++ b/boards/nordic/nrf5340dk/nrf5340_cpuapp_common-pinctrl.dtsi @@ -24,6 +24,7 @@ psels = , ; }; + group2 { psels = , ; @@ -75,6 +76,7 @@ ; low-power-enable; }; + group2 { psels = ; low-power-enable; @@ -87,6 +89,7 @@ psels = , ; }; + group2 { psels = , ; @@ -120,5 +123,4 @@ low-power-enable; }; }; - }; diff --git a/boards/nordic/nrf5340dk/nrf5340_cpuapp_common.dtsi b/boards/nordic/nrf5340dk/nrf5340_cpuapp_common.dtsi index 153e8e83458..6d26411b19e 100644 --- a/boards/nordic/nrf5340dk/nrf5340_cpuapp_common.dtsi +++ b/boards/nordic/nrf5340dk/nrf5340_cpuapp_common.dtsi @@ -22,6 +22,7 @@ pwmleds { compatible = "pwm-leds"; + pwm_led0: pwm_led_0 { pwms = <&pwm0 0 PWM_MSEC(20) PWM_POLARITY_INVERTED>; }; @@ -41,6 +42,7 @@ gpio_fwd: nrf-gpio-forwarder { compatible = "nordic,nrf-gpio-forwarder"; status = "okay"; + uart { gpios = <&gpio1 1 0>, <&gpio1 0 0>, <&gpio0 11 0>, <&gpio0 10 0>; }; @@ -118,6 +120,7 @@ pinctrl-0 = <&qspi_default>; pinctrl-1 = <&qspi_sleep>; pinctrl-names = "default", "sleep"; + mx25r64: mx25r6435f@0 { compatible = "nordic,qspi-nor"; reg = <0>; diff --git a/boards/nordic/nrf5340dk/nrf5340dk_common.dtsi b/boards/nordic/nrf5340dk/nrf5340dk_common.dtsi index f5bbbaa03cd..8c447727d89 100644 --- a/boards/nordic/nrf5340dk/nrf5340dk_common.dtsi +++ b/boards/nordic/nrf5340dk/nrf5340dk_common.dtsi @@ -7,18 +7,22 @@ / { leds { compatible = "gpio-leds"; + led0: led_0 { gpios = <&gpio0 28 GPIO_ACTIVE_LOW>; label = "Green LED 0"; }; + led1: led_1 { gpios = <&gpio0 29 GPIO_ACTIVE_LOW>; label = "Green LED 1"; }; + led2: led_2 { gpios = <&gpio0 30 GPIO_ACTIVE_LOW>; label = "Green LED 2"; }; + led3: led_3 { gpios = <&gpio0 31 GPIO_ACTIVE_LOW>; label = "Green LED 3"; @@ -27,21 +31,25 @@ buttons { compatible = "gpio-keys"; + button0: button_0 { gpios = <&gpio0 23 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; label = "Push button 1"; zephyr,code = ; }; + button1: button_1 { gpios = <&gpio0 24 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; label = "Push button 2"; zephyr,code = ; }; + button2: button_2 { gpios = <&gpio0 8 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; label = "Push button 3"; zephyr,code = ; }; + button3: button_3 { gpios = <&gpio0 9 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; label = "Push button 4"; diff --git a/boards/nordic/nrf5340dk/nrf5340dk_nrf5340_cpunet-pinctrl.dtsi b/boards/nordic/nrf5340dk/nrf5340dk_nrf5340_cpunet-pinctrl.dtsi index 210eb1de211..30f638a7eae 100644 --- a/boards/nordic/nrf5340dk/nrf5340dk_nrf5340_cpunet-pinctrl.dtsi +++ b/boards/nordic/nrf5340dk/nrf5340dk_nrf5340_cpunet-pinctrl.dtsi @@ -9,6 +9,7 @@ psels = , ; }; + group2 { psels = , ; @@ -57,5 +58,4 @@ low-power-enable; }; }; - }; diff --git a/boards/nordic/nrf5340dk/nrf5340dk_nrf5340_cpunet.dts b/boards/nordic/nrf5340dk/nrf5340dk_nrf5340_cpunet.dts index 7bc0cd9a4ba..e9cac8b1b09 100644 --- a/boards/nordic/nrf5340dk/nrf5340dk_nrf5340_cpunet.dts +++ b/boards/nordic/nrf5340dk/nrf5340dk_nrf5340_cpunet.dts @@ -76,7 +76,6 @@ arduino_spi: &spi0 { }; &flash1 { - partitions { compatible = "fixed-partitions"; #address-cells = <1>; @@ -86,14 +85,17 @@ arduino_spi: &spi0 { label = "mcuboot"; reg = <0x00000000 0xc000>; }; + slot0_partition: partition@c000 { label = "image-0"; reg = <0x0000C000 0x17000>; }; + slot1_partition: partition@23000 { label = "image-1"; reg = <0x00023000 0x17000>; }; + storage_partition: partition@3a000 { label = "storage"; reg = <0x0003a000 0x6000>; diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts index 383512caaf3..55c5284001b 100644 --- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts +++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpurad.dts @@ -28,6 +28,7 @@ zephyr,bt-hci-ipc = &ipc0; nordic,802154-spinel-ipc = &ipc0; }; + aliases { ipc-to-cpusys = &cpurad_cpusys_ipc; resetinfo = &cpurad_resetinfo; diff --git a/boards/nordic/nrf54l09pdk/nrf54l09_cpuapp_common.dtsi b/boards/nordic/nrf54l09pdk/nrf54l09_cpuapp_common.dtsi index 0bdab1b8851..7d0c880c2de 100644 --- a/boards/nordic/nrf54l09pdk/nrf54l09_cpuapp_common.dtsi +++ b/boards/nordic/nrf54l09pdk/nrf54l09_cpuapp_common.dtsi @@ -54,26 +54,32 @@ compatible = "fixed-partitions"; #address-cells = <1>; #size-cells = <1>; + boot_partition: partition@0 { label = "mcuboot"; reg = <0x0 DT_SIZE_K(64)>; }; + slot0_partition: partition@10000 { label = "image-0"; reg = <0x10000 DT_SIZE_K(212)>; }; + slot0_ns_partition: partition@45000 { label = "image-0-nonsecure"; reg = <0x45000 DT_SIZE_K(212)>; }; + slot1_partition: partition@7a000 { label = "image-1"; reg = <0x7a000 DT_SIZE_K(212)>; }; + slot1_ns_partition: partition@af000 { label = "image-1-nonsecure"; reg = <0xaf000 DT_SIZE_K(212)>; }; + storage_partition: partition@e4000 { label = "storage"; reg = <0xe4000 DT_SIZE_K(36)>; diff --git a/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09-common.dtsi b/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09-common.dtsi index f1e9ee9afd8..9dfe9412d9b 100644 --- a/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09-common.dtsi +++ b/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09-common.dtsi @@ -9,10 +9,12 @@ / { leds { compatible = "gpio-leds"; + led0: led_0 { gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>; label = "Green LED 1"; }; + led1: led_1 { gpios = <&gpio0 2 GPIO_ACTIVE_HIGH>; label = "Green LED 2"; @@ -21,21 +23,25 @@ buttons { compatible = "gpio-keys"; + button0: button_0 { gpios = <&gpio1 13 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; label = "Push button 0"; zephyr,code = ; }; + button1: button_1 { gpios = <&gpio1 9 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; label = "Push button 1"; zephyr,code = ; }; + button2: button_2 { gpios = <&gpio1 8 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; label = "Push button 2"; zephyr,code = ; }; + button3: button_3 { gpios = <&gpio0 4 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; label = "Push button 3"; diff --git a/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09-pinctrl.dtsi b/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09-pinctrl.dtsi index ac08b201f93..a87ae590f23 100644 --- a/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09-pinctrl.dtsi +++ b/boards/nordic/nrf54l09pdk/nrf54l09pdk_nrf54l09-pinctrl.dtsi @@ -8,6 +8,7 @@ group1 { psels = ; }; + group2 { psels = ; bias-pull-up; diff --git a/boards/nordic/nrf54l15dk/nrf54l15dk_common.dtsi b/boards/nordic/nrf54l15dk/nrf54l15dk_common.dtsi index 6a40af0ee95..c030c2c5518 100644 --- a/boards/nordic/nrf54l15dk/nrf54l15dk_common.dtsi +++ b/boards/nordic/nrf54l15dk/nrf54l15dk_common.dtsi @@ -9,18 +9,22 @@ / { leds { compatible = "gpio-leds"; + led0: led_0 { gpios = <&gpio2 9 GPIO_ACTIVE_HIGH>; label = "Green LED 0"; }; + led1: led_1 { gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>; label = "Green LED 1"; }; + led2: led_2 { gpios = <&gpio2 7 GPIO_ACTIVE_HIGH>; label = "Green LED 2"; }; + led3: led_3 { gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>; label = "Green LED 3"; @@ -29,6 +33,7 @@ pwmleds { compatible = "pwm-leds"; + /* * PWM signal can be exposed on GPIO pin only within same domain. * There is only one domain which contains both PWM and GPIO: @@ -42,21 +47,25 @@ buttons { compatible = "gpio-keys"; + button0: button_0 { gpios = <&gpio1 13 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; label = "Push button 0"; zephyr,code = ; }; + button1: button_1 { gpios = <&gpio1 9 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; label = "Push button 1"; zephyr,code = ; }; + button2: button_2 { gpios = <&gpio1 8 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; label = "Push button 2"; zephyr,code = ; }; + button3: button_3 { gpios = <&gpio0 4 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; label = "Push button 3"; diff --git a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l05_cpuapp.dts b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l05_cpuapp.dts index e2215ce1294..23ae87ccb11 100644 --- a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l05_cpuapp.dts +++ b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l05_cpuapp.dts @@ -35,26 +35,32 @@ compatible = "fixed-partitions"; #address-cells = <1>; #size-cells = <1>; + boot_partition: partition@0 { label = "mcuboot"; reg = <0x0 DT_SIZE_K(64)>; }; + slot0_partition: partition@10000 { label = "image-0"; reg = <0x10000 DT_SIZE_K(100)>; }; + slot0_ns_partition: partition@29000 { label = "image-0-nonsecure"; reg = <0x29000 DT_SIZE_K(100)>; }; + slot1_partition: partition@42000 { label = "image-1"; reg = <0x42000 DT_SIZE_K(100)>; }; + slot1_ns_partition: partition@5b000 { label = "image-1-nonsecure"; reg = <0x5b000 DT_SIZE_K(100)>; }; + storage_partition: partition@74000 { label = "storage"; reg = <0x74000 DT_SIZE_K(36)>; diff --git a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp.dts b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp.dts index 79b16bd4125..b2d96daa192 100644 --- a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp.dts +++ b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l15_cpuapp.dts @@ -24,27 +24,34 @@ compatible = "fixed-partitions"; #address-cells = <1>; #size-cells = <1>; + boot_partition: partition@0 { label = "mcuboot"; reg = <0x0 DT_SIZE_K(64)>; }; + slot0_partition: partition@10000 { label = "image-0"; reg = <0x10000 DT_SIZE_K(324)>; }; + slot0_ns_partition: partition@61000 { label = "image-0-nonsecure"; reg = <0x61000 DT_SIZE_K(324)>; }; + slot1_partition: partition@b2000 { label = "image-1"; reg = <0xb2000 DT_SIZE_K(324)>; }; + slot1_ns_partition: partition@103000 { label = "image-1-nonsecure"; reg = <0x103000 DT_SIZE_K(324)>; }; + /* 32k from 0x154000 to 0x15bfff reserved for TF-M partitions */ + storage_partition: partition@15c000 { label = "storage"; reg = <0x15c000 DT_SIZE_K(36)>; diff --git a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l_05_10_15-pinctrl.dtsi b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l_05_10_15-pinctrl.dtsi index 6b7457a2818..7beece98e62 100644 --- a/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l_05_10_15-pinctrl.dtsi +++ b/boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l_05_10_15-pinctrl.dtsi @@ -9,6 +9,7 @@ psels = , ; }; + group2 { psels = , ; @@ -31,6 +32,7 @@ psels = , ; }; + group2 { psels = , ; diff --git a/boards/nordic/nrf54l20pdk/nrf54l20_cpuapp_common.dtsi b/boards/nordic/nrf54l20pdk/nrf54l20_cpuapp_common.dtsi index d3a2a731120..614ffbca4de 100644 --- a/boards/nordic/nrf54l20pdk/nrf54l20_cpuapp_common.dtsi +++ b/boards/nordic/nrf54l20pdk/nrf54l20_cpuapp_common.dtsi @@ -49,26 +49,32 @@ compatible = "fixed-partitions"; #address-cells = <1>; #size-cells = <1>; + boot_partition: partition@0 { label = "mcuboot"; reg = <0x0 DT_SIZE_K(64)>; }; + slot0_partition: partition@10000 { label = "image-0"; reg = <0x10000 DT_SIZE_K(449)>; }; + slot0_ns_partition: partition@80400 { label = "image-0-nonsecure"; reg = <0x80400 DT_SIZE_K(449)>; }; + slot1_partition: partition@f0800 { label = "image-1"; reg = <0xf0800 DT_SIZE_K(449)>; }; + slot1_ns_partition: partition@160c00 { label = "image-1-nonsecure"; reg = <0x160c00 DT_SIZE_K(449)>; }; + storage_partition: partition@1d1000 { label = "storage"; reg = <0x1d1000 DT_SIZE_K(36)>; diff --git a/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20-common.dtsi b/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20-common.dtsi index 6eb67fe1bb3..7a10c8d07ac 100644 --- a/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20-common.dtsi +++ b/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20-common.dtsi @@ -9,18 +9,22 @@ / { leds { compatible = "gpio-leds"; + led0: led_0 { gpios = <&gpio2 10 GPIO_ACTIVE_HIGH>; label = "Green LED 0"; }; + led1: led_1 { gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>; label = "Green LED 1"; }; + led2: led_2 { gpios = <&gpio0 2 GPIO_ACTIVE_HIGH>; label = "Green LED 2"; }; + led3: led_3 { gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>; label = "Green LED 3"; @@ -29,6 +33,7 @@ pwmleds { compatible = "pwm-leds"; + /* * PWM signal can be exposed on GPIO pin only within same domain. * There is only one domain which contains both PWM and GPIO: @@ -42,21 +47,25 @@ buttons { compatible = "gpio-keys"; + button0: button_0 { gpios = <&gpio1 13 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; label = "Push button 0"; zephyr,code = ; }; + button1: button_1 { gpios = <&gpio1 9 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; label = "Push button 1"; zephyr,code = ; }; + button2: button_2 { gpios = <&gpio1 8 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; label = "Push button 2"; zephyr,code = ; }; + button3: button_3 { gpios = <&gpio0 4 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; label = "Push button 3"; diff --git a/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20-pinctrl.dtsi b/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20-pinctrl.dtsi index b70be2bfa5e..51ea27781c9 100644 --- a/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20-pinctrl.dtsi +++ b/boards/nordic/nrf54l20pdk/nrf54l20pdk_nrf54l20-pinctrl.dtsi @@ -8,6 +8,7 @@ group1 { psels = ; }; + group2 { psels = ; bias-pull-up; diff --git a/boards/nordic/nrf7002dk/nrf5340_cpuapp_common.dtsi b/boards/nordic/nrf7002dk/nrf5340_cpuapp_common.dtsi index 7056652e573..026d64a4016 100644 --- a/boards/nordic/nrf7002dk/nrf5340_cpuapp_common.dtsi +++ b/boards/nordic/nrf7002dk/nrf5340_cpuapp_common.dtsi @@ -20,10 +20,12 @@ leds { compatible = "gpio-leds"; + led0: led_0 { gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>; label = "Green LED 0"; }; + led1: led_1 { gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>; label = "Green LED 1"; @@ -32,6 +34,7 @@ pwmleds { compatible = "pwm-leds"; + pwm_led0: pwm_led_0 { pwms = <&pwm0 0 PWM_MSEC(20) PWM_POLARITY_NORMAL>; }; @@ -39,11 +42,13 @@ buttons { compatible = "gpio-keys"; + button0: button_0 { gpios = <&gpio1 8 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; label = "Push button 1"; zephyr,code = ; }; + button1: button_1 { gpios = <&gpio1 9 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; label = "Push button 2"; @@ -94,6 +99,7 @@ gpio_fwd: nrf-gpio-forwarder { compatible = "nordic,nrf-gpio-forwarder"; status = "okay"; + uart { gpios = <&gpio1 1 0>, <&gpio1 0 0>, <&gpio1 5 0>, <&gpio1 4 0>; }; @@ -189,6 +195,7 @@ arduino_i2c: &i2c1 { pinctrl-1 = <&spi4_sleep>; pinctrl-names = "default", "sleep"; cs-gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; + mx25r64: mx25r6435f@0 { compatible = "jedec,spi-nor"; reg = <0>; diff --git a/boards/nordic/nrf7002dk/nrf5340_cpuapp_common_pinctrl.dtsi b/boards/nordic/nrf7002dk/nrf5340_cpuapp_common_pinctrl.dtsi index f04075f374d..0243f07df1d 100644 --- a/boards/nordic/nrf7002dk/nrf5340_cpuapp_common_pinctrl.dtsi +++ b/boards/nordic/nrf7002dk/nrf5340_cpuapp_common_pinctrl.dtsi @@ -19,6 +19,7 @@ psels = , ; }; + group2 { psels = , ; @@ -76,6 +77,7 @@ group1 { psels = ; }; + group2 { psels = ; bias-pull-up; diff --git a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpunet.dts b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpunet.dts index faea5ee69e3..929e0440dfa 100644 --- a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpunet.dts +++ b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpunet.dts @@ -28,24 +28,28 @@ }; leds { - compatible = "gpio-leds"; - led0: led_0 { - gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>; - label = "Green LED 0"; - }; - led1: led_1 { - gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>; - label = "Green LED 1"; - }; + compatible = "gpio-leds"; + + led0: led_0 { + gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>; + label = "Green LED 0"; + }; + + led1: led_1 { + gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>; + label = "Green LED 1"; + }; }; buttons { compatible = "gpio-keys"; + button0: button_0 { gpios = <&gpio1 8 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; label = "Push button 1"; zephyr,code = ; }; + button1: button_1 { gpios = <&gpio1 9 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; label = "Push button 2"; @@ -85,7 +89,6 @@ nrf_radio_coex: coex { status = "okay"; compatible = "nordic,nrf7002-coex"; - req-gpios = <&gpio0 28 GPIO_ACTIVE_HIGH>; status0-gpios = <&gpio0 30 GPIO_ACTIVE_HIGH>; grant-gpios = <&gpio0 24 (GPIO_PULL_DOWN | GPIO_ACTIVE_LOW)>; @@ -156,14 +159,17 @@ arduino_spi: &spi0 { label = "mcuboot"; reg = <0x00000000 0xc000>; }; + slot0_partition: partition@c000 { label = "image-0"; reg = <0x0000C000 0x17000>; }; + slot1_partition: partition@23000 { label = "image-1"; reg = <0x00023000 0x17000>; }; + storage_partition: partition@3a000 { label = "storage"; reg = <0x0003a000 0x6000>; diff --git a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpunet_pinctrl.dtsi b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpunet_pinctrl.dtsi index 2e19d95f7f9..0abcb4724d5 100644 --- a/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpunet_pinctrl.dtsi +++ b/boards/nordic/nrf7002dk/nrf7002dk_nrf5340_cpunet_pinctrl.dtsi @@ -4,6 +4,7 @@ psels = , ; }; + group2 { psels = , ; diff --git a/boards/nordic/nrf9131ek/nrf9131ek_nrf9131_common-pinctrl.dtsi b/boards/nordic/nrf9131ek/nrf9131ek_nrf9131_common-pinctrl.dtsi index 419e7c8d70c..edb6d869bf6 100644 --- a/boards/nordic/nrf9131ek/nrf9131ek_nrf9131_common-pinctrl.dtsi +++ b/boards/nordic/nrf9131ek/nrf9131ek_nrf9131_common-pinctrl.dtsi @@ -9,6 +9,7 @@ psels = , ; }; + group2 { psels = , ; @@ -31,6 +32,7 @@ psels = , ; }; + group2 { psels = , ; diff --git a/boards/nordic/nrf9131ek/nrf9131ek_nrf9131_common.dtsi b/boards/nordic/nrf9131ek/nrf9131ek_nrf9131_common.dtsi index 0442b1cf527..f0ad4d68ff6 100644 --- a/boards/nordic/nrf9131ek/nrf9131ek_nrf9131_common.dtsi +++ b/boards/nordic/nrf9131ek/nrf9131ek_nrf9131_common.dtsi @@ -18,14 +18,17 @@ leds { compatible = "gpio-leds"; + led0: led_0 { gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>; label = "Red LED 1"; }; + led1: led_1 { gpios = <&gpio0 30 GPIO_ACTIVE_HIGH>; label = "Green LED 2"; }; + led2: led_2 { gpios = <&gpio0 31 GPIO_ACTIVE_HIGH>; label = "Blue LED 3"; @@ -34,12 +37,15 @@ pwmleds { compatible = "pwm-leds"; + pwm_led0: pwm_led_0 { pwms = <&pwm0 0 PWM_MSEC(8) PWM_POLARITY_NORMAL>; }; + pwm_led1: pwm_led_1 { pwms = <&pwm0 1 PWM_MSEC(8) PWM_POLARITY_NORMAL>; }; + pwm_led2: pwm_led_2 { pwms = <&pwm0 2 PWM_MSEC(8) PWM_POLARITY_NORMAL>; }; @@ -47,6 +53,7 @@ buttons { compatible = "gpio-keys"; + button0: button_0 { gpios = <&gpio0 28 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; label = "Push button 1"; @@ -120,13 +127,16 @@ thermistor-beta = <3380>; charging-enable; }; + regulators { compatible = "nordic,npm1300-regulator"; + BUCK1 { regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; regulator-boot-on; }; + BUCK2 { regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; diff --git a/boards/nordic/nrf9151dk/nrf9151dk_nrf9151_common-pinctrl.dtsi b/boards/nordic/nrf9151dk/nrf9151dk_nrf9151_common-pinctrl.dtsi index a1680e830f4..2685cc354ec 100644 --- a/boards/nordic/nrf9151dk/nrf9151dk_nrf9151_common-pinctrl.dtsi +++ b/boards/nordic/nrf9151dk/nrf9151dk_nrf9151_common-pinctrl.dtsi @@ -9,6 +9,7 @@ psels = , ; }; + group2 { psels = , ; @@ -31,6 +32,7 @@ psels = , ; }; + group2 { psels = , ; diff --git a/boards/nordic/nrf9151dk/nrf9151dk_nrf9151_common.dtsi b/boards/nordic/nrf9151dk/nrf9151dk_nrf9151_common.dtsi index 8ed282fe49e..9d23bf6781a 100644 --- a/boards/nordic/nrf9151dk/nrf9151dk_nrf9151_common.dtsi +++ b/boards/nordic/nrf9151dk/nrf9151dk_nrf9151_common.dtsi @@ -18,18 +18,22 @@ leds { compatible = "gpio-leds"; + led0: led_0 { gpios = <&gpio0 0 GPIO_ACTIVE_HIGH>; label = "Green LED 1"; }; + led1: led_1 { gpios = <&gpio0 1 GPIO_ACTIVE_HIGH>; label = "Green LED 2"; }; + led2: led_2 { gpios = <&gpio0 4 GPIO_ACTIVE_HIGH>; label = "Green LED 3"; }; + led3: led_3 { gpios = <&gpio0 5 GPIO_ACTIVE_HIGH>; label = "Green LED 4"; @@ -38,6 +42,7 @@ pwmleds { compatible = "pwm-leds"; + pwm_led0: pwm_led_0 { pwms = <&pwm0 0 PWM_MSEC(20) PWM_POLARITY_NORMAL>; }; @@ -45,21 +50,25 @@ buttons { compatible = "gpio-keys"; + button0: button_0 { gpios = <&gpio0 8 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; label = "Push button 1"; zephyr,code = ; }; + button1: button_1 { gpios = <&gpio0 9 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; label = "Push button 2"; zephyr,code = ; }; + button2: button_2 { gpios = <&gpio0 18 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; label = "Push button 3"; zephyr,code = ; }; + button3: button_3 { gpios = <&gpio0 19 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; label = "Push button 4"; diff --git a/boards/nordic/nrf9160dk/nrf9160dk_nrf52840-pinctrl.dtsi b/boards/nordic/nrf9160dk/nrf9160dk_nrf52840-pinctrl.dtsi index 1681e3ecb9b..22eae1b3b6c 100644 --- a/boards/nordic/nrf9160dk/nrf9160dk_nrf52840-pinctrl.dtsi +++ b/boards/nordic/nrf9160dk/nrf9160dk_nrf52840-pinctrl.dtsi @@ -9,6 +9,7 @@ psels = , ; }; + group2 { psels = , ; @@ -25,5 +26,4 @@ low-power-enable; }; }; - }; diff --git a/boards/nordic/nrf9160dk/nrf9160dk_nrf9160_common-pinctrl.dtsi b/boards/nordic/nrf9160dk/nrf9160dk_nrf9160_common-pinctrl.dtsi index 4c7475f7e73..8ca261027d1 100644 --- a/boards/nordic/nrf9160dk/nrf9160dk_nrf9160_common-pinctrl.dtsi +++ b/boards/nordic/nrf9160dk/nrf9160dk_nrf9160_common-pinctrl.dtsi @@ -9,6 +9,7 @@ psels = , ; }; + group2 { psels = , ; @@ -31,6 +32,7 @@ psels = , ; }; + group2 { psels = , ; diff --git a/boards/nordic/nrf9160dk/nrf9160dk_nrf9160_common.dtsi b/boards/nordic/nrf9160dk/nrf9160dk_nrf9160_common.dtsi index f57b3fa17c2..5abcdae3216 100644 --- a/boards/nordic/nrf9160dk/nrf9160dk_nrf9160_common.dtsi +++ b/boards/nordic/nrf9160dk/nrf9160dk_nrf9160_common.dtsi @@ -18,18 +18,22 @@ leds { compatible = "gpio-leds"; + led0: led_0 { gpios = <&gpio0 2 0>; label = "Green LED 1"; }; + led1: led_1 { gpios = <&gpio0 3 0>; label = "Green LED 2"; }; + led2: led_2 { gpios = <&gpio0 4 0>; label = "Green LED 3"; }; + led3: led_3 { gpios = <&gpio0 5 0>; label = "Green LED 4"; @@ -38,6 +42,7 @@ pwmleds { compatible = "pwm-leds"; + pwm_led0: pwm_led_0 { pwms = <&pwm0 0 PWM_MSEC(20) PWM_POLARITY_NORMAL>; }; @@ -52,21 +57,25 @@ * the usual "4 buttons per DK board" convention. */ compatible = "gpio-keys"; + button0: button_0 { gpios = <&gpio0 6 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; label = "Push button 1"; zephyr,code = ; }; + button1: button_1 { gpios = <&gpio0 7 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; label = "Push button 2"; zephyr,code = ; }; + button2: button_2 { gpios = <&gpio0 8 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; label = "Switch 1"; zephyr,code = ; }; + button3: button_3 { gpios = <&gpio0 9 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; label = "Switch 2"; diff --git a/boards/nordic/nrf9160dk/nrf9160dk_nrf9160_common_0_14_0.dtsi b/boards/nordic/nrf9160dk/nrf9160dk_nrf9160_common_0_14_0.dtsi index 896531d7580..3e3f149d69d 100644 --- a/boards/nordic/nrf9160dk/nrf9160dk_nrf9160_common_0_14_0.dtsi +++ b/boards/nordic/nrf9160dk/nrf9160dk_nrf9160_common_0_14_0.dtsi @@ -39,6 +39,7 @@ &arduino_spi { cs-gpios = <&arduino_header 16 GPIO_ACTIVE_LOW>, /* D10 */ <&gpio0 25 GPIO_ACTIVE_LOW>; + mx25r64: mx25r6435f@1 { compatible = "jedec,spi-nor"; status = "disabled"; diff --git a/boards/nordic/nrf9161dk/nrf9161dk_nrf9161_common-pinctrl.dtsi b/boards/nordic/nrf9161dk/nrf9161dk_nrf9161_common-pinctrl.dtsi index a1680e830f4..2685cc354ec 100644 --- a/boards/nordic/nrf9161dk/nrf9161dk_nrf9161_common-pinctrl.dtsi +++ b/boards/nordic/nrf9161dk/nrf9161dk_nrf9161_common-pinctrl.dtsi @@ -9,6 +9,7 @@ psels = , ; }; + group2 { psels = , ; @@ -31,6 +32,7 @@ psels = , ; }; + group2 { psels = , ; diff --git a/boards/nordic/nrf9161dk/nrf9161dk_nrf9161_common.dtsi b/boards/nordic/nrf9161dk/nrf9161dk_nrf9161_common.dtsi index 7dade3bc0f7..fa733fefe66 100644 --- a/boards/nordic/nrf9161dk/nrf9161dk_nrf9161_common.dtsi +++ b/boards/nordic/nrf9161dk/nrf9161dk_nrf9161_common.dtsi @@ -18,18 +18,22 @@ leds { compatible = "gpio-leds"; + led0: led_0 { gpios = <&gpio0 0 GPIO_ACTIVE_HIGH>; label = "Green LED 1"; }; + led1: led_1 { gpios = <&gpio0 1 GPIO_ACTIVE_HIGH>; label = "Green LED 2"; }; + led2: led_2 { gpios = <&gpio0 4 GPIO_ACTIVE_HIGH>; label = "Green LED 3"; }; + led3: led_3 { gpios = <&gpio0 5 GPIO_ACTIVE_HIGH>; label = "Green LED 4"; @@ -38,6 +42,7 @@ pwmleds { compatible = "pwm-leds"; + pwm_led0: pwm_led_0 { pwms = <&pwm0 0 PWM_MSEC(20) PWM_POLARITY_NORMAL>; }; @@ -45,21 +50,25 @@ buttons { compatible = "gpio-keys"; + button0: button_0 { gpios = <&gpio0 8 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; label = "Push button 1"; zephyr,code = ; }; + button1: button_1 { gpios = <&gpio0 9 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; label = "Push button 2"; zephyr,code = ; }; + button2: button_2 { gpios = <&gpio0 18 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; label = "Push button 3"; zephyr,code = ; }; + button3: button_3 { gpios = <&gpio0 19 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; label = "Push button 4"; diff --git a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts index bbd09a534c2..f4cce12f4b1 100644 --- a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts +++ b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpuapp.dts @@ -98,6 +98,7 @@ pwmleds { compatible = "pwm-leds"; + /* * LEDs are connected to GPIO Port 9 - pins 2-5. There is no valid hardware * configuration to pass PWM signal on pins 0 and 1. First valid config is P9.2. diff --git a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpurad.dts b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpurad.dts index f9bfae09897..5efa7dbd471 100644 --- a/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpurad.dts +++ b/boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280_cpurad.dts @@ -29,6 +29,7 @@ zephyr,bt-hci-ipc = &ipc0; nordic,802154-spinel-ipc = &ipc0; }; + aliases { ipc-to-cpusys = &cpurad_cpusys_ipc; resetinfo = &cpurad_resetinfo; diff --git a/boards/nordic/thingy52/thingy52_nrf52832-pinctrl.dtsi b/boards/nordic/thingy52/thingy52_nrf52832-pinctrl.dtsi index 5c2fcb56895..df96e0c27c7 100644 --- a/boards/nordic/thingy52/thingy52_nrf52832-pinctrl.dtsi +++ b/boards/nordic/thingy52/thingy52_nrf52832-pinctrl.dtsi @@ -48,5 +48,4 @@ low-power-enable; }; }; - }; diff --git a/boards/nordic/thingy52/thingy52_nrf52832.dts b/boards/nordic/thingy52/thingy52_nrf52832.dts index 9db5f67c486..e081ae877ce 100644 --- a/boards/nordic/thingy52/thingy52_nrf52832.dts +++ b/boards/nordic/thingy52/thingy52_nrf52832.dts @@ -37,26 +37,27 @@ leds { compatible = "gpio-leds"; + /* Lightwell RGB */ led0: led_0 { gpios = <&sx1509b 7 GPIO_ACTIVE_LOW>; label = "Red LED"; - //vin-supply = <&vdd_pwr>; }; + led1: led_1 { gpios = <&sx1509b 5 GPIO_ACTIVE_LOW>; label = "Green LED"; - //vin-supply = <&vdd_pwr>; }; + led2: led_2 { gpios = <&sx1509b 6 GPIO_ACTIVE_LOW>; label = "Blue LED"; - //vin-supply = <&vdd_pwr>; }; }; buttons { compatible = "gpio-keys"; + button0: button_0 { /* gpio flags need validation */ gpios = <&gpio0 11 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; @@ -138,10 +139,10 @@ compatible = "nordic,nrf-twim"; status = "okay"; clock-frequency = ; - pinctrl-0 = <&i2c0_default>; pinctrl-1 = <&i2c0_sleep>; pinctrl-names = "default", "sleep"; + sx1509b: sx1509b@3e { compatible = "semtech,sx1509b"; reg = <0x3e>; @@ -181,10 +182,10 @@ compatible = "nordic,nrf-twim"; status = "okay"; clock-frequency = ; - pinctrl-0 = <&i2c1_default>; pinctrl-1 = <&i2c1_sleep>; pinctrl-names = "default", "sleep"; + lis2dh12: lis2dh12@19 { compatible = "st,lis2dh12", "st,lis2dh"; reg = <0x19>; @@ -202,14 +203,17 @@ label = "mcuboot"; reg = <0x00000000 0xc000>; }; + slot0_partition: partition@c000 { label = "image-0"; reg = <0x0000C000 0x32000>; }; + slot1_partition: partition@3e000 { label = "image-1"; reg = <0x0003E000 0x32000>; }; + scratch_partition: partition@70000 { label = "image-scratch"; reg = <0x00070000 0xa000>; diff --git a/boards/nordic/thingy53/thingy53_nrf5340_common-pinctrl.dtsi b/boards/nordic/thingy53/thingy53_nrf5340_common-pinctrl.dtsi index 2a9fa480bab..75fe378a40f 100644 --- a/boards/nordic/thingy53/thingy53_nrf5340_common-pinctrl.dtsi +++ b/boards/nordic/thingy53/thingy53_nrf5340_common-pinctrl.dtsi @@ -125,5 +125,4 @@ low-power-enable; }; }; - }; diff --git a/boards/nordic/thingy53/thingy53_nrf5340_common.dtsi b/boards/nordic/thingy53/thingy53_nrf5340_common.dtsi index e531b578323..e7079b16c72 100644 --- a/boards/nordic/thingy53/thingy53_nrf5340_common.dtsi +++ b/boards/nordic/thingy53/thingy53_nrf5340_common.dtsi @@ -17,11 +17,13 @@ buttons { compatible = "gpio-keys"; + button0: button_0 { gpios = <&gpio1 14 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; label = "Push button 1"; zephyr,code = ; }; + button1: button_1 { gpios = <&gpio1 13 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; label = "Push button 2"; @@ -31,14 +33,17 @@ leds { compatible = "gpio-leds"; + red_led: led_1 { gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>; label = "RGB red LED"; }; + green_led: led_2 { gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>; label = "RGB green LED"; }; + blue_led: led_3 { gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>; label = "RGB blue LED"; @@ -47,6 +52,7 @@ pwmleds { compatible = "pwm-leds"; + red_led_pwm: led_pwm_0 { pwms = <&pwm0 0 PWM_MSEC(20) PWM_POLARITY_NORMAL>; label = "Red PWM LED"; @@ -118,6 +124,7 @@ gpio_fwd: nrf-gpio-forwarder { compatible = "nordic,nrf-gpio-forwarder"; status = "okay"; + fem-gpio-if { gpios = <&gpio1 11 0>, <&gpio1 12 0>, @@ -130,6 +137,7 @@ spi_fwd: nrf-spi-forwarder { compatible = "nordic,nrf-gpio-forwarder"; status = "disabled"; + fem-spi-if { gpios = <&gpio0 24 0>, <&gpio0 29 0>, @@ -207,10 +215,10 @@ compatible = "nordic,nrf-twim"; status = "okay"; clock-frequency = ; - pinctrl-0 = <&i2c1_default>; pinctrl-1 = <&i2c1_sleep>; pinctrl-names = "default", "sleep"; + bmm150: bmm150@10 { compatible = "bosch,bmm150"; reg = <0x10>; @@ -234,10 +242,10 @@ cs-gpios = <&gpio0 22 GPIO_ACTIVE_LOW>, <&gpio1 4 GPIO_ACTIVE_LOW>, <&gpio0 24 GPIO_ACTIVE_LOW>; - pinctrl-0 = <&spi3_default>; pinctrl-1 = <&spi3_sleep>; pinctrl-names = "default", "sleep"; + adxl362: spi-dev-adxl362@0 { compatible = "adi,adxl362"; spi-max-frequency = <8000000>; @@ -275,6 +283,7 @@ pinctrl-0 = <&qspi_default>; pinctrl-1 = <&qspi_sleep>; pinctrl-names = "default", "sleep"; + mx25r64: mx25r6435f@0 { compatible = "nordic,qspi-nor"; reg = <0>; diff --git a/boards/nordic/thingy53/thingy53_nrf5340_cpunet.dts b/boards/nordic/thingy53/thingy53_nrf5340_cpunet.dts index 3003d4924ce..efbf1d27815 100644 --- a/boards/nordic/thingy53/thingy53_nrf5340_cpunet.dts +++ b/boards/nordic/thingy53/thingy53_nrf5340_cpunet.dts @@ -29,11 +29,13 @@ buttons { compatible = "gpio-keys"; + button0: button_0 { gpios = <&gpio1 14 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; label = "Push button 1"; zephyr,code = ; }; + button1: button_1 { gpios = <&gpio1 13 (GPIO_PULL_UP | GPIO_ACTIVE_LOW)>; label = "Push button 2"; @@ -43,14 +45,17 @@ leds { compatible = "gpio-leds"; + red_led: led_1 { gpios = <&gpio1 8 (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>; label = "RGB red LED"; }; + green_led: led_2 { gpios = <&gpio1 6 (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>; label = "RGB green LED"; }; + blue_led: led_3 { gpios = <&gpio1 7 (GPIO_PULL_DOWN | GPIO_ACTIVE_HIGH)>; label = "RGB blue LED"; @@ -60,8 +65,8 @@ nrf_radio_fem: fem { compatible = "nordic,nrf21540-fem"; rx-en-gpios = <&gpio1 11 GPIO_ACTIVE_HIGH>; - mode-gpios = <&gpio1 12 GPIO_ACTIVE_HIGH>; - pdn-gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>; + mode-gpios = <&gpio1 12 GPIO_ACTIVE_HIGH>; + pdn-gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>; tx-en-gpios = <&gpio0 30 GPIO_ACTIVE_HIGH>; spi-if = <&nrf_radio_fem_spi>; supply-voltage-mv = <3000>; @@ -136,7 +141,6 @@ fem_spi: &spi0 { }; &flash1 { - partitions { compatible = "fixed-partitions"; #address-cells = <1>; @@ -146,18 +150,22 @@ fem_spi: &spi0 { label = "mcuboot"; reg = <0x00000000 0xc000>; }; + slot0_partition: partition@c000 { label = "image-0"; reg = <0x0000C000 0x12000>; }; + slot1_partition: partition@1e000 { label = "image-1"; reg = <0x0001E000 0x12000>; }; + scratch_partition: partition@30000 { label = "image-scratch"; reg = <0x00030000 0xa000>; }; + storage_partition: partition@3a000 { label = "storage"; reg = <0x0003a000 0x6000>;