From e3128550ff1ea710639c62dbb740ebd1dfa29b5d Mon Sep 17 00:00:00 2001 From: Jaska Uimonen Date: Tue, 29 Nov 2022 14:03:44 +0200 Subject: [PATCH 1/2] tgl: ipc4: zephyr: move to native drivers Set tgl ipc4 overlays to use zephyr native drivers. Signed-off-by: Jaska Uimonen --- app/overlays/tgl-h/ipc4_overlay.conf | 27 +++++++++++++++++++++++++++ app/overlays/tgl/ipc4_overlay.conf | 27 +++++++++++++++++++++++++++ 2 files changed, 54 insertions(+) diff --git a/app/overlays/tgl-h/ipc4_overlay.conf b/app/overlays/tgl-h/ipc4_overlay.conf index 64dd4207df96..975e03a1291f 100644 --- a/app/overlays/tgl-h/ipc4_overlay.conf +++ b/app/overlays/tgl-h/ipc4_overlay.conf @@ -20,3 +20,30 @@ CONFIG_ZEPHYR_LOG=y CONFIG_LOG_BACKEND_ADSP_MTRACE=y CONFIG_LOG_BACKEND_ADSP=n CONFIG_LOG_OUTPUT_FORMAT_LINUX_TIMESTAMP=y + +CONFIG_INTEL_ADSP_TIMER=y +CONFIG_FORMAT_CONVERT_HIFI3=n + +CONFIG_PM=y +CONFIG_PM_DEVICE=y +CONFIG_PM_DEVICE_RUNTIME=y + +CONFIG_ZEPHYR_NATIVE_DRIVERS=y +CONFIG_DAI=y +CONFIG_DAI_INIT_PRIORITY=70 +CONFIG_DAI_INTEL_SSP=y +CONFIG_DAI_INTEL_DMIC=y +CONFIG_DAI_INTEL_ALH=y +CONFIG_DAI_INTEL_DMIC_NHLT=y +CONFIG_DAI_INTEL_HDA=y +CONFIG_DAI_DMIC_HW_IOCLK=38400000 + +CONFIG_INTEL_ADSP_IPC=y + +CONFIG_DMA=y +CONFIG_DMA_DW_LLI_POOL_SIZE=100 +CONFIG_DMA_DW_HW_LLI=y +CONFIG_DMA_DW_FIFO_PARTITION=y +CONFIG_DMA_INTEL_ADSP_GPDMA_HAS_LLP=y + +CONFIG_HEAP_MEM_POOL_SIZE=8192 \ No newline at end of file diff --git a/app/overlays/tgl/ipc4_overlay.conf b/app/overlays/tgl/ipc4_overlay.conf index 64dd4207df96..975e03a1291f 100644 --- a/app/overlays/tgl/ipc4_overlay.conf +++ b/app/overlays/tgl/ipc4_overlay.conf @@ -20,3 +20,30 @@ CONFIG_ZEPHYR_LOG=y CONFIG_LOG_BACKEND_ADSP_MTRACE=y CONFIG_LOG_BACKEND_ADSP=n CONFIG_LOG_OUTPUT_FORMAT_LINUX_TIMESTAMP=y + +CONFIG_INTEL_ADSP_TIMER=y +CONFIG_FORMAT_CONVERT_HIFI3=n + +CONFIG_PM=y +CONFIG_PM_DEVICE=y +CONFIG_PM_DEVICE_RUNTIME=y + +CONFIG_ZEPHYR_NATIVE_DRIVERS=y +CONFIG_DAI=y +CONFIG_DAI_INIT_PRIORITY=70 +CONFIG_DAI_INTEL_SSP=y +CONFIG_DAI_INTEL_DMIC=y +CONFIG_DAI_INTEL_ALH=y +CONFIG_DAI_INTEL_DMIC_NHLT=y +CONFIG_DAI_INTEL_HDA=y +CONFIG_DAI_DMIC_HW_IOCLK=38400000 + +CONFIG_INTEL_ADSP_IPC=y + +CONFIG_DMA=y +CONFIG_DMA_DW_LLI_POOL_SIZE=100 +CONFIG_DMA_DW_HW_LLI=y +CONFIG_DMA_DW_FIFO_PARTITION=y +CONFIG_DMA_INTEL_ADSP_GPDMA_HAS_LLP=y + +CONFIG_HEAP_MEM_POOL_SIZE=8192 \ No newline at end of file From 782763f0794787ae083c473070a60c625be2f786 Mon Sep 17 00:00:00 2001 From: Jaska Uimonen Date: Tue, 29 Nov 2022 14:04:24 +0200 Subject: [PATCH 2/2] west.yaml: upgrade Zephyr to stable2.4 Upgrade Zephyr to stable2.4 branch in thesofproject, which has cherry-picked hda dai not yet in zephyr upstream. Other changes only from zephyr upstream. bd60b9289a635 hda dai 063984d0b8dec zephyr upstream main Signed-off-by: Jaska Uimonen --- west.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/west.yml b/west.yml index 0425905a276e..b04231d97c1a 100644 --- a/west.yml +++ b/west.yml @@ -43,8 +43,8 @@ manifest: - name: zephyr repo-path: zephyr - revision: 7ac69dc4ca95dcf7375a21c24aa4af22b34d6fa7 - remote: zephyrproject + revision: bd60b9289a635aedf80fc997e6b2a2de56fe5786 + remote: thesofproject # Import some projects listed in zephyr/west.yml@revision # # Warning: changes to zephyr/west.yml or to any other _imported_