From 88b24c0157ed19586e6cd39c878069be73e95151 Mon Sep 17 00:00:00 2001 From: Maciej Baczmanski Date: Thu, 13 Feb 2025 10:18:20 +0100 Subject: [PATCH] Revert "samples: matter: remove `zephyr,priority` phandle" IPC has been switched back to rpmsg. Revert alignment change. This reverts commit e7055e7e2e614ee4a15bd01ae86fafaaffcbe0d4. Signed-off-by: Maciej Baczmanski --- .../matter_bridge/boards/nrf5340dk_nrf5340_cpuapp.overlay | 5 +++++ applications/matter_weather_station/app.overlay | 5 +++++ .../light_bulb/boards/nrf5340dk_nrf5340_cpuapp.overlay | 5 +++++ .../light_bulb/boards/nrf7002dk_nrf5340_cpuapp.overlay | 5 +++++ .../light_switch/boards/nrf5340dk_nrf5340_cpuapp.overlay | 5 +++++ .../light_switch/boards/nrf7002dk_nrf5340_cpuapp.overlay | 5 +++++ samples/matter/lock/boards/nrf5340dk_nrf5340_cpuapp.overlay | 5 +++++ samples/matter/lock/boards/nrf7002dk_nrf5340_cpuapp.overlay | 5 +++++ .../lock/boards/nrf7002dk_nrf5340_cpuapp_nrf7001.overlay | 5 +++++ .../smoke_co_alarm/boards/nrf5340dk_nrf5340_cpuapp.overlay | 5 +++++ .../matter/template/boards/nrf5340dk_nrf5340_cpuapp.overlay | 5 +++++ .../matter/template/boards/nrf7002dk_nrf5340_cpuapp.overlay | 5 +++++ .../window_covering/boards/nrf5340dk_nrf5340_cpuapp.overlay | 5 +++++ 13 files changed, 65 insertions(+) diff --git a/applications/matter_bridge/boards/nrf5340dk_nrf5340_cpuapp.overlay b/applications/matter_bridge/boards/nrf5340dk_nrf5340_cpuapp.overlay index a9a324ae42ac..d941f278a4d7 100644 --- a/applications/matter_bridge/boards/nrf5340dk_nrf5340_cpuapp.overlay +++ b/applications/matter_bridge/boards/nrf5340dk_nrf5340_cpuapp.overlay @@ -12,6 +12,11 @@ }; }; +/* Set IPC thread priority to the highest value to not collide with other threads. */ +&ipc0 { + zephyr,priority = <0 PRIO_COOP>; +}; + /* Disable unused peripherals to reduce power consumption */ &adc { status = "disabled"; diff --git a/applications/matter_weather_station/app.overlay b/applications/matter_weather_station/app.overlay index 3850c2657e65..6ad93e4cb38d 100644 --- a/applications/matter_weather_station/app.overlay +++ b/applications/matter_weather_station/app.overlay @@ -65,6 +65,11 @@ }; }; +/* Set IPC thread priority to the highest value to not collide with other threads. */ +&ipc0 { + zephyr,priority = <0 PRIO_COOP>; +}; + &i2c1 { bme688@76 { compatible = "bosch,bme680"; diff --git a/samples/matter/light_bulb/boards/nrf5340dk_nrf5340_cpuapp.overlay b/samples/matter/light_bulb/boards/nrf5340dk_nrf5340_cpuapp.overlay index 2b5e970e0e6f..77d60d7e72ee 100644 --- a/samples/matter/light_bulb/boards/nrf5340dk_nrf5340_cpuapp.overlay +++ b/samples/matter/light_bulb/boards/nrf5340dk_nrf5340_cpuapp.overlay @@ -28,6 +28,11 @@ }; }; +/* Set IPC thread priority to the highest value to not collide with other threads. */ +&ipc0 { + zephyr,priority = <0 PRIO_COOP>; +}; + &pwm0 { pinctrl-0 = <&pwm0_default_alt>; pinctrl-1 = <&pwm0_sleep_alt>; diff --git a/samples/matter/light_bulb/boards/nrf7002dk_nrf5340_cpuapp.overlay b/samples/matter/light_bulb/boards/nrf7002dk_nrf5340_cpuapp.overlay index 5d12a3842fb8..fe746730297a 100644 --- a/samples/matter/light_bulb/boards/nrf7002dk_nrf5340_cpuapp.overlay +++ b/samples/matter/light_bulb/boards/nrf7002dk_nrf5340_cpuapp.overlay @@ -29,6 +29,11 @@ }; }; +/* Set IPC thread priority to the highest value to not collide with other threads. */ +&ipc0 { + zephyr,priority = <0 PRIO_COOP>; +}; + &pwm0 { pinctrl-0 = <&pwm0_default_alt>; pinctrl-1 = <&pwm0_sleep_alt>; diff --git a/samples/matter/light_switch/boards/nrf5340dk_nrf5340_cpuapp.overlay b/samples/matter/light_switch/boards/nrf5340dk_nrf5340_cpuapp.overlay index 6f64906bedb1..b2f9923aa7e7 100644 --- a/samples/matter/light_switch/boards/nrf5340dk_nrf5340_cpuapp.overlay +++ b/samples/matter/light_switch/boards/nrf5340dk_nrf5340_cpuapp.overlay @@ -12,6 +12,11 @@ }; }; +/* Set IPC thread priority to the highest value to not collide with other threads. */ +&ipc0 { + zephyr,priority = <0 PRIO_COOP>; +}; + /* Disable unused peripherals to reduce power consumption */ &adc { status = "disabled"; diff --git a/samples/matter/light_switch/boards/nrf7002dk_nrf5340_cpuapp.overlay b/samples/matter/light_switch/boards/nrf7002dk_nrf5340_cpuapp.overlay index 91e8cd7a3411..280120007ef4 100644 --- a/samples/matter/light_switch/boards/nrf7002dk_nrf5340_cpuapp.overlay +++ b/samples/matter/light_switch/boards/nrf7002dk_nrf5340_cpuapp.overlay @@ -15,3 +15,8 @@ watchdog0 = &wdt0; }; }; + +/* Set IPC thread priority to the highest value to not collide with other threads. */ +&ipc0 { + zephyr,priority = <0 PRIO_COOP>; +}; diff --git a/samples/matter/lock/boards/nrf5340dk_nrf5340_cpuapp.overlay b/samples/matter/lock/boards/nrf5340dk_nrf5340_cpuapp.overlay index 6f64906bedb1..b2f9923aa7e7 100644 --- a/samples/matter/lock/boards/nrf5340dk_nrf5340_cpuapp.overlay +++ b/samples/matter/lock/boards/nrf5340dk_nrf5340_cpuapp.overlay @@ -12,6 +12,11 @@ }; }; +/* Set IPC thread priority to the highest value to not collide with other threads. */ +&ipc0 { + zephyr,priority = <0 PRIO_COOP>; +}; + /* Disable unused peripherals to reduce power consumption */ &adc { status = "disabled"; diff --git a/samples/matter/lock/boards/nrf7002dk_nrf5340_cpuapp.overlay b/samples/matter/lock/boards/nrf7002dk_nrf5340_cpuapp.overlay index 91e8cd7a3411..280120007ef4 100644 --- a/samples/matter/lock/boards/nrf7002dk_nrf5340_cpuapp.overlay +++ b/samples/matter/lock/boards/nrf7002dk_nrf5340_cpuapp.overlay @@ -15,3 +15,8 @@ watchdog0 = &wdt0; }; }; + +/* Set IPC thread priority to the highest value to not collide with other threads. */ +&ipc0 { + zephyr,priority = <0 PRIO_COOP>; +}; diff --git a/samples/matter/lock/boards/nrf7002dk_nrf5340_cpuapp_nrf7001.overlay b/samples/matter/lock/boards/nrf7002dk_nrf5340_cpuapp_nrf7001.overlay index 91e8cd7a3411..837e117d126a 100644 --- a/samples/matter/lock/boards/nrf7002dk_nrf5340_cpuapp_nrf7001.overlay +++ b/samples/matter/lock/boards/nrf7002dk_nrf5340_cpuapp_nrf7001.overlay @@ -15,3 +15,8 @@ watchdog0 = &wdt0; }; }; + +/* Set IPC thread priority to the highest value to not collide with other threads. */ +&ipc0 { + zephyr,priority = <0 PRIO_COOP>; +}; diff --git a/samples/matter/smoke_co_alarm/boards/nrf5340dk_nrf5340_cpuapp.overlay b/samples/matter/smoke_co_alarm/boards/nrf5340dk_nrf5340_cpuapp.overlay index 87390a483316..fe200de812e0 100644 --- a/samples/matter/smoke_co_alarm/boards/nrf5340dk_nrf5340_cpuapp.overlay +++ b/samples/matter/smoke_co_alarm/boards/nrf5340dk_nrf5340_cpuapp.overlay @@ -12,6 +12,11 @@ }; }; +/* Set IPC thread priority to the highest value to not collide with other threads. */ +&ipc0 { + zephyr,priority = <0 PRIO_COOP>; +}; + /* Disable unused peripherals to reduce power consumption */ &adc { status = "disabled"; diff --git a/samples/matter/template/boards/nrf5340dk_nrf5340_cpuapp.overlay b/samples/matter/template/boards/nrf5340dk_nrf5340_cpuapp.overlay index 6f64906bedb1..b2f9923aa7e7 100644 --- a/samples/matter/template/boards/nrf5340dk_nrf5340_cpuapp.overlay +++ b/samples/matter/template/boards/nrf5340dk_nrf5340_cpuapp.overlay @@ -12,6 +12,11 @@ }; }; +/* Set IPC thread priority to the highest value to not collide with other threads. */ +&ipc0 { + zephyr,priority = <0 PRIO_COOP>; +}; + /* Disable unused peripherals to reduce power consumption */ &adc { status = "disabled"; diff --git a/samples/matter/template/boards/nrf7002dk_nrf5340_cpuapp.overlay b/samples/matter/template/boards/nrf7002dk_nrf5340_cpuapp.overlay index 1f222f086634..79e4b79812f0 100644 --- a/samples/matter/template/boards/nrf7002dk_nrf5340_cpuapp.overlay +++ b/samples/matter/template/boards/nrf7002dk_nrf5340_cpuapp.overlay @@ -16,3 +16,8 @@ }; }; + +/* Set IPC thread priority to the highest value to not collide with other threads. */ +&ipc0 { + zephyr,priority = <0 PRIO_COOP>; +}; diff --git a/samples/matter/window_covering/boards/nrf5340dk_nrf5340_cpuapp.overlay b/samples/matter/window_covering/boards/nrf5340dk_nrf5340_cpuapp.overlay index dda97825f5d1..765764531f5e 100644 --- a/samples/matter/window_covering/boards/nrf5340dk_nrf5340_cpuapp.overlay +++ b/samples/matter/window_covering/boards/nrf5340dk_nrf5340_cpuapp.overlay @@ -31,6 +31,11 @@ }; }; +/* Set IPC thread priority to the highest value to not collide with other threads. */ +&ipc0 { + zephyr,priority = <0 PRIO_COOP>; +}; + /* Disable unused peripherals to reduce power consumption */ &adc { status = "disabled";