From 3f08e714b21b5959406c293ed4d7b980ad7c7cef Mon Sep 17 00:00:00 2001
From: Dmitrii Golovanov <dmitrii.golovanov@intel.com>
Date: Thu, 22 Feb 2024 13:04:58 +0100
Subject: [PATCH] soc: intel_adsp: hwmv2: Align SOC_SERIES_INTEL_ACE name and
 value

Align `ace` to 'intel_adsp_ace` SoC Series name and value to match
the new HWMv2 compliance check, also renaming:

  SOC_SERIES_INTEL_ACE --> SOC_SERIES_INTEL_ADSP_ACE

Signed-off-by: Dmitrii Golovanov <dmitrii.golovanov@intel.com>
---
 drivers/dai/intel/dmic/dmic.c                 |  4 +--
 drivers/dai/intel/dmic/dmic_nhlt.c            | 18 +++++------
 drivers/dai/intel/ssp/Kconfig.ssp             |  2 +-
 drivers/dai/intel/ssp/ssp.c                   |  6 ++--
 drivers/dai/intel/ssp/ssp.h                   |  2 +-
 drivers/dma/Kconfig.intel_adsp_gpdma          |  2 +-
 drivers/dma/dma_intel_adsp_gpdma.c            | 30 +++++++++----------
 drivers/dma/dma_intel_adsp_hda_host_in.c      |  3 +-
 drivers/dma/dma_intel_adsp_hda_host_out.c     |  3 +-
 drivers/mm/mm_drv_intel_adsp_mtl_tlb.c        |  8 ++---
 drivers/timer/intel_adsp_timer.c              |  4 +--
 soc/intel/intel_adsp/CMakeLists.txt           |  2 +-
 soc/intel/intel_adsp/ace/Kconfig              |  6 ++--
 .../intel_adsp/ace/Kconfig.defconfig.series   |  4 +--
 soc/intel/intel_adsp/ace/Kconfig.soc          |  6 ++--
 soc/intel/intel_adsp/common/boot.c            |  2 +-
 soc/intel/intel_adsp/common/clk.c             |  6 ++--
 .../intel_adsp/common/include/adsp-vectors.h  |  4 +--
 .../intel_adsp/common/include/adsp_clk.h      |  2 +-
 .../common/include/intel_adsp_hda.h           |  4 +--
 soc/intel/intel_adsp/common/ipc.c             |  8 ++---
 soc/intel/intel_adsp/soc.yml                  |  2 +-
 submanifests/optional.yaml                    |  2 +-
 23 files changed, 66 insertions(+), 64 deletions(-)

diff --git a/drivers/dai/intel/dmic/dmic.c b/drivers/dai/intel/dmic/dmic.c
index 3da5fb8c538..f65c554cf98 100644
--- a/drivers/dai/intel/dmic/dmic.c
+++ b/drivers/dai/intel/dmic/dmic.c
@@ -570,7 +570,7 @@ static void dai_dmic_start(struct dai_intel_dmic *dmic)
 	dai_dmic_start_fifo_packers(dmic, dmic->dai_config_params.dai_index);
 
 	for (i = 0; i < CONFIG_DAI_DMIC_HW_CONTROLLERS; i++) {
-#ifdef CONFIG_SOC_SERIES_INTEL_ACE
+#ifdef CONFIG_SOC_SERIES_INTEL_ADSP_ACE
 		dai_dmic_update_bits(dmic, dmic_base[i] + CIC_CONTROL,
 				     CIC_CONTROL_SOFT_RESET, 0);
 
@@ -621,7 +621,7 @@ static void dai_dmic_start(struct dai_intel_dmic *dmic)
 				     FIELD_PREP(FIR_CONTROL_START, start_fir));
 	}
 
-#ifndef CONFIG_SOC_SERIES_INTEL_ACE
+#ifndef CONFIG_SOC_SERIES_INTEL_ADSP_ACE
 	/* Clear soft reset for all/used PDM controllers. This should
 	 * start capture in sync.
 	 */
diff --git a/drivers/dai/intel/dmic/dmic_nhlt.c b/drivers/dai/intel/dmic/dmic_nhlt.c
index 3d803da33b9..c7fe48e1432 100644
--- a/drivers/dai/intel/dmic/dmic_nhlt.c
+++ b/drivers/dai/intel/dmic/dmic_nhlt.c
@@ -175,7 +175,7 @@ static int dai_nhlt_update_rate(struct dai_intel_dmic *dmic, const int clock_sou
 	return 0;
 }
 
-#ifdef CONFIG_SOC_SERIES_INTEL_ACE
+#ifdef CONFIG_SOC_SERIES_INTEL_ADSP_ACE
 static int dai_ipm_source_to_enable(struct dai_intel_dmic *dmic,
 				    int *count, int pdm_count, int stereo,
 				    int source_pdm)
