diff --git a/soc/soc_legacy/xtensa/intel_adsp/CMakeLists.txt b/soc/intel/intel_adsp/CMakeLists.txt similarity index 64% rename from soc/soc_legacy/xtensa/intel_adsp/CMakeLists.txt rename to soc/intel/intel_adsp/CMakeLists.txt index 2cee15bbcf6..eabae1f9b48 100644 --- a/soc/soc_legacy/xtensa/intel_adsp/CMakeLists.txt +++ b/soc/intel/intel_adsp/CMakeLists.txt @@ -1,13 +1,17 @@ # Intel ADSP SoCs family CMake file # -# Copyright (c) 2020 Intel Corporation +# Copyright (c) 2020-2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 +zephyr_include_directories(common) + add_subdirectory(common) if(CONFIG_SOC_SERIES_INTEL_ACE) + zephyr_include_directories(ace) add_subdirectory(ace) endif() if(CONFIG_INTEL_ADSP_CAVS) + zephyr_include_directories(cavs) add_subdirectory(cavs) endif() zephyr_include_directories(common/include) diff --git a/soc/soc_legacy/xtensa/intel_adsp/Kconfig b/soc/intel/intel_adsp/Kconfig similarity index 92% rename from soc/soc_legacy/xtensa/intel_adsp/Kconfig rename to soc/intel/intel_adsp/Kconfig index f5f533acf16..c1b150b2eff 100644 --- a/soc/soc_legacy/xtensa/intel_adsp/Kconfig +++ b/soc/intel/intel_adsp/Kconfig @@ -1,6 +1,6 @@ # Intel CAVS SoC family configuration options # -# Copyright (c) 2020 Intel Corporation +# Copyright (c) 2020-2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 config SOC_FAMILY_INTEL_ADSP @@ -9,16 +9,8 @@ config SOC_FAMILY_INTEL_ADSP select CPU_HAS_DCACHE select ARCH_HAS_USERSPACE if XTENSA_MMU select CPU_CACHE_INCOHERENT - bool - -if SOC_FAMILY_INTEL_ADSP -config SOC_FAMILY - string - default "intel_adsp" - -# Select SoC Part No. and configuration options -source "soc/soc_legacy/xtensa/intel_adsp/*/Kconfig.soc" +rsource "*/Kconfig" DT_COMPAT_INTEL_ADSP_HOST_IPC := intel,adsp-host-ipc DT_COMPAT_INTEL_ADSP_IDC := intel,adsp-idc @@ -134,5 +126,3 @@ config ADSP_IDLE_CLOCK_GATING HW configuration of a DSP. Evry time core goes to the WAITI state (wait for interrupt) during idle, the clock can be gated (however, this does not mean that this will happen). - -endif # SOC_FAMILY_INTEL_ADSP diff --git a/soc/soc_legacy/xtensa/intel_adsp/Kconfig.defconfig b/soc/intel/intel_adsp/Kconfig.defconfig similarity index 85% rename from soc/soc_legacy/xtensa/intel_adsp/Kconfig.defconfig rename to soc/intel/intel_adsp/Kconfig.defconfig index f196d727458..0fa4115c617 100644 --- a/soc/soc_legacy/xtensa/intel_adsp/Kconfig.defconfig +++ b/soc/intel/intel_adsp/Kconfig.defconfig @@ -1,11 +1,11 @@ # Intel CAVS SoC family default configuration options # -# Copyright (c) 2020 Intel Corporation +# Copyright (c) 2020-2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 if SOC_FAMILY_INTEL_ADSP -source "soc/soc_legacy/xtensa/intel_adsp/*/Kconfig.defconfig.series" +rsource "*/Kconfig.defconfig.series" config XTENSA_RPO_CACHE def_bool y diff --git a/soc/intel/intel_adsp/Kconfig.soc b/soc/intel/intel_adsp/Kconfig.soc new file mode 100644 index 00000000000..9df1c63e1a9 --- /dev/null +++ b/soc/intel/intel_adsp/Kconfig.soc @@ -0,0 +1,12 @@ +# Intel CAVS SoC series selection +# +# Copyright (c) 2020-2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + +config SOC_FAMILY_INTEL_ADSP + bool + +config SOC_FAMILY + default "intel_adsp" if SOC_FAMILY_INTEL_ADSP + +rsource "*/Kconfig.soc" diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/CMakeLists.txt b/soc/intel/intel_adsp/ace/CMakeLists.txt similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/ace/CMakeLists.txt rename to soc/intel/intel_adsp/ace/CMakeLists.txt diff --git a/soc/intel/intel_adsp/ace/Kconfig b/soc/intel/intel_adsp/ace/Kconfig new file mode 100644 index 00000000000..99c5380c3cb --- /dev/null +++ b/soc/intel/intel_adsp/ace/Kconfig @@ -0,0 +1,28 @@ +# Copyright (c) 2022-2024 Intel Corporation +# +# SPDX-License-Identifier: Apache-2.0 + +config SOC_SERIES_INTEL_ACE + select SOC_FAMILY_INTEL_ADSP + select XTENSA + select XTENSA_HAL if (("$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xcc") && ("$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xt-clang")) + select ATOMIC_OPERATIONS_BUILTIN if "$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xcc" + select ARCH_HAS_COHERENCE + select SCHED_IPI_SUPPORTED + select DW_ICTL_ACE + select SOC_HAS_RUNTIME_NUM_CPUS + select HAS_PM + +config SOC_INTEL_ACE15_MTPM + select SOC_SERIES_INTEL_ACE + +config SOC_INTEL_ACE20_LNL + select SOC_SERIES_INTEL_ACE + +config SOC_INTEL_COMM_WIDGET + bool "Intel Communication Widget driver" + default y + depends on DT_HAS_INTEL_ADSP_COMMUNICATION_WIDGET_ENABLED + help + Select this to enable Intel Communication Widget driver. + DSP Communication Widget is a device for generic sideband message transmit/receive. diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/Kconfig.defconfig.ace15_mtpm b/soc/intel/intel_adsp/ace/Kconfig.defconfig.ace15_mtpm similarity index 54% rename from soc/soc_legacy/xtensa/intel_adsp/ace/Kconfig.defconfig.ace15_mtpm rename to soc/intel/intel_adsp/ace/Kconfig.defconfig.ace15_mtpm index 937b3e2b3c5..83e283d1062 100644 --- a/soc/soc_legacy/xtensa/intel_adsp/ace/Kconfig.defconfig.ace15_mtpm +++ b/soc/intel/intel_adsp/ace/Kconfig.defconfig.ace15_mtpm @@ -1,13 +1,9 @@ -# Copyright (c) 2022 Intel Corporation +# Copyright (c) 2022-2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 if SOC_INTEL_ACE15_MTPM -config SOC - string - default "intel_ace15_mtpm" - config MP_MAX_NUM_CPUS default 3 diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/Kconfig.defconfig.ace20_lnl b/soc/intel/intel_adsp/ace/Kconfig.defconfig.ace20_lnl similarity index 54% rename from soc/soc_legacy/xtensa/intel_adsp/ace/Kconfig.defconfig.ace20_lnl rename to soc/intel/intel_adsp/ace/Kconfig.defconfig.ace20_lnl index 2dc9365ffb5..1891879de2b 100644 --- a/soc/soc_legacy/xtensa/intel_adsp/ace/Kconfig.defconfig.ace20_lnl +++ b/soc/intel/intel_adsp/ace/Kconfig.defconfig.ace20_lnl @@ -1,13 +1,9 @@ -# Copyright (c) 2022 Intel Corporation +# Copyright (c) 2022-2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 if SOC_INTEL_ACE20_LNL -config SOC - string - default "intel_ace20_lnl" - config MP_MAX_NUM_CPUS default 5 diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/Kconfig.defconfig.series b/soc/intel/intel_adsp/ace/Kconfig.defconfig.series similarity index 81% rename from soc/soc_legacy/xtensa/intel_adsp/ace/Kconfig.defconfig.series rename to soc/intel/intel_adsp/ace/Kconfig.defconfig.series index fe3a68280d5..2141a270c25 100644 --- a/soc/soc_legacy/xtensa/intel_adsp/ace/Kconfig.defconfig.series +++ b/soc/intel/intel_adsp/ace/Kconfig.defconfig.series @@ -1,16 +1,8 @@ -# Copyright (c) 2022 Intel Corporation +# Copyright (c) 2022-2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 if SOC_SERIES_INTEL_ACE -config SOC_SERIES - string - default "ace" - -config SOC_TOOLCHAIN_NAME - string - default "intel_ace15_mtpm" - config SMP default y @@ -68,6 +60,6 @@ config LOG_BACKEND_ADSP endif # LOG -source "soc/soc_legacy/xtensa/intel_adsp/ace/Kconfig.defconfig.ace*" +rsource "Kconfig.defconfig.ace*" endif # SOC_SERIES_INTEL_ACE diff --git a/soc/intel/intel_adsp/ace/Kconfig.soc b/soc/intel/intel_adsp/ace/Kconfig.soc new file mode 100644 index 00000000000..571a7699138 --- /dev/null +++ b/soc/intel/intel_adsp/ace/Kconfig.soc @@ -0,0 +1,28 @@ +# Copyright (c) 2022-2024 Intel Corporation +# +# SPDX-License-Identifier: Apache-2.0 + +config SOC_SERIES_INTEL_ACE + bool + help + Intel ADSP ACE + +config SOC_SERIES + default "ace" if SOC_SERIES_INTEL_ACE + +config SOC_TOOLCHAIN_NAME + default "intel_ace15_mtpm" if SOC_SERIES_INTEL_ACE + +config SOC_INTEL_ACE15_MTPM + bool + help + ACE 1.5 Meteor Lake PCH M + +config SOC_INTEL_ACE20_LNL + bool + help + ACE 2.0 Lunar Lake PCH + +config SOC + default "intel_ace15_mtpm" if SOC_INTEL_ACE15_MTPM + default "intel_ace20_lnl" if SOC_INTEL_ACE20_LNL diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/_soc_inthandlers.h b/soc/intel/intel_adsp/ace/_soc_inthandlers.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/ace/_soc_inthandlers.h rename to soc/intel/intel_adsp/ace/_soc_inthandlers.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/ace-link.ld b/soc/intel/intel_adsp/ace/ace-link.ld similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/ace/ace-link.ld rename to soc/intel/intel_adsp/ace/ace-link.ld diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/asm_memory_management.h b/soc/intel/intel_adsp/ace/asm_memory_management.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/ace/asm_memory_management.h rename to soc/intel/intel_adsp/ace/asm_memory_management.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/boot.c b/soc/intel/intel_adsp/ace/boot.c similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/ace/boot.c rename to soc/intel/intel_adsp/ace/boot.c diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/comm_widget.c b/soc/intel/intel_adsp/ace/comm_widget.c similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/ace/comm_widget.c rename to soc/intel/intel_adsp/ace/comm_widget.c diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/comm_widget.h b/soc/intel/intel_adsp/ace/comm_widget.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/ace/comm_widget.h rename to soc/intel/intel_adsp/ace/comm_widget.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/comm_widget_messages.c b/soc/intel/intel_adsp/ace/comm_widget_messages.c similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/ace/comm_widget_messages.c rename to soc/intel/intel_adsp/ace/comm_widget_messages.c diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/include/adsp_imr_layout.h b/soc/intel/intel_adsp/ace/include/adsp_imr_layout.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/ace/include/adsp_imr_layout.h rename to soc/intel/intel_adsp/ace/include/adsp_imr_layout.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/include/adsp_timestamp.h b/soc/intel/intel_adsp/ace/include/adsp_timestamp.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/ace/include/adsp_timestamp.h rename to soc/intel/intel_adsp/ace/include/adsp_timestamp.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/include/dmic_regs.h b/soc/intel/intel_adsp/ace/include/dmic_regs.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/ace/include/dmic_regs.h rename to soc/intel/intel_adsp/ace/include/dmic_regs.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/include/intel_ace15_mtpm/adsp_boot.h b/soc/intel/intel_adsp/ace/include/intel_ace15_mtpm/adsp_boot.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/ace/include/intel_ace15_mtpm/adsp_boot.h rename to soc/intel/intel_adsp/ace/include/intel_ace15_mtpm/adsp_boot.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/include/intel_ace15_mtpm/adsp_comm_widget.h b/soc/intel/intel_adsp/ace/include/intel_ace15_mtpm/adsp_comm_widget.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/ace/include/intel_ace15_mtpm/adsp_comm_widget.h rename to soc/intel/intel_adsp/ace/include/intel_ace15_mtpm/adsp_comm_widget.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/include/intel_ace15_mtpm/adsp_interrupt.h b/soc/intel/intel_adsp/ace/include/intel_ace15_mtpm/adsp_interrupt.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/ace/include/intel_ace15_mtpm/adsp_interrupt.h rename to soc/intel/intel_adsp/ace/include/intel_ace15_mtpm/adsp_interrupt.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/include/intel_ace15_mtpm/adsp_ipc_regs.h b/soc/intel/intel_adsp/ace/include/intel_ace15_mtpm/adsp_ipc_regs.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/ace/include/intel_ace15_mtpm/adsp_ipc_regs.h rename to soc/intel/intel_adsp/ace/include/intel_ace15_mtpm/adsp_ipc_regs.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/include/intel_ace15_mtpm/adsp_memory.h b/soc/intel/intel_adsp/ace/include/intel_ace15_mtpm/adsp_memory.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/ace/include/intel_ace15_mtpm/adsp_memory.h rename to soc/intel/intel_adsp/ace/include/intel_ace15_mtpm/adsp_memory.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/include/intel_ace15_mtpm/adsp_memory_regions.h b/soc/intel/intel_adsp/ace/include/intel_ace15_mtpm/adsp_memory_regions.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/ace/include/intel_ace15_mtpm/adsp_memory_regions.h rename to soc/intel/intel_adsp/ace/include/intel_ace15_mtpm/adsp_memory_regions.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/include/intel_ace15_mtpm/adsp_power.h b/soc/intel/intel_adsp/ace/include/intel_ace15_mtpm/adsp_power.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/ace/include/intel_ace15_mtpm/adsp_power.h rename to soc/intel/intel_adsp/ace/include/intel_ace15_mtpm/adsp_power.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/include/intel_ace15_mtpm/adsp_shim.h b/soc/intel/intel_adsp/ace/include/intel_ace15_mtpm/adsp_shim.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/ace/include/intel_ace15_mtpm/adsp_shim.h rename to soc/intel/intel_adsp/ace/include/intel_ace15_mtpm/adsp_shim.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/include/intel_ace15_mtpm/adsp_watchdog.h b/soc/intel/intel_adsp/ace/include/intel_ace15_mtpm/adsp_watchdog.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/ace/include/intel_ace15_mtpm/adsp_watchdog.h rename to soc/intel/intel_adsp/ace/include/intel_ace15_mtpm/adsp_watchdog.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/include/intel_ace15_mtpm/dmic_regs_ace1x.h b/soc/intel/intel_adsp/ace/include/intel_ace15_mtpm/dmic_regs_ace1x.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/ace/include/intel_ace15_mtpm/dmic_regs_ace1x.h rename to soc/intel/intel_adsp/ace/include/intel_ace15_mtpm/dmic_regs_ace1x.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/include/intel_ace20_lnl/adsp_boot.h b/soc/intel/intel_adsp/ace/include/intel_ace20_lnl/adsp_boot.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/ace/include/intel_ace20_lnl/adsp_boot.h rename to soc/intel/intel_adsp/ace/include/intel_ace20_lnl/adsp_boot.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/include/intel_ace20_lnl/adsp_interrupt.h b/soc/intel/intel_adsp/ace/include/intel_ace20_lnl/adsp_interrupt.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/ace/include/intel_ace20_lnl/adsp_interrupt.h rename to soc/intel/intel_adsp/ace/include/intel_ace20_lnl/adsp_interrupt.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/include/intel_ace20_lnl/adsp_ipc_regs.h b/soc/intel/intel_adsp/ace/include/intel_ace20_lnl/adsp_ipc_regs.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/ace/include/intel_ace20_lnl/adsp_ipc_regs.h rename to soc/intel/intel_adsp/ace/include/intel_ace20_lnl/adsp_ipc_regs.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/include/intel_ace20_lnl/adsp_memory.h b/soc/intel/intel_adsp/ace/include/intel_ace20_lnl/adsp_memory.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/ace/include/intel_ace20_lnl/adsp_memory.h rename to soc/intel/intel_adsp/ace/include/intel_ace20_lnl/adsp_memory.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/include/intel_ace20_lnl/adsp_memory_regions.h b/soc/intel/intel_adsp/ace/include/intel_ace20_lnl/adsp_memory_regions.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/ace/include/intel_ace20_lnl/adsp_memory_regions.h rename to soc/intel/intel_adsp/ace/include/intel_ace20_lnl/adsp_memory_regions.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/include/intel_ace20_lnl/adsp_power.h b/soc/intel/intel_adsp/ace/include/intel_ace20_lnl/adsp_power.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/ace/include/intel_ace20_lnl/adsp_power.h rename to soc/intel/intel_adsp/ace/include/intel_ace20_lnl/adsp_power.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/include/intel_ace20_lnl/adsp_shim.h b/soc/intel/intel_adsp/ace/include/intel_ace20_lnl/adsp_shim.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/ace/include/intel_ace20_lnl/adsp_shim.h rename to soc/intel/intel_adsp/ace/include/intel_ace20_lnl/adsp_shim.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/include/intel_ace20_lnl/dmic_regs_ace2x.h b/soc/intel/intel_adsp/ace/include/intel_ace20_lnl/dmic_regs_ace2x.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/ace/include/intel_ace20_lnl/dmic_regs_ace2x.h rename to soc/intel/intel_adsp/ace/include/intel_ace20_lnl/dmic_regs_ace2x.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/irq.c b/soc/intel/intel_adsp/ace/irq.c similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/ace/irq.c rename to soc/intel/intel_adsp/ace/irq.c diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/linker.ld b/soc/intel/intel_adsp/ace/linker.ld similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/ace/linker.ld rename to soc/intel/intel_adsp/ace/linker.ld diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/multiprocessing.c b/soc/intel/intel_adsp/ace/multiprocessing.c similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/ace/multiprocessing.c rename to soc/intel/intel_adsp/ace/multiprocessing.c diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/pmc_interface.h b/soc/intel/intel_adsp/ace/pmc_interface.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/ace/pmc_interface.h rename to soc/intel/intel_adsp/ace/pmc_interface.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/power.c b/soc/intel/intel_adsp/ace/power.c similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/ace/power.c rename to soc/intel/intel_adsp/ace/power.c diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/power_down.S b/soc/intel/intel_adsp/ace/power_down.S similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/ace/power_down.S rename to soc/intel/intel_adsp/ace/power_down.S diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/sram.c b/soc/intel/intel_adsp/ace/sram.c similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/ace/sram.c rename to soc/intel/intel_adsp/ace/sram.c diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/timestamp.c b/soc/intel/intel_adsp/ace/timestamp.c similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/ace/timestamp.c rename to soc/intel/intel_adsp/ace/timestamp.c diff --git a/soc/soc_legacy/xtensa/intel_adsp/cavs/CMakeLists.txt b/soc/intel/intel_adsp/cavs/CMakeLists.txt similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/cavs/CMakeLists.txt rename to soc/intel/intel_adsp/cavs/CMakeLists.txt diff --git a/soc/soc_legacy/xtensa/intel_adsp/cavs/Kconfig.series b/soc/intel/intel_adsp/cavs/Kconfig similarity index 74% rename from soc/soc_legacy/xtensa/intel_adsp/cavs/Kconfig.series rename to soc/intel/intel_adsp/cavs/Kconfig index a88bec1ec2e..662d6144a55 100644 --- a/soc/soc_legacy/xtensa/intel_adsp/cavs/Kconfig.series +++ b/soc/intel/intel_adsp/cavs/Kconfig @@ -1,8 +1,8 @@ -# Copyright (c) 2017,2022 Intel Corporation +# Copyright (c) 2017,2022-2024 Intel Corporation +# # SPDX-License-Identifier: Apache-2.0 config SOC_SERIES_INTEL_ADSP_CAVS - bool "Intel CAVS" select SOC_FAMILY_INTEL_ADSP select XTENSA select XTENSA_HAL if ("$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xcc" && ("$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xt-clang")) @@ -12,5 +12,8 @@ config SOC_SERIES_INTEL_ADSP_CAVS select ATOMIC_OPERATIONS_ARCH if "$(ZEPHYR_TOOLCHAIN_VARIANT)" = "xcc" select ARCH_HAS_COHERENCE select HAS_PM - help - Intel ADSP CAVS + +config SOC_INTEL_CAVS_V25 + select SOC_SERIES_INTEL_ADSP_CAVS + select XTENSA_WAITI_BUG + select SCHED_IPI_SUPPORTED diff --git a/soc/soc_legacy/xtensa/intel_adsp/cavs/Kconfig.defconfig.cavs_v25 b/soc/intel/intel_adsp/cavs/Kconfig.defconfig.cavs_v25 similarity index 88% rename from soc/soc_legacy/xtensa/intel_adsp/cavs/Kconfig.defconfig.cavs_v25 rename to soc/intel/intel_adsp/cavs/Kconfig.defconfig.cavs_v25 index f983aa27bb7..ad6fa8baac6 100644 --- a/soc/soc_legacy/xtensa/intel_adsp/cavs/Kconfig.defconfig.cavs_v25 +++ b/soc/intel/intel_adsp/cavs/Kconfig.defconfig.cavs_v25 @@ -1,15 +1,8 @@ -# Copyright (c) 2020,2022 Intel Corporation +# Copyright (c) 2020,2022-2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 if SOC_INTEL_CAVS_V25 -config SOC_TOOLCHAIN_NAME - string - default "intel_tgl_adsp" - -config SOC - default "intel_tgl_adsp" - # For backward compatibility, to be removed config SOC_SERIES_INTEL_CAVS_V25 def_bool y diff --git a/soc/soc_legacy/xtensa/intel_adsp/cavs/Kconfig.defconfig.series b/soc/intel/intel_adsp/cavs/Kconfig.defconfig.series similarity index 78% rename from soc/soc_legacy/xtensa/intel_adsp/cavs/Kconfig.defconfig.series rename to soc/intel/intel_adsp/cavs/Kconfig.defconfig.series index c340e4c77be..6b39e8bc930 100644 --- a/soc/soc_legacy/xtensa/intel_adsp/cavs/Kconfig.defconfig.series +++ b/soc/intel/intel_adsp/cavs/Kconfig.defconfig.series @@ -1,16 +1,13 @@ -# Copyright (c) 2020 Intel Corporation +# Copyright (c) 2020-2024 Intel Corporation +# # SPDX-License-Identifier: Apache-2.0 if SOC_SERIES_INTEL_ADSP_CAVS -config SOC_SERIES - string - default "cavs" - config INTEL_ADSP_CAVS def_bool y -source "soc/soc_legacy/xtensa/intel_adsp/cavs/Kconfig.defconfig.cavs*" +rsource "Kconfig.defconfig.cavs*" config DMA_INTEL_ADSP_GPDMA default y diff --git a/soc/intel/intel_adsp/cavs/Kconfig.soc b/soc/intel/intel_adsp/cavs/Kconfig.soc new file mode 100644 index 00000000000..a8c7f0b469b --- /dev/null +++ b/soc/intel/intel_adsp/cavs/Kconfig.soc @@ -0,0 +1,22 @@ +# Copyright (c) 2020-2024 Intel Corporation +# +# SPDX-License-Identifier: Apache-2.0 + +config SOC_SERIES_INTEL_ADSP_CAVS + bool + help + Intel ADSP CAVS + +config SOC_SERIES + default "cavs" if SOC_SERIES_INTEL_ADSP_CAVS + +config SOC_INTEL_CAVS_V25 + bool + help + Intel Tiger Lake + +config SOC + default "intel_tgl_adsp" if SOC_INTEL_CAVS_V25 + +config SOC_TOOLCHAIN_NAME + default "intel_tgl_adsp" if SOC_INTEL_CAVS_V25 diff --git a/soc/soc_legacy/xtensa/intel_adsp/common/include/_soc_inthandlers.h b/soc/intel/intel_adsp/cavs/_soc_inthandlers.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/common/include/_soc_inthandlers.h rename to soc/intel/intel_adsp/cavs/_soc_inthandlers.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/cavs/asm_ldo_management.h b/soc/intel/intel_adsp/cavs/asm_ldo_management.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/cavs/asm_ldo_management.h rename to soc/intel/intel_adsp/cavs/asm_ldo_management.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/cavs/asm_memory_management.h b/soc/intel/intel_adsp/cavs/asm_memory_management.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/cavs/asm_memory_management.h rename to soc/intel/intel_adsp/cavs/asm_memory_management.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/cavs/include/adsp_interrupt.h b/soc/intel/intel_adsp/cavs/include/adsp_interrupt.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/cavs/include/adsp_interrupt.h rename to soc/intel/intel_adsp/cavs/include/adsp_interrupt.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/cavs/include/intel_tgl_adsp/adsp_imr_layout.h b/soc/intel/intel_adsp/cavs/include/intel_tgl_adsp/adsp_imr_layout.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/cavs/include/intel_tgl_adsp/adsp_imr_layout.h rename to soc/intel/intel_adsp/cavs/include/intel_tgl_adsp/adsp_imr_layout.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/cavs/include/intel_tgl_adsp/adsp_ipc_regs.h b/soc/intel/intel_adsp/cavs/include/intel_tgl_adsp/adsp_ipc_regs.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/cavs/include/intel_tgl_adsp/adsp_ipc_regs.h rename to soc/intel/intel_adsp/cavs/include/intel_tgl_adsp/adsp_ipc_regs.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/cavs/include/intel_tgl_adsp/adsp_memory.h b/soc/intel/intel_adsp/cavs/include/intel_tgl_adsp/adsp_memory.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/cavs/include/intel_tgl_adsp/adsp_memory.h rename to soc/intel/intel_adsp/cavs/include/intel_tgl_adsp/adsp_memory.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/cavs/include/intel_tgl_adsp/adsp_shim.h b/soc/intel/intel_adsp/cavs/include/intel_tgl_adsp/adsp_shim.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/cavs/include/intel_tgl_adsp/adsp_shim.h rename to soc/intel/intel_adsp/cavs/include/intel_tgl_adsp/adsp_shim.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/cavs/include/intel_tgl_adsp/dmic_regs.h b/soc/intel/intel_adsp/cavs/include/intel_tgl_adsp/dmic_regs.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/cavs/include/intel_tgl_adsp/dmic_regs.h rename to soc/intel/intel_adsp/cavs/include/intel_tgl_adsp/dmic_regs.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/cavs/include/xtensa-cavs-linker.ld b/soc/intel/intel_adsp/cavs/include/xtensa-cavs-linker.ld similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/cavs/include/xtensa-cavs-linker.ld rename to soc/intel/intel_adsp/cavs/include/xtensa-cavs-linker.ld diff --git a/soc/soc_legacy/xtensa/intel_adsp/cavs/irq.c b/soc/intel/intel_adsp/cavs/irq.c similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/cavs/irq.c rename to soc/intel/intel_adsp/cavs/irq.c diff --git a/soc/soc_legacy/xtensa/intel_adsp/cavs/multiprocessing.c b/soc/intel/intel_adsp/cavs/multiprocessing.c similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/cavs/multiprocessing.c rename to soc/intel/intel_adsp/cavs/multiprocessing.c diff --git a/soc/soc_legacy/xtensa/intel_adsp/cavs/power.c b/soc/intel/intel_adsp/cavs/power.c similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/cavs/power.c rename to soc/intel/intel_adsp/cavs/power.c diff --git a/soc/soc_legacy/xtensa/intel_adsp/cavs/power_down_cavs.S b/soc/intel/intel_adsp/cavs/power_down_cavs.S similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/cavs/power_down_cavs.S rename to soc/intel/intel_adsp/cavs/power_down_cavs.S diff --git a/soc/soc_legacy/xtensa/intel_adsp/cavs/sram.c b/soc/intel/intel_adsp/cavs/sram.c similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/cavs/sram.c rename to soc/intel/intel_adsp/cavs/sram.c diff --git a/soc/soc_legacy/xtensa/intel_adsp/common/CMakeLists.txt b/soc/intel/intel_adsp/common/CMakeLists.txt similarity index 98% rename from soc/soc_legacy/xtensa/intel_adsp/common/CMakeLists.txt rename to soc/intel/intel_adsp/common/CMakeLists.txt index c463e4453fc..a3cdb9ff5ad 100644 --- a/soc/soc_legacy/xtensa/intel_adsp/common/CMakeLists.txt +++ b/soc/intel/intel_adsp/common/CMakeLists.txt @@ -1,6 +1,6 @@ # Intel CAVS SoC family CMake file # -# Copyright (c) 2020-2022 Intel Corporation +# Copyright (c) 2020-2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 zephyr_interface_library_named(INTEL_ADSP_COMMON) @@ -129,7 +129,7 @@ add_custom_target(zephyr.ri ALL # Parameters after the double dash -- are passed through to rimage. For # other ways to override default rimage parameters check -# boards/xtensa/intel_adsp_cavs25/doc/intel_adsp_generic.rst +# boards/intel/intel_adsp_cavs25/doc/intel_adsp_generic.rst # Warning: because `west sign` can also be used interactively, using # ${WEST_SIGN_OPTS} like this has _higher_ precedence than `west config diff --git a/soc/soc_legacy/xtensa/intel_adsp/common/boot.c b/soc/intel/intel_adsp/common/boot.c similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/common/boot.c rename to soc/intel/intel_adsp/common/boot.c diff --git a/soc/soc_legacy/xtensa/intel_adsp/common/boot_complete.c b/soc/intel/intel_adsp/common/boot_complete.c similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/common/boot_complete.c rename to soc/intel/intel_adsp/common/boot_complete.c diff --git a/soc/soc_legacy/xtensa/intel_adsp/common/clk.c b/soc/intel/intel_adsp/common/clk.c similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/common/clk.c rename to soc/intel/intel_adsp/common/clk.c diff --git a/soc/soc_legacy/xtensa/intel_adsp/common/include/adsp-vectors.h b/soc/intel/intel_adsp/common/include/adsp-vectors.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/common/include/adsp-vectors.h rename to soc/intel/intel_adsp/common/include/adsp-vectors.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/common/include/adsp_clk.h b/soc/intel/intel_adsp/common/include/adsp_clk.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/common/include/adsp_clk.h rename to soc/intel/intel_adsp/common/include/adsp_clk.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/common/include/adsp_debug_window.h b/soc/intel/intel_adsp/common/include/adsp_debug_window.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/common/include/adsp_debug_window.h rename to soc/intel/intel_adsp/common/include/adsp_debug_window.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/common/include/cavs-idc.h b/soc/intel/intel_adsp/common/include/cavs-idc.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/common/include/cavs-idc.h rename to soc/intel/intel_adsp/common/include/cavs-idc.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/common/include/cavstool.h b/soc/intel/intel_adsp/common/include/cavstool.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/common/include/cavstool.h rename to soc/intel/intel_adsp/common/include/cavstool.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/common/include/cpu_init.h b/soc/intel/intel_adsp/common/include/cpu_init.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/common/include/cpu_init.h rename to soc/intel/intel_adsp/common/include/cpu_init.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/common/include/debug_helpers.h b/soc/intel/intel_adsp/common/include/debug_helpers.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/common/include/debug_helpers.h rename to soc/intel/intel_adsp/common/include/debug_helpers.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/common/include/intel_adsp_hda.h b/soc/intel/intel_adsp/common/include/intel_adsp_hda.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/common/include/intel_adsp_hda.h rename to soc/intel/intel_adsp/common/include/intel_adsp_hda.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/common/include/intel_adsp_ipc.h b/soc/intel/intel_adsp/common/include/intel_adsp_ipc.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/common/include/intel_adsp_ipc.h rename to soc/intel/intel_adsp/common/include/intel_adsp_ipc.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/common/include/intel_adsp_ipc_devtree.h b/soc/intel/intel_adsp/common/include/intel_adsp_ipc_devtree.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/common/include/intel_adsp_ipc_devtree.h rename to soc/intel/intel_adsp/common/include/intel_adsp_ipc_devtree.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/common/include/manifest.h b/soc/intel/intel_adsp/common/include/manifest.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/common/include/manifest.h rename to soc/intel/intel_adsp/common/include/manifest.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/common/include/mem_window.h b/soc/intel/intel_adsp/common/include/mem_window.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/common/include/mem_window.h rename to soc/intel/intel_adsp/common/include/mem_window.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/common/include/soc.h b/soc/intel/intel_adsp/common/include/soc.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/common/include/soc.h rename to soc/intel/intel_adsp/common/include/soc.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/common/include/soc_util.h b/soc/intel/intel_adsp/common/include/soc_util.h similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/common/include/soc_util.h rename to soc/intel/intel_adsp/common/include/soc_util.h diff --git a/soc/soc_legacy/xtensa/intel_adsp/common/ipc.c b/soc/intel/intel_adsp/common/ipc.c similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/common/ipc.c rename to soc/intel/intel_adsp/common/ipc.c diff --git a/soc/soc_legacy/xtensa/intel_adsp/common/mem_window.c b/soc/intel/intel_adsp/common/mem_window.c similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/common/mem_window.c rename to soc/intel/intel_adsp/common/mem_window.c diff --git a/soc/soc_legacy/xtensa/intel_adsp/common/multiprocessing.c b/soc/intel/intel_adsp/common/multiprocessing.c similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/common/multiprocessing.c rename to soc/intel/intel_adsp/common/multiprocessing.c diff --git a/soc/soc_legacy/xtensa/intel_adsp/common/rimage_modules.c b/soc/intel/intel_adsp/common/rimage_modules.c similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/common/rimage_modules.c rename to soc/intel/intel_adsp/common/rimage_modules.c diff --git a/soc/soc_legacy/xtensa/intel_adsp/common/soc.c b/soc/intel/intel_adsp/common/soc.c similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/common/soc.c rename to soc/intel/intel_adsp/common/soc.c diff --git a/soc/intel/intel_adsp/soc.yml b/soc/intel/intel_adsp/soc.yml new file mode 100644 index 00000000000..33418d53a36 --- /dev/null +++ b/soc/intel/intel_adsp/soc.yml @@ -0,0 +1,10 @@ +family: + - name: intel_adsp + series: + - name: ace + socs: + - name: intel_ace15_mtpm + - name: intel_ace20_lnl + - name: cavs + socs: + - name: intel_tgl_adsp diff --git a/soc/soc_legacy/xtensa/intel_adsp/tools/acetool.py b/soc/intel/intel_adsp/tools/acetool.py similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/tools/acetool.py rename to soc/intel/intel_adsp/tools/acetool.py diff --git a/soc/soc_legacy/xtensa/intel_adsp/tools/cavstool.py b/soc/intel/intel_adsp/tools/cavstool.py similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/tools/cavstool.py rename to soc/intel/intel_adsp/tools/cavstool.py diff --git a/soc/soc_legacy/xtensa/intel_adsp/tools/cavstool_client.py b/soc/intel/intel_adsp/tools/cavstool_client.py similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/tools/cavstool_client.py rename to soc/intel/intel_adsp/tools/cavstool_client.py diff --git a/soc/soc_legacy/xtensa/intel_adsp/tools/cavstwist.sh b/soc/intel/intel_adsp/tools/cavstwist.sh similarity index 94% rename from soc/soc_legacy/xtensa/intel_adsp/tools/cavstwist.sh rename to soc/intel/intel_adsp/tools/cavstwist.sh index 3dcfd0e9d4b..6854fa2fbb9 100755 --- a/soc/soc_legacy/xtensa/intel_adsp/tools/cavstwist.sh +++ b/soc/intel/intel_adsp/tools/cavstwist.sh @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (c) 2022 Intel Corporation +# Copyright (c) 2022-2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 set -e @@ -13,8 +13,8 @@ set -e # export CAVS_RIMAGE=$HOME/rimage # # twister -p intel_adsp_cavs25 --device-testing \ -# --device-serial-pty=$ZEPHYR_BASE/soc/soc_legacy/xtensa/intel_adsp/tools/cavstwist.sh \ -# --west-flash=$ZEPHYR_BASE/soc/soc_legacy/xtensa/intel_adsp/tools/cavstwist.sh +# --device-serial-pty=$ZEPHYR_BASE/soc/intel/intel_adsp/tools/cavstwist.sh \ +# --west-flash=$ZEPHYR_BASE/soc/intel/intel_adsp/tools/cavstwist.sh # # The CAVS_OLD_FLASHER is necessary because now the client-server-based # cavstool works by default. This is to tell the build system to use @@ -80,7 +80,7 @@ fi ######################################################################## -CAVSTOOL=$ZEPHYR_BASE/soc/soc_legacy/xtensa/intel_adsp/tools/cavstool.py +CAVSTOOL=$ZEPHYR_BASE/soc/intel/intel_adsp/tools/cavstool.py IMAGE=$ZEPHYR_BASE/_cavstmp.ri IMAGE2=$ZEPHYR_BASE/_cavstmp2.ri diff --git a/soc/soc_legacy/xtensa/intel_adsp/tools/remote-fw-service.py b/soc/intel/intel_adsp/tools/remote-fw-service.py similarity index 100% rename from soc/soc_legacy/xtensa/intel_adsp/tools/remote-fw-service.py rename to soc/intel/intel_adsp/tools/remote-fw-service.py diff --git a/soc/soc_legacy/xtensa/intel_adsp/Kconfig.soc b/soc/soc_legacy/xtensa/intel_adsp/Kconfig.soc deleted file mode 100644 index 58e4440e3fc..00000000000 --- a/soc/soc_legacy/xtensa/intel_adsp/Kconfig.soc +++ /dev/null @@ -1,6 +0,0 @@ -# Intel CAVS SoC series selection -# -# Copyright (c) 2020 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - -source "soc/soc_legacy/xtensa/intel_adsp/*/Kconfig.series" diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/Kconfig.series b/soc/soc_legacy/xtensa/intel_adsp/ace/Kconfig.series deleted file mode 100644 index 963c33bdf61..00000000000 --- a/soc/soc_legacy/xtensa/intel_adsp/ace/Kconfig.series +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright (c) 2022 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - -config SOC_SERIES_INTEL_ACE - bool "Intel ACE" - select SOC_FAMILY_INTEL_ADSP - select XTENSA - select XTENSA_HAL if (("$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xcc") && ("$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xt-clang")) - select ATOMIC_OPERATIONS_BUILTIN if "$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xcc" - select ARCH_HAS_COHERENCE - select SCHED_IPI_SUPPORTED - select DW_ICTL_ACE - select SOC_HAS_RUNTIME_NUM_CPUS - select HAS_PM - help - Intel ADSP ACE diff --git a/soc/soc_legacy/xtensa/intel_adsp/ace/Kconfig.soc b/soc/soc_legacy/xtensa/intel_adsp/ace/Kconfig.soc deleted file mode 100644 index 69f8ebd887a..00000000000 --- a/soc/soc_legacy/xtensa/intel_adsp/ace/Kconfig.soc +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright (c) 2022 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - -choice - prompt "Intel ADSP SoC Selection" - - config SOC_INTEL_ACE15_MTPM - bool "ACE 1.5 Meteor PCH M" - depends on SOC_SERIES_INTEL_ACE - - config SOC_INTEL_ACE20_LNL - bool "ACE 2.0 Lunar Lake PCH" - depends on SOC_SERIES_INTEL_ACE - -endchoice - -config SOC_INTEL_COMM_WIDGET - bool "Intel Communication Widget driver" - default y - depends on DT_HAS_INTEL_ADSP_COMMUNICATION_WIDGET_ENABLED - help - Select this to enable Intel Communication Widget driver. - DSP Communication Widget is a device for generic sideband message transmit/receive. diff --git a/soc/soc_legacy/xtensa/intel_adsp/cavs/Kconfig.soc b/soc/soc_legacy/xtensa/intel_adsp/cavs/Kconfig.soc deleted file mode 100644 index 0d054e0ee2a..00000000000 --- a/soc/soc_legacy/xtensa/intel_adsp/cavs/Kconfig.soc +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright (c) 2020 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - -choice - prompt "Intel CAVS SoC Selection" - depends on SOC_SERIES_INTEL_ADSP_CAVS - -config SOC_INTEL_CAVS_V25 - bool "Intel Tiger Lake" - select XTENSA_WAITI_BUG - select SCHED_IPI_SUPPORTED - -endchoice