diff --git a/src/platform/Kconfig b/src/platform/Kconfig index 68633616a7d8..ce972d1d9fc8 100644 --- a/src/platform/Kconfig +++ b/src/platform/Kconfig @@ -339,11 +339,7 @@ config CAVS bool default n select INTEL - select XT_INTERRUPT_LEVEL_2 - select XT_INTERRUPT_LEVEL_5 select INTEL_MN - select WAKEUP_HOOK - select SCHEDULE_DMA_SINGLE_CHANNEL config CAVS_VERSION_2_5 depends on CAVS diff --git a/src/platform/ace30/include/platform/lib/dma.h b/src/platform/ace30/include/platform/lib/dma.h deleted file mode 100644 index 48a37b2b635a..000000000000 --- a/src/platform/ace30/include/platform/lib/dma.h +++ /dev/null @@ -1,23 +0,0 @@ -/* SPDX-License-Identifier: BSD-3-Clause - * - * Copyright(c) 2022-2024 Intel Corporation. - */ - -#ifdef __SOF_LIB_DMA_H__ - -#ifndef __PLATFORM_LIB_DMA_H__ -#define __PLATFORM_LIB_DMA_H__ - -/* max number of supported DMA channels */ -#define PLATFORM_MAX_DMA_CHAN 9 - -/* number of supported DMACs */ -#define PLATFORM_NUM_DMACS 6 - -#endif /* __PLATFORM_LIB_DMA_H__ */ - -#else - -#error "This file shouldn't be included from outside of sof/lib/dma.h" - -#endif /* __SOF_LIB_DMA_H__ */ diff --git a/src/platform/lunarlake/include/platform/lib/dma.h b/src/platform/lunarlake/include/platform/lib/dma.h deleted file mode 100644 index c820f6e2c9e9..000000000000 --- a/src/platform/lunarlake/include/platform/lib/dma.h +++ /dev/null @@ -1,20 +0,0 @@ -/* SPDX-License-Identifier: BSD-3-Clause - * - * Copyright(c) 2023 Intel Corporation. All rights reserved. - */ - -#ifdef __SOF_LIB_DMA_H__ - -#ifndef __PLATFORM_LIB_DMA_H__ -#define __PLATFORM_LIB_DMA_H__ - -/* max number of supported DMA channels */ -#define PLATFORM_MAX_DMA_CHAN 11 - -#endif /* __PLATFORM_LIB_DMA_H__ */ - -#else - -#error "This file shouldn't be included from outside of sof/lib/dma.h" - -#endif /* __SOF_LIB_DMA_H__ */ diff --git a/src/platform/meteorlake/include/platform/lib/dma.h b/src/platform/meteorlake/include/platform/lib/dma.h deleted file mode 100644 index ca10b4937c99..000000000000 --- a/src/platform/meteorlake/include/platform/lib/dma.h +++ /dev/null @@ -1,23 +0,0 @@ -/* SPDX-License-Identifier: BSD-3-Clause - * - * Copyright(c) 2022 Intel Corporation. All rights reserved. - */ - -#ifdef __SOF_LIB_DMA_H__ - -#ifndef __PLATFORM_LIB_DMA_H__ -#define __PLATFORM_LIB_DMA_H__ - -/* max number of supported DMA channels */ -#define PLATFORM_MAX_DMA_CHAN 9 - -/* number of supported DMACs */ -#define PLATFORM_NUM_DMACS 6 - -#endif /* __PLATFORM_LIB_DMA_H__ */ - -#else - -#error "This file shouldn't be included from outside of sof/lib/dma.h" - -#endif /* __SOF_LIB_DMA_H__ */ diff --git a/src/platform/tigerlake/include/platform/lib/dma.h b/src/platform/tigerlake/include/platform/lib/dma.h deleted file mode 100644 index 4dfae664ae11..000000000000 --- a/src/platform/tigerlake/include/platform/lib/dma.h +++ /dev/null @@ -1,66 +0,0 @@ -/* SPDX-License-Identifier: BSD-3-Clause - * - * Copyright(c) 2017 Intel Corporation. All rights reserved. - * - * Author: Liam Girdwood - * Keyon Jie - * Rander Wang - */ - -#ifdef __SOF_LIB_DMA_H__ - -#ifndef __PLATFORM_LIB_DMA_H__ -#define __PLATFORM_LIB_DMA_H__ - -/* number of supported DMACs */ -#define PLATFORM_NUM_DMACS 6 - -/* max number of supported DMA channels */ -#define PLATFORM_MAX_DMA_CHAN 9 - -/* available DMACs */ -#define DMA_GP_LP_DMAC0 0 -#define DMA_GP_LP_DMAC1 1 -#define DMA_GP_HP_DMAC0 2 -#define DMA_GP_HP_DMAC1 3 -#define DMA_HOST_IN_DMAC 4 -#define DMA_HOST_OUT_DMAC 5 -#define DMA_LINK_IN_DMAC 6 -#define DMA_LINK_OUT_DMAC 7 - -/* mappings - TODO improve API to get type */ -#define DMA_ID_DMAC0 DMA_HOST_IN_DMAC -#define DMA_ID_DMAC1 DMA_GP_LP_DMAC0 -#define DMA_ID_DMAC2 DMA_HOST_OUT_DMAC -#define DMA_ID_DMAC3 DMA_GP_HP_DMAC0 -#define DMA_ID_DMAC4 DMA_GP_LP_DMAC1 -#define DMA_ID_DMAC5 DMA_GP_HP_DMAC1 -#define DMA_ID_DMAC6 DMA_LINK_IN_DMAC -#define DMA_ID_DMAC7 DMA_LINK_OUT_DMAC - -/* handshakes */ -#define DMA_HANDSHAKE_DMIC_CH0 0 -#define DMA_HANDSHAKE_DMIC_CH1 1 -#define DMA_HANDSHAKE_SSP0_TX 2 -#define DMA_HANDSHAKE_SSP0_RX 3 -#define DMA_HANDSHAKE_SSP1_TX 4 -#define DMA_HANDSHAKE_SSP1_RX 5 -#define DMA_HANDSHAKE_SSP2_TX 6 -#define DMA_HANDSHAKE_SSP2_RX 7 -#define DMA_HANDSHAKE_SSP3_TX 8 -#define DMA_HANDSHAKE_SSP3_RX 9 -#define DMA_HANDSHAKE_SSP4_TX 10 -#define DMA_HANDSHAKE_SSP4_RX 11 -#define DMA_HANDSHAKE_SSP5_TX 12 -#define DMA_HANDSHAKE_SSP5_RX 13 - -#define dma_chan_irq(dma, chan) dma_irq(dma) -#define dma_chan_irq_name(dma, chan) dma_irq_name(dma) - -#endif /* __PLATFORM_LIB_DMA_H__ */ - -#else - -#error "This file shouldn't be included from outside of sof/lib/dma.h" - -#endif /* __SOF_LIB_DMA_H__ */ diff --git a/zephyr/include/sof/lib/dma.h b/zephyr/include/sof/lib/dma.h index 652c345979e3..6a25c81321ac 100644 --- a/zephyr/include/sof/lib/dma.h +++ b/zephyr/include/sof/lib/dma.h @@ -6,7 +6,18 @@ #ifndef __SOF_LIB_DMA_H__ #define __SOF_LIB_DMA_H__ +#if defined(CONFIG_SCHEDULE_DMA_MULTI_CHANNEL) || \ + defined(CONFIG_SCHEDULE_DMA_SINGLE_CHANNEL) +/* + * The platform/lib/dma.h definitions are only needed + * when using old dma_{single,multi}_chan_domain + * implementations. For new SOF build targets, it is + * recommended to use CONFIG_DMA_DOMAIN instead if + * DMA-driven scheduling is needed. + */ #include +#endif + #include #include #include