From 99fea0ed7c87a2a61a6ff9b8a689c991fa23856e Mon Sep 17 00:00:00 2001 From: Kai Vehmanen Date: Mon, 5 Jun 2023 15:29:05 +0300 Subject: [PATCH 1/2] west.yml: update Zephyr to 3.4.0-rc2 Forward Zephyr to commit 2ad1a24fd60d0df8cb45fb6ed6acf7b0d3820754 . Contains 566 commits, including following: dd09b04dc33e boards: xtensa: update rimage and west sign documentation d98a7c2f8ddb soc: xtensa: cmake: add new WEST_SIGN_OPTS variable 794dff37754f boards: xtensa: mention the $HOME/.flexlmrc file alternative ac3cafa2edd8 boards: xtensa: remove UP2 from README file aa5b66be5f1f intel_adsp: cavs25: configure access to ALH 8e3437461d78 soc: intel_adsp: remove obsolete headers for cAVS platforms 44415eb881c8 intel_adsp: Initialize threadptr register 1c130d006099 arch: xtensa: Enable builds without the multithreading f0b7c275bba9 boards: xtensa: intel_adsp_generic.rst: fix cAVS meaning 49c7aa56fa0c soc: intel_adsp: undefine NOP32 445f4e887712 arch/xtensa: undefine NOP32 Signed-off-by: Kai Vehmanen --- west.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/west.yml b/west.yml index 6d13bba0cca4..900d4e321b73 100644 --- a/west.yml +++ b/west.yml @@ -45,7 +45,7 @@ manifest: - name: zephyr repo-path: zephyr - revision: 7d54586751cfe405d2cdcfd850f8100bc9844f63 + revision: 2ad1a24fd60d0df8cb45fb6ed6acf7b0d3820754 remote: zephyrproject # Import some projects listed in zephyr/west.yml@revision From 5e2f53f53aeeff39929f180ebe84a1adeb14e79c Mon Sep 17 00:00:00 2001 From: Kai Vehmanen Date: Wed, 26 Apr 2023 18:32:24 +0300 Subject: [PATCH 2/2] platform: cavs: do not program GPDMA/ALH ownership in Zephyr builds If SOF is built with Zephyr, the GPDMA/ALH ownership programming should happen in Zephyr platform code, not on SOF side. Link: https://github.com/zephyrproject-rtos/zephyr/pull/55738 Closes: https://github.com/thesofproject/sof/issues/7249 Signed-off-by: Kai Vehmanen --- src/platform/intel/cavs/platform.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/platform/intel/cavs/platform.c b/src/platform/intel/cavs/platform.c index aae799b58db1..5e0691dedce9 100644 --- a/src/platform/intel/cavs/platform.c +++ b/src/platform/intel/cavs/platform.c @@ -336,6 +336,7 @@ static void platform_init_hw(void) io_reg_write(DSP_INIT_IOPO, IOPO_DMIC_FLAG | IOPO_I2S_FLAG); +#ifndef __ZEPHYR__ io_reg_write(DSP_INIT_ALHO, ALHO_ASO_FLAG | ALHO_CSO_FLAG); @@ -343,6 +344,7 @@ static void platform_init_hw(void) LPGPDMA_CHOSEL_FLAG | LPGPDMA_CTLOSEL_FLAG); io_reg_write(DSP_INIT_LPGPDMA(1), LPGPDMA_CHOSEL_FLAG | LPGPDMA_CTLOSEL_FLAG); +#endif } /* Runs on the primary core only */