feat(zephyr): cyclic DMA buffer for UART from upstream zephyr

with fixes watchdog can be initialized only once, by our libray adc node property: <SYNC> became "SYNC" Signed-off-by: Cyril Fougeray <[email protected]>
worldcoin · Jan 20, 2025 · 99386b2 · 99386b2
1 parent 41290be
commit 99386b2
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 11 deletions.
diff --git a/.github/workflows/twister_native.yml b/.github/workflows/twister_native.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Twister unit tests
         run: |
           cd ${{ github.job }}
-          if ! ./zephyr/scripts/twister -T orb/main_board -vv -c -p unit_testing; then
+          if ! ./zephyr/scripts/twister -T orb/main_board -A orb/main_board -vv -c -p unit_testing; then
             find twister-out/ \( -name 'build.log' -o -name 'handler.log' -o -name 'device.log' \) -exec cat {} \;
             false
           fi

diff --git a/boards/tfh/diamond_main/diamond_main.dts b/boards/tfh/diamond_main/diamond_main.dts
@@ -521,7 +521,7 @@
     status = "okay";
     pinctrl-0 = <&adc1_in1_pa0 &adc1_in2_pa1 &adc1_in3_pa2 &adc1_in7_pc1 &adc1_in8_pc2 &adc1_in9_pc3 &adc1_in11_pb12 &adc1_in14_pb11>;
     pinctrl-names = "default";
-    st,adc-clock-source = <SYNC>;
+    st,adc-clock-source = "SYNC";
     st,adc-prescaler = <4>;
     vref-mv = <2048>;
 
@@ -621,7 +621,7 @@
     status = "okay";
     pinctrl-0 = <&adc3_in10_pd13 &adc3_in11_pd14>;
     pinctrl-names = "default";
-    st,adc-clock-source = <SYNC>;
+    st,adc-clock-source = "SYNC";
     st,adc-prescaler = <4>;
     vref-mv = <2048>;
 
@@ -665,7 +665,7 @@
     status = "okay";
     pinctrl-0 = <&adc4_in1_pe14 &adc4_in2_pe15>;
     pinctrl-names = "default";
-    st,adc-clock-source = <SYNC>;
+    st,adc-clock-source = "SYNC";
     st,adc-prescaler = <4>;
     vref-mv = <2048>;
 
@@ -697,7 +697,7 @@
     status = "okay";
     pinctrl-0 = <&adc5_in7_pd10 &adc5_in8_pd11 &adc5_in9_pd12 &adc5_in12_pd8 &adc5_in13_pd9 &adc5_in14_pe10 &adc5_in15_pe11>;
     pinctrl-names = "default";
-    st,adc-clock-source = <SYNC>;
+    st,adc-clock-source = "SYNC";
     st,adc-prescaler = <4>;
     vref-mv = <2048>;
 
@@ -929,9 +929,10 @@
     current-speed = <1000000>;
     status = "okay";
 
-    dmas = <&dma1 3 LL_DMAMUX_REQ_USART1_RX ((DMA_DIR_PERIPH_TO_MEM << DMA_CONFIG_DIR_SHIFT) | (1 << DMA_MEM_INC_ADDR_SHIFT) | (1 << DMA_CONFIG_CYCLIC_SHIFT))>,
-           <&dma1 4 LL_DMAMUX_REQ_USART1_TX ((DMA_DIR_MEM_TO_PERIPH << DMA_CONFIG_DIR_SHIFT) | (1 << DMA_MEM_INC_ADDR_SHIFT) | (1 << DMA_CONFIG_CYCLIC_SHIFT))>;
+    dmas = <&dma1 3 LL_DMAMUX_REQ_USART1_RX (STM32_DMA_PERIPH_RX | STM32_DMA_MEM_8BITS | STM32_DMA_MODE_CYCLIC)>,
+           <&dma1 4 LL_DMAMUX_REQ_USART1_TX (STM32_DMA_PERIPH_TX)>;
     dma-names = "rx", "tx";
+    fifo-enable;
 };
 
 // debug

diff --git a/boards/tfh/pearl_main/pearl_main.dts b/boards/tfh/pearl_main/pearl_main.dts
@@ -259,7 +259,7 @@
     status = "okay";
     pinctrl-0 = <&adc1_in1_pa0 &adc1_in7_pc1 &adc1_in8_pc2 &adc1_in9_pc3 &adc1_in11_pb12>;
     pinctrl-names = "default";
-    st,adc-clock-source = <SYNC>;
+    st,adc-clock-source = "SYNC";
     st,adc-prescaler = <4>;
     vref-mv = <3300>;
 
@@ -335,7 +335,7 @@
     status = "okay";
     pinctrl-0 = <&adc3_in10_pd13 &adc3_in11_pd14>;
     pinctrl-names = "default";
-    st,adc-clock-source = <SYNC>;
+    st,adc-clock-source = "SYNC";
     st,adc-prescaler = <4>;
     vref-mv = <3300>;
 
@@ -378,7 +378,7 @@
     status = "okay";
     pinctrl-0 = <&adc5_in7_pd10 &adc5_in8_pd11 &adc5_in9_pd12 &adc5_in13_pd9>;
     pinctrl-names = "default";
-    st,adc-clock-source = <SYNC>;
+    st,adc-clock-source = "SYNC";
     st,adc-prescaler = <4>;
     vref-mv = <3300>;
 

diff --git a/lib/watchdog/Kconfig b/lib/watchdog/Kconfig
@@ -1,5 +1,6 @@
 config ORB_LIB_WATCHDOG
     bool "Watchdog library"
+    select WDT_DISABLE_AT_BOOT
     depends on WATCHDOG
 
 if ORB_LIB_WATCHDOG

diff --git a/west.yml b/west.yml
@@ -8,7 +8,7 @@ manifest:
     remote: worldcoin
   projects:
     - name: zephyr
-      revision: 8469084dfae85f854555f0607f2c838dad097235 # 4.0.0
+      revision: 9525c0a650f27b45c616b3d3633d471701ad8d05
       import:
         name-allowlist:
           - cmsis