@@ -426,7 +426,7 @@ static inline int dai_dmic_set_clock(const struct dai_intel_dmic *dmic, const ui
 static int print_outcontrol(uint32_t val)
 {
 	int bf1, bf2, bf3, bf4, bf5, bf6, bf7, bf8;
-#ifdef CONFIG_SOC_SERIES_INTEL_ACE
+#ifdef CONFIG_SOC_SERIES_INTEL_ADSP_ACE
 	int bf9, bf10, bf11, bf12, bf13;
 #endif
 	uint32_t ref;
@@ -447,7 +447,7 @@ static int print_outcontrol(uint32_t val)
 		return -EINVAL;
 	}
 
-#ifdef CONFIG_SOC_SERIES_INTEL_ACE
+#ifdef CONFIG_SOC_SERIES_INTEL_ADSP_ACE
 	bf9 = FIELD_GET(OUTCONTROL_IPM_SOURCE_1, val);
 	bf10 = FIELD_GET(OUTCONTROL_IPM_SOURCE_2, val);
 	bf11 = FIELD_GET(OUTCONTROL_IPM_SOURCE_3, val);
@@ -487,7 +487,7 @@ static void print_cic_control(uint32_t val)
 	bf4 = FIELD_GET(CIC_CONTROL_MIC_B_POLARITY, val);
 	bf5 = FIELD_GET(CIC_CONTROL_MIC_A_POLARITY, val);
 	bf6 = FIELD_GET(CIC_CONTROL_MIC_MUTE, val);
-#ifndef CONFIG_SOC_SERIES_INTEL_ACE
+#ifndef CONFIG_SOC_SERIES_INTEL_ADSP_ACE
 	bf7 = FIELD_GET(CIC_CONTROL_STEREO_MODE, val);
 #else
 	bf7 = -1;
@@ -503,7 +503,7 @@ static void print_cic_control(uint32_t val)
 		FIELD_PREP(CIC_CONTROL_MIC_B_POLARITY, bf4) |
 		FIELD_PREP(CIC_CONTROL_MIC_A_POLARITY, bf5) |
 		FIELD_PREP(CIC_CONTROL_MIC_MUTE, bf6)
-#ifndef CONFIG_SOC_SERIES_INTEL_ACE
+#ifndef CONFIG_SOC_SERIES_INTEL_ADSP_ACE
 		| FIELD_PREP(CIC_CONTROL_STEREO_MODE, bf7)
 #endif
 		;
@@ -520,7 +520,7 @@ static void print_fir_control(uint32_t val)
 
 	bf1 = FIELD_GET(FIR_CONTROL_START, val);
 	bf2 = FIELD_GET(FIR_CONTROL_ARRAY_START_EN, val);
-#ifdef CONFIG_SOC_SERIES_INTEL_ACE
+#ifdef CONFIG_SOC_SERIES_INTEL_ADSP_ACE
 	bf3 = FIELD_GET(FIR_CONTROL_PERIODIC_START_EN, val);
 #else
 	bf3 = -1;
@@ -534,7 +534,7 @@ static void print_fir_control(uint32_t val)
 	LOG_DBG("  dccomp=%d, mute=%d, stereo=%d", bf4, bf5, bf6);
 	ref = FIELD_PREP(FIR_CONTROL_START, bf1) |
 		FIELD_PREP(FIR_CONTROL_ARRAY_START_EN, bf2) |
-#ifdef CONFIG_SOC_SERIES_INTEL_ACE
+#ifdef CONFIG_SOC_SERIES_INTEL_ADSP_ACE
 		FIELD_PREP(FIR_CONTROL_PERIODIC_START_EN, bf3) |
 #endif
 		FIELD_PREP(FIR_CONTROL_DCCOMP, bf4) |
@@ -561,7 +561,7 @@ static void print_pdm_ctrl(const struct nhlt_pdm_ctrl_cfg *pdm_cfg)
 
 	val = pdm_cfg->mic_control;
 
-#ifndef CONFIG_SOC_SERIES_INTEL_ACE
+#ifndef CONFIG_SOC_SERIES_INTEL_ADSP_ACE
 	bf1 = FIELD_GET(MIC_CONTROL_PDM_SKEW, val);
 #else
 	bf1 = -1;
@@ -797,7 +797,7 @@ int dai_dmic_set_config_nhlt(struct dai_intel_dmic *dmic, const void *bespoke_cf
 		}
 	}
 
-#ifdef CONFIG_SOC_SERIES_INTEL_ACE
+#ifdef CONFIG_SOC_SERIES_INTEL_ADSP_ACE
 	ret = dai_nhlt_dmic_dai_params_get(dmic, dmic_cfg->clock_source);
 #else
 	ret = dai_nhlt_dmic_dai_params_get(dmic);
diff --git a/drivers/dai/intel/ssp/Kconfig.ssp b/drivers/dai/intel/ssp/Kconfig.ssp
index c44d4c4ec23..adb88e7645b 100644
--- a/drivers/dai/intel/ssp/Kconfig.ssp
+++ b/drivers/dai/intel/ssp/Kconfig.ssp
@@ -15,7 +15,7 @@ config DAI_INTEL_SSP
 
 config DAI_SSP_HAS_POWER_CONTROL
 	bool "DAI ssp pm_runtime en/dis ssp power"
-	default y if SOC_SERIES_INTEL_ACE
+	default y if SOC_SERIES_INTEL_ADSP_ACE
 	depends on DAI_INTEL_SSP
 
 if DAI_INTEL_SSP
diff --git a/drivers/dai/intel/ssp/ssp.c b/drivers/dai/intel/ssp/ssp.c
index 682077a6d73..447a31c235f 100644
--- a/drivers/dai/intel/ssp/ssp.c
+++ b/drivers/dai/intel/ssp/ssp.c
@@ -1607,7 +1607,7 @@ static int dai_ssp_check_aux_data(struct ssp_intel_aux_tlv *aux_tlv, int aux_len
 		size = sizeof(struct ssp_intel_ext_ctl);
 		break;
 	case SSP_LINK_CLK_SOURCE:
-#ifdef CONFIG_SOC_SERIES_INTEL_ACE
+#ifdef CONFIG_SOC_SERIES_INTEL_ADSP_ACE
 		size = sizeof(struct ssp_intel_link_ctl);
 		break;
 #else
@@ -1642,7 +1642,7 @@ static int dai_ssp_parse_aux_data(struct dai_intel_ssp *dp, const void *spec_con
 	struct ssp_intel_node_ctl *node;
 	struct ssp_intel_sync_ctl *sync;
 	struct ssp_intel_ext_ctl *ext;
-#ifdef CONFIG_SOC_SERIES_INTEL_ACE
+#ifdef CONFIG_SOC_SERIES_INTEL_ADSP_ACE
 	struct ssp_intel_link_ctl *link;
 #endif
 	uint8_t *aux_ptr;
@@ -1698,7 +1698,7 @@ static int dai_ssp_parse_aux_data(struct dai_intel_ssp *dp, const void *spec_con
 			LOG_INF("ext ext_data %u", ext->ext_data);
 			break;
 		case SSP_LINK_CLK_SOURCE:
-#ifdef CONFIG_SOC_SERIES_INTEL_ACE
+#ifdef CONFIG_SOC_SERIES_INTEL_ADSP_ACE
 			link = (struct ssp_intel_link_ctl *)&aux_tlv->val;
 
 #if CONFIG_SOC_INTEL_ACE15_MTPM
diff --git a/drivers/dai/intel/ssp/ssp.h b/drivers/dai/intel/ssp/ssp.h
index 0d53c0c6159..5a187730dd5 100644
--- a/drivers/dai/intel/ssp/ssp.h
+++ b/drivers/dai/intel/ssp/ssp.h
@@ -236,7 +236,7 @@
 #define SHIM_CLKCTL_I2SFDCGB(x)		BIT(20 + x)
 #define SHIM_CLKCTL_I2SEFDCGB(x)	BIT(18 + x)
 
-#ifdef CONFIG_SOC_SERIES_INTEL_ACE
+#ifdef CONFIG_SOC_SERIES_INTEL_ADSP_ACE
 /** \brief Offset of MCLK Divider Control Register. */
 #define MN_MDIVCTRL 0x100
 
diff --git a/drivers/dma/Kconfig.intel_adsp_gpdma b/drivers/dma/Kconfig.intel_adsp_gpdma
index 4e26ca5d93b..9fa7f3baed5 100644
--- a/drivers/dma/Kconfig.intel_adsp_gpdma
+++ b/drivers/dma/Kconfig.intel_adsp_gpdma
@@ -21,7 +21,7 @@ config DMA_INTEL_ADSP_GPDMA_NEED_CONTROLLER_OWNERSHIP
 
 config DMA_INTEL_ADSP_GPDMA_HAS_LLP
 	bool "Intel ADSP GPDMA Linear Link Position Feature"
-	default y if SOC_SERIES_INTEL_ACE
+	default y if SOC_SERIES_INTEL_ADSP_ACE
 	help
 	  Intel ADSP GPDMA may optionally have a linear link position
 	  feature.
diff --git a/drivers/dma/dma_intel_adsp_gpdma.c b/drivers/dma/dma_intel_adsp_gpdma.c
index e2927471050..5e3850244d9 100644
--- a/drivers/dma/dma_intel_adsp_gpdma.c
+++ b/drivers/dma/dma_intel_adsp_gpdma.c
@@ -162,7 +162,7 @@ static int intel_adsp_gpdma_config(const struct device *dev, uint32_t channel,
 static int intel_adsp_gpdma_start(const struct device *dev, uint32_t channel)
 {
 	int ret = 0;
-#if CONFIG_PM_DEVICE && CONFIG_SOC_SERIES_INTEL_ACE
+#if CONFIG_PM_DEVICE && CONFIG_SOC_SERIES_INTEL_ADSP_ACE
 	bool first_use = false;
 	enum pm_device_state state;
 
@@ -187,7 +187,7 @@ static int intel_adsp_gpdma_start(const struct device *dev, uint32_t channel)
 		intel_adsp_gpdma_llp_disable(dev, channel);
 	}
 
-#if CONFIG_PM_DEVICE && CONFIG_SOC_SERIES_INTEL_ACE
+#if CONFIG_PM_DEVICE && CONFIG_SOC_SERIES_INTEL_ADSP_ACE
 	/* Device usage is counted by the calls of dw_dma_start and dw_dma_stop. For the first use,
 	 * we need to make sure that the pm_device_runtime_get and pm_device_runtime_put functions
 	 * calls are balanced.
@@ -246,7 +246,7 @@ static void intel_adsp_gpdma_clock_enable(const struct device *dev)
 	uint32_t reg = dev_cfg->shim + GPDMA_CTL_OFFSET;
 	uint32_t val;
 
-	if (IS_ENABLED(CONFIG_SOC_SERIES_INTEL_ACE)) {
+	if (IS_ENABLED(CONFIG_SOC_SERIES_INTEL_ADSP_ACE)) {
 		val = sys_read32(reg) | GPDMA_CTL_DCGD;
 	} else {
 		val = GPDMA_CTL_FDCGB;
@@ -258,7 +258,7 @@ static void intel_adsp_gpdma_clock_enable(const struct device *dev)
 #ifdef CONFIG_PM_DEVICE
 static void intel_adsp_gpdma_clock_disable(const struct device *dev)
 {
-#ifdef CONFIG_SOC_SERIES_INTEL_ACE
+#ifdef CONFIG_SOC_SERIES_INTEL_ADSP_ACE
 	const struct intel_adsp_gpdma_cfg *const dev_cfg = dev->config;
 	uint32_t reg = dev_cfg->shim + GPDMA_CTL_OFFSET;
 	uint32_t val = sys_read32(reg) & ~GPDMA_CTL_DCGD;
@@ -271,7 +271,7 @@ static void intel_adsp_gpdma_clock_disable(const struct device *dev)
 static void intel_adsp_gpdma_claim_ownership(const struct device *dev)
 {
 #ifdef CONFIG_DMA_INTEL_ADSP_GPDMA_NEED_CONTROLLER_OWNERSHIP
-#ifdef CONFIG_SOC_SERIES_INTEL_ACE
+#ifdef CONFIG_SOC_SERIES_INTEL_ADSP_ACE
 	const struct intel_adsp_gpdma_cfg *const dev_cfg = dev->config;
 	uint32_t reg = dev_cfg->shim + GPDMA_CTL_OFFSET;
 	uint32_t val = sys_read32(reg) | GPDMA_OSEL(0x3);
@@ -281,7 +281,7 @@ static void intel_adsp_gpdma_claim_ownership(const struct device *dev)
 	sys_write32(LPGPDMA_CHOSEL_FLAG | LPGPDMA_CTLOSEL_FLAG, DSP_INIT_LPGPDMA(0));
 	sys_write32(LPGPDMA_CHOSEL_FLAG | LPGPDMA_CTLOSEL_FLAG, DSP_INIT_LPGPDMA(1));
 	ARG_UNUSED(dev);
-#endif /* CONFIG_SOC_SERIES_INTEL_ACE */
+#endif /* CONFIG_SOC_SERIES_INTEL_ADSP_ACE */
 #endif /* CONFIG_DMA_INTEL_ADSP_GPDMA_NEED_CONTROLLER_OWNERSHIP */
 }
 
@@ -289,7 +289,7 @@ static void intel_adsp_gpdma_claim_ownership(const struct device *dev)
 static void intel_adsp_gpdma_release_ownership(const struct device *dev)
 {
 #ifdef CONFIG_DMA_INTEL_ADSP_GPDMA_NEED_CONTROLLER_OWNERSHIP
-#ifdef CONFIG_SOC_SERIES_INTEL_ACE
+#ifdef CONFIG_SOC_SERIES_INTEL_ADSP_ACE
 	const struct intel_adsp_gpdma_cfg *const dev_cfg = dev->config;
 	uint32_t reg = dev_cfg->shim + GPDMA_CTL_OFFSET;
 	uint32_t val = sys_read32(reg) & ~GPDMA_OSEL(0x3);
@@ -298,12 +298,12 @@ static void intel_adsp_gpdma_release_ownership(const struct device *dev)
 	/* CHECKME: Do CAVS platforms set ownership over DMA,
 	 * if yes, add support for it releasing.
 	 */
-#endif /* CONFIG_SOC_SERIES_INTEL_ACE */
+#endif /* CONFIG_SOC_SERIES_INTEL_ADSP_ACE */
 #endif /* CONFIG_DMA_INTEL_ADSP_GPDMA_NEED_CONTROLLER_OWNERSHIP */
 }
 #endif
 
-#ifdef CONFIG_SOC_SERIES_INTEL_ACE
+#ifdef CONFIG_SOC_SERIES_INTEL_ADSP_ACE
 static int intel_adsp_gpdma_enable(const struct device *dev)
 {
 	const struct intel_adsp_gpdma_cfg *const dev_cfg = dev->config;
@@ -329,14 +329,14 @@ static int intel_adsp_gpdma_disable(const struct device *dev)
 	return 0;
 }
 #endif /* CONFIG_PM_DEVICE */
-#endif /* CONFIG_SOC_SERIES_INTEL_ACE */
+#endif /* CONFIG_SOC_SERIES_INTEL_ADSP_ACE */
 
 static int intel_adsp_gpdma_power_on(const struct device *dev)
 {
 	const struct intel_adsp_gpdma_cfg *const dev_cfg = dev->config;
 	int ret;
 
-#ifdef CONFIG_SOC_SERIES_INTEL_ACE
+#ifdef CONFIG_SOC_SERIES_INTEL_ADSP_ACE
 	/* Power up */
 	ret = intel_adsp_gpdma_enable(dev);
 
@@ -377,12 +377,12 @@ static int intel_adsp_gpdma_power_off(const struct device *dev)
 
 	/* Relesing DMA ownership*/
 	intel_adsp_gpdma_release_ownership(dev);
-#ifdef CONFIG_SOC_SERIES_INTEL_ACE
+#ifdef CONFIG_SOC_SERIES_INTEL_ADSP_ACE
 	/* Power down */
 	return intel_adsp_gpdma_disable(dev);
 #else
 	return 0;
-#endif /* CONFIG_SOC_SERIES_INTEL_ACE */
+#endif /* CONFIG_SOC_SERIES_INTEL_ADSP_ACE */
 }
 #endif /* CONFIG_PM_DEVICE */
 
@@ -423,7 +423,7 @@ int intel_adsp_gpdma_get_attribute(const struct device *dev, uint32_t type, uint
 	return 0;
 }
 
-#ifdef CONFIG_SOC_SERIES_INTEL_ACE
+#ifdef CONFIG_SOC_SERIES_INTEL_ADSP_ACE
 static inline void ace_gpdma_intc_unmask(void)
 {
 	ACE_DINT[0].ie[ACE_INTL_GPDMA] = BIT(0);
@@ -444,7 +444,7 @@ int intel_adsp_gpdma_init(const struct device *dev)
 
 	ace_gpdma_intc_unmask();
 
-#if CONFIG_PM_DEVICE && CONFIG_SOC_SERIES_INTEL_ACE
+#if CONFIG_PM_DEVICE && CONFIG_SOC_SERIES_INTEL_ADSP_ACE
 	if (pm_device_on_power_domain(dev)) {
 		pm_device_init_off(dev);
 	} else {
diff --git a/drivers/dma/dma_intel_adsp_hda_host_in.c b/drivers/dma/dma_intel_adsp_hda_host_in.c
index a999c7fbba6..a6114b05404 100644
--- a/drivers/dma/dma_intel_adsp_hda_host_in.c
+++ b/drivers/dma/dma_intel_adsp_hda_host_in.c
@@ -49,7 +49,8 @@ static const struct dma_driver_api intel_adsp_hda_dma_host_in_api = {
 			    DEVICE_DT_INST_GET(inst),			\
 			    DT_INST_IRQ(inst, sense));			\
 		irq_enable(DT_INST_IRQN(inst));			\
-		IF_ENABLED(CONFIG_SOC_SERIES_INTEL_ACE, (ACE_DINT[0].ie[ACE_INTL_HDAHIDMA] = 1;)) \
+		IF_ENABLED(CONFIG_SOC_SERIES_INTEL_ADSP_ACE,	\
+			    (ACE_DINT[0].ie[ACE_INTL_HDAHIDMA] = 1;))	\
 	}
 
 DT_INST_FOREACH_STATUS_OKAY(INTEL_ADSP_HDA_DMA_HOST_IN_INIT)
diff --git a/drivers/dma/dma_intel_adsp_hda_host_out.c b/drivers/dma/dma_intel_adsp_hda_host_out.c
index cb7d9137a1a..f06d177ed29 100644
--- a/drivers/dma/dma_intel_adsp_hda_host_out.c
+++ b/drivers/dma/dma_intel_adsp_hda_host_out.c
@@ -53,7 +53,8 @@ static const struct dma_driver_api intel_adsp_hda_dma_host_out_api = {
 			    DEVICE_DT_INST_GET(inst),			\
 			    DT_INST_IRQ(inst, sense));			\
 		irq_enable(DT_INST_IRQN(inst));			\
-		IF_ENABLED(CONFIG_SOC_SERIES_INTEL_ACE, (ACE_DINT[0].ie[ACE_INTL_HDAHODMA] = 1;)) \
+		IF_ENABLED(CONFIG_SOC_SERIES_INTEL_ADSP_ACE,	\
+			    (ACE_DINT[0].ie[ACE_INTL_HDAHODMA] = 1;))	\
 	}
 
 DT_INST_FOREACH_STATUS_OKAY(INTEL_ADSP_HDA_DMA_HOST_OUT_INIT)
diff --git a/drivers/mm/mm_drv_intel_adsp_mtl_tlb.c b/drivers/mm/mm_drv_intel_adsp_mtl_tlb.c
index 51d176a5fef..b78a247ae01 100644
--- a/drivers/mm/mm_drv_intel_adsp_mtl_tlb.c
+++ b/drivers/mm/mm_drv_intel_adsp_mtl_tlb.c
@@ -94,7 +94,7 @@ static uint32_t get_hpsram_bank_idx(uintptr_t pa)
  */
 static uint16_t flags_to_tlb_perms(uint32_t flags)
 {
-#if defined(CONFIG_SOC_SERIES_INTEL_ACE)
+#if defined(CONFIG_SOC_SERIES_INTEL_ADSP_ACE)
 	uint16_t perms = 0;
 
 	if ((flags & SYS_MM_MEM_PERM_RW) == SYS_MM_MEM_PERM_RW) {
@@ -111,7 +111,7 @@ static uint16_t flags_to_tlb_perms(uint32_t flags)
 #endif
 }
 
-#if defined(CONFIG_SOC_SERIES_INTEL_ACE)
+#if defined(CONFIG_SOC_SERIES_INTEL_ADSP_ACE)
 /**
  * Convert TLB entry permission bits to the SYS_MM_MEM_PERM_* flags.
  *
@@ -136,7 +136,7 @@ static uint16_t tlb_perms_to_flags(uint16_t perms)
 
 static int sys_mm_drv_hpsram_pwr(uint32_t bank_idx, bool enable, bool non_blocking)
 {
-#if defined(CONFIG_SOC_SERIES_INTEL_ACE)
+#if defined(CONFIG_SOC_SERIES_INTEL_ADSP_ACE)
 	if (bank_idx > ace_hpsram_get_bank_count()) {
 		return -1;
 	}
@@ -484,7 +484,7 @@ int sys_mm_drv_page_flag_get(void *virt, uint32_t *flags)
 	ARG_UNUSED(virt);
 	int ret = 0;
 
-#if defined(CONFIG_SOC_SERIES_INTEL_ACE)
+#if defined(CONFIG_SOC_SERIES_INTEL_ADSP_ACE)
 	uint16_t *tlb_entries = UINT_TO_POINTER(TLB_BASE);
 	uint16_t ent;
 
diff --git a/drivers/timer/intel_adsp_timer.c b/drivers/timer/intel_adsp_timer.c
index 116a512f8fe..330e5bbd425 100644
--- a/drivers/timer/intel_adsp_timer.c
+++ b/drivers/timer/intel_adsp_timer.c
@@ -27,7 +27,7 @@
 
 #define COMPARATOR_IDX  0 /* 0 or 1 */
 
-#ifdef CONFIG_SOC_SERIES_INTEL_ACE
+#ifdef CONFIG_SOC_SERIES_INTEL_ADSP_ACE
 #define TIMER_IRQ ACE_IRQ_TO_ZEPHYR(ACE_INTL_TTS)
 #else
 #define TIMER_IRQ DSP_WCT_IRQ(COMPARATOR_IDX)
@@ -198,7 +198,7 @@ static void irq_init(void)
 	 * (for per-core control) above the interrupt controller.
 	 * Drivers need to do that part.
 	 */
-#ifdef CONFIG_SOC_SERIES_INTEL_ACE
+#ifdef CONFIG_SOC_SERIES_INTEL_ADSP_ACE
 	ACE_DINT[cpu].ie[ACE_INTL_TTS] |= BIT(COMPARATOR_IDX + 1);
 	sys_write32(sys_read32(DSPWCTCS_ADDR) | ADSP_SHIM_DSPWCTCS_TTIE(COMPARATOR_IDX),
 			DSPWCTCS_ADDR);
diff --git a/soc/intel/intel_adsp/CMakeLists.txt b/soc/intel/intel_adsp/CMakeLists.txt
index eabae1f9b48..45c97d34cfa 100644
--- a/soc/intel/intel_adsp/CMakeLists.txt
+++ b/soc/intel/intel_adsp/CMakeLists.txt
@@ -6,7 +6,7 @@
 zephyr_include_directories(common)
 
 add_subdirectory(common)
-if(CONFIG_SOC_SERIES_INTEL_ACE)
+if(CONFIG_SOC_SERIES_INTEL_ADSP_ACE)
 	zephyr_include_directories(ace)
 	add_subdirectory(ace)
 endif()
diff --git a/soc/intel/intel_adsp/ace/Kconfig b/soc/intel/intel_adsp/ace/Kconfig
index 99c5380c3cb..631fdd405dc 100644
--- a/soc/intel/intel_adsp/ace/Kconfig
+++ b/soc/intel/intel_adsp/ace/Kconfig
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-config SOC_SERIES_INTEL_ACE
+config SOC_SERIES_INTEL_ADSP_ACE
 	select SOC_FAMILY_INTEL_ADSP
 	select XTENSA
 	select XTENSA_HAL if (("$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xcc") && ("$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xt-clang"))
@@ -14,10 +14,10 @@ config SOC_SERIES_INTEL_ACE
 	select HAS_PM
 
 config SOC_INTEL_ACE15_MTPM
-	select SOC_SERIES_INTEL_ACE
+	select SOC_SERIES_INTEL_ADSP_ACE
 
 config SOC_INTEL_ACE20_LNL
-	select SOC_SERIES_INTEL_ACE
+	select SOC_SERIES_INTEL_ADSP_ACE
 
 config SOC_INTEL_COMM_WIDGET
 	bool "Intel Communication Widget driver"
diff --git a/soc/intel/intel_adsp/ace/Kconfig.defconfig.series b/soc/intel/intel_adsp/ace/Kconfig.defconfig.series
index 2141a270c25..85d64c3bd0c 100644
--- a/soc/intel/intel_adsp/ace/Kconfig.defconfig.series
+++ b/soc/intel/intel_adsp/ace/Kconfig.defconfig.series
@@ -1,7 +1,7 @@
 # Copyright (c) 2022-2024 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 
-if SOC_SERIES_INTEL_ACE
+if SOC_SERIES_INTEL_ADSP_ACE
 
 config SMP
 	default y
@@ -62,4 +62,4 @@ endif # LOG
 
 rsource "Kconfig.defconfig.ace*"
 
-endif # SOC_SERIES_INTEL_ACE
+endif # SOC_SERIES_INTEL_ADSP_ACE
diff --git a/soc/intel/intel_adsp/ace/Kconfig.soc b/soc/intel/intel_adsp/ace/Kconfig.soc
index c8a9f785c60..116b80e77c1 100644
--- a/soc/intel/intel_adsp/ace/Kconfig.soc
+++ b/soc/intel/intel_adsp/ace/Kconfig.soc
@@ -2,16 +2,16 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-config SOC_SERIES_INTEL_ACE
+config SOC_SERIES_INTEL_ADSP_ACE
 	bool
 	help
 	  Intel ADSP ACE
 
 config SOC_SERIES
-	default "ace" if SOC_SERIES_INTEL_ACE
+	default "intel_adsp_ace" if SOC_SERIES_INTEL_ADSP_ACE
 
 config SOC_TOOLCHAIN_NAME
-	default "intel_ace15_mtpm" if SOC_SERIES_INTEL_ACE
+	default "intel_ace15_mtpm" if SOC_SERIES_INTEL_ADSP_ACE
 
 config SOC_INTEL_ACE15_MTPM
 	bool
diff --git a/soc/intel/intel_adsp/common/boot.c b/soc/intel/intel_adsp/common/boot.c
index 75eed9d63b0..ad7f91eec7d 100644
--- a/soc/intel/intel_adsp/common/boot.c
+++ b/soc/intel/intel_adsp/common/boot.c
@@ -44,7 +44,7 @@
 #define MANIFEST_SEGMENT_COUNT	3
 
 /* FIXME: Use Kconfig or some other means */
-#if !defined(CONFIG_SOC_SERIES_INTEL_ACE)
+#if !defined(CONFIG_SOC_SERIES_INTEL_ADSP_ACE)
 #define RESET_MEMORY_HOLE
 #endif
 
diff --git a/soc/intel/intel_adsp/common/clk.c b/soc/intel/intel_adsp/common/clk.c
index 0f3f3d32b80..f9a35a3c018 100644
--- a/soc/intel/intel_adsp/common/clk.c
+++ b/soc/intel/intel_adsp/common/clk.c
@@ -26,7 +26,7 @@ static void select_cpu_clock_hw(uint32_t freq_idx)
 {
 	uint32_t enc = adsp_clock_freq_enc[freq_idx];
 
-#ifdef CONFIG_SOC_SERIES_INTEL_ACE
+#ifdef CONFIG_SOC_SERIES_INTEL_ADSP_ACE
 	uint32_t clk_ctl = ADSP_CLKCTL;
 
 	clk_ctl &= ~ADSP_CLKCTL_OSC_SOURCE_MASK;
@@ -89,7 +89,7 @@ void adsp_clock_init(void)
 	int i;
 
 #ifdef ADSP_CLOCK_HAS_WOVCRO
-#ifdef CONFIG_SOC_SERIES_INTEL_ACE
+#ifdef CONFIG_SOC_SERIES_INTEL_ADSP_ACE
 	ACE_DfPMCCU.dfclkctl |= ACE_CLKCTL_WOVCRO;
 	if (ACE_DfPMCCU.dfclkctl & ACE_CLKCTL_WOVCRO) {
 		ACE_DfPMCCU.dfclkctl = ACE_DfPMCCU.dfclkctl & ~ACE_CLKCTL_WOVCRO;
@@ -103,7 +103,7 @@ void adsp_clock_init(void)
 	} else {
 		platform_lowest_freq_idx = ADSP_CPU_CLOCK_FREQ_LPRO;
 	}
-#endif /* CONFIG_SOC_SERIES_INTEL_ACE */
+#endif /* CONFIG_SOC_SERIES_INTEL_ADSP_ACE */
 #endif /* ADSP_CLOCK_HAS_WOVCRO */
 
 	unsigned int num_cpus = arch_num_cpus();
diff --git a/soc/intel/intel_adsp/common/include/adsp-vectors.h b/soc/intel/intel_adsp/common/include/adsp-vectors.h
index 383dce93aa3..01e660e43ea 100644
--- a/soc/intel/intel_adsp/common/include/adsp-vectors.h
+++ b/soc/intel/intel_adsp/common/include/adsp-vectors.h
@@ -24,13 +24,13 @@
 #define INTLEVEL4_VECTOR_PADDR_SRAM \
 	(VECBASE_RESET_PADDR_SRAM + XCHAL_INTLEVEL4_VECOFS)
 
-#ifndef SOC_SERIES_INTEL_ACE
+#ifndef SOC_SERIES_INTEL_ADSP_ACE
 #define INTLEVEL5_VECTOR_PADDR_SRAM \
 	(VECBASE_RESET_PADDR_SRAM + XCHAL_INTLEVEL5_VECOFS)
 
 #define INTLEVEL6_VECTOR_PADDR_SRAM \
 	(VECBASE_RESET_PADDR_SRAM + XCHAL_INTLEVEL6_VECOFS)
-#endif /* SOC_SERIES_INTEL_ACE */
+#endif /* SOC_SERIES_INTEL_ADSP_ACE */
 
 
 #define INTLEVEL7_VECTOR_PADDR_SRAM \
diff --git a/soc/intel/intel_adsp/common/include/adsp_clk.h b/soc/intel/intel_adsp/common/include/adsp_clk.h
index 34d7c21822d..ccfb5cdc7e7 100644
--- a/soc/intel/intel_adsp/common/include/adsp_clk.h
+++ b/soc/intel/intel_adsp/common/include/adsp_clk.h
@@ -36,7 +36,7 @@ int adsp_clock_set_cpu_freq(uint32_t freq_idx);
 struct adsp_cpu_clock_info *adsp_cpu_clocks_get(void);
 
 /* Device tree defined constants */
-#ifdef CONFIG_SOC_SERIES_INTEL_ACE
+#ifdef CONFIG_SOC_SERIES_INTEL_ADSP_ACE
 #define ADSP_CLKCTL		ACE_DfPMCCU.dfclkctl
 #else
 #define ADSP_CLKCTL		CAVS_SHIM.clkctl
diff --git a/soc/intel/intel_adsp/common/include/intel_adsp_hda.h b/soc/intel/intel_adsp/common/include/intel_adsp_hda.h
index f56c77e2523..628a84cd1a0 100644
--- a/soc/intel/intel_adsp/common/include/intel_adsp_hda.h
+++ b/soc/intel/intel_adsp/common/include/intel_adsp_hda.h
@@ -446,14 +446,14 @@ static inline void intel_adsp_hda_disable_buffer_interrupt(uint32_t base, uint32
 
 static inline void intel_adsp_force_dmi_l0_state(void)
 {
-#ifdef CONFIG_SOC_SERIES_INTEL_ACE
+#ifdef CONFIG_SOC_SERIES_INTEL_ADSP_ACE
 	ACE_DfPMCCH.svcfg |= ADSP_FORCE_DECOUPLED_HDMA_L1_EXIT_BIT;
 #endif
 }
 
 static inline void intel_adsp_allow_dmi_l1_state(void)
 {
-#ifdef CONFIG_SOC_SERIES_INTEL_ACE
+#ifdef CONFIG_SOC_SERIES_INTEL_ADSP_ACE
 	ACE_DfPMCCH.svcfg &= ~(ADSP_FORCE_DECOUPLED_HDMA_L1_EXIT_BIT);
 #endif
 }
diff --git a/soc/intel/intel_adsp/common/ipc.c b/soc/intel/intel_adsp/common/ipc.c
index 6ae1956ffac..a73d696a68a 100644
--- a/soc/intel/intel_adsp/common/ipc.c
+++ b/soc/intel/intel_adsp/common/ipc.c
@@ -55,7 +55,7 @@ void z_intel_adsp_ipc_isr(const void *devarg)
 
 		regs->tdr = INTEL_ADSP_IPC_BUSY;
 		if (done) {
-#ifdef CONFIG_SOC_SERIES_INTEL_ACE
+#ifdef CONFIG_SOC_SERIES_INTEL_ADSP_ACE
 			regs->tda = INTEL_ADSP_IPC_ACE1X_TDA_DONE;
 #else
 			regs->tda = INTEL_ADSP_IPC_DONE;
@@ -100,7 +100,7 @@ int intel_adsp_ipc_init(const struct device *dev)
 	 */
 	config->regs->tdr = INTEL_ADSP_IPC_BUSY;
 	config->regs->ida = INTEL_ADSP_IPC_DONE;
-#ifdef CONFIG_SOC_SERIES_INTEL_ACE
+#ifdef CONFIG_SOC_SERIES_INTEL_ADSP_ACE
 	config->regs->tda = INTEL_ADSP_IPC_ACE1X_TDA_DONE;
 #else
 	config->regs->tda = INTEL_ADSP_IPC_DONE;
@@ -115,7 +115,7 @@ void intel_adsp_ipc_complete(const struct device *dev)
 {
 	const struct intel_adsp_ipc_config *config = dev->config;
 
-#ifdef CONFIG_SOC_SERIES_INTEL_ACE
+#ifdef CONFIG_SOC_SERIES_INTEL_ADSP_ACE
 	config->regs->tda = INTEL_ADSP_IPC_ACE1X_TDA_DONE;
 #else
 	config->regs->tda = INTEL_ADSP_IPC_DONE;
@@ -208,7 +208,7 @@ void intel_adsp_ipc_send_message_emergency(const struct device *dev, uint32_t da
 
 #if DT_NODE_EXISTS(INTEL_ADSP_IPC_HOST_DTNODE)
 
-#if defined(CONFIG_SOC_SERIES_INTEL_ACE)
+#if defined(CONFIG_SOC_SERIES_INTEL_ADSP_ACE)
 static inline void ace_ipc_intc_unmask(void)
 {
 	ACE_DINT[0].ie[ACE_INTL_HIPC] = BIT(0);
diff --git a/soc/intel/intel_adsp/soc.yml b/soc/intel/intel_adsp/soc.yml
index fbfe6de4385..757750eeb37 100644
--- a/soc/intel/intel_adsp/soc.yml
+++ b/soc/intel/intel_adsp/soc.yml
@@ -1,7 +1,7 @@
 family:
   - name: intel_adsp
     series:
-      - name: ace
+      - name: intel_adsp_ace
         socs:
           - name: ace15_mtpm
           - name: ace20_lnl
diff --git a/submanifests/optional.yaml b/submanifests/optional.yaml
index ccc11a0015e..42a717fae1a 100644
--- a/submanifests/optional.yaml
+++ b/submanifests/optional.yaml
@@ -34,7 +34,7 @@ manifest:
       groups:
         - optional
     - name: sof
-      revision: pull/38/head
+      revision: pull/39/head
       path: modules/audio/sof
       remote: upstream
       groups: