michael/zephyr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

soc: intel_adsp: hwmv2: Align SOC_SERIES_INTEL_ACE name and value

Browse Source 
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>
This commit is contained in:
Dmitrii Golovanov
2024-02-22 13:04:58 +01:00
committed by Carles Cufi
parent 6734597a76
commit 3f08e714b2
23 changed files with 66 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/dai/intel/dmic/dmic.c
View File

@@ -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); dai_dmic_start_fifo_packers(dmic, dmic->dai_config_params.dai_index);
for (i = 0; i < CONFIG_DAI_DMIC_HW_CONTROLLERS; i++) { 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, dai_dmic_update_bits(dmic, dmic_base[i] + CIC_CONTROL,
CIC_CONTROL_SOFT_RESET, 0); 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)); 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 /* Clear soft reset for all/used PDM controllers. This should
* start capture in sync. * start capture in sync.
*/ */

18
drivers/dai/intel/dmic/dmic_nhlt.c
View File

@@ -175,7 +175,7 @@ static int dai_nhlt_update_rate(struct dai_intel_dmic *dmic, const int clock_sou
return 0; 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, static int dai_ipm_source_to_enable(struct dai_intel_dmic *dmic,
int *count, int pdm_count, int stereo, int *count, int pdm_count, int stereo,
int source_pdm) 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) static int print_outcontrol(uint32_t val)
{ {
int bf1, bf2, bf3, bf4, bf5, bf6, bf7, bf8; 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; int bf9, bf10, bf11, bf12, bf13;
#endif #endif
uint32_t ref; uint32_t ref;
@@ -447,7 +447,7 @@ static int print_outcontrol(uint32_t val)
return -EINVAL; return -EINVAL;
} }
#ifdef CONFIG_SOC_SERIES_INTEL_ACE #ifdef CONFIG_SOC_SERIES_INTEL_ADSP_ACE
bf9 = FIELD_GET(OUTCONTROL_IPM_SOURCE_1, val); bf9 = FIELD_GET(OUTCONTROL_IPM_SOURCE_1, val);
bf10 = FIELD_GET(OUTCONTROL_IPM_SOURCE_2, val); bf10 = FIELD_GET(OUTCONTROL_IPM_SOURCE_2, val);
bf11 = FIELD_GET(OUTCONTROL_IPM_SOURCE_3, 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); bf4 = FIELD_GET(CIC_CONTROL_MIC_B_POLARITY, val);
bf5 = FIELD_GET(CIC_CONTROL_MIC_A_POLARITY, val); bf5 = FIELD_GET(CIC_CONTROL_MIC_A_POLARITY, val);
bf6 = FIELD_GET(CIC_CONTROL_MIC_MUTE, 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); bf7 = FIELD_GET(CIC_CONTROL_STEREO_MODE, val);
#else #else
bf7 = -1; 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_B_POLARITY, bf4) |
FIELD_PREP(CIC_CONTROL_MIC_A_POLARITY, bf5) | FIELD_PREP(CIC_CONTROL_MIC_A_POLARITY, bf5) |
FIELD_PREP(CIC_CONTROL_MIC_MUTE, bf6) 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) | FIELD_PREP(CIC_CONTROL_STEREO_MODE, bf7)
#endif #endif
; ;
@@ -520,7 +520,7 @@ static void print_fir_control(uint32_t val)
bf1 = FIELD_GET(FIR_CONTROL_START, val); bf1 = FIELD_GET(FIR_CONTROL_START, val);
bf2 = FIELD_GET(FIR_CONTROL_ARRAY_START_EN, 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); bf3 = FIELD_GET(FIR_CONTROL_PERIODIC_START_EN, val);
#else #else
bf3 = -1; 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); LOG_DBG(" dccomp=%d, mute=%d, stereo=%d", bf4, bf5, bf6);
ref = FIELD_PREP(FIR_CONTROL_START, bf1) | ref = FIELD_PREP(FIR_CONTROL_START, bf1) |
FIELD_PREP(FIR_CONTROL_ARRAY_START_EN, bf2) | 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) | FIELD_PREP(FIR_CONTROL_PERIODIC_START_EN, bf3) |
#endif #endif
FIELD_PREP(FIR_CONTROL_DCCOMP, bf4) | 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; 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); bf1 = FIELD_GET(MIC_CONTROL_PDM_SKEW, val);
#else #else
bf1 = -1; 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); ret = dai_nhlt_dmic_dai_params_get(dmic, dmic_cfg->clock_source);
#else #else
ret = dai_nhlt_dmic_dai_params_get(dmic); ret = dai_nhlt_dmic_dai_params_get(dmic);

2
drivers/dai/intel/ssp/Kconfig.ssp
View File

@@ -15,7 +15,7 @@ config DAI_INTEL_SSP
config DAI_SSP_HAS_POWER_CONTROL config DAI_SSP_HAS_POWER_CONTROL
bool "DAI ssp pm_runtime en/dis ssp power" 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 depends on DAI_INTEL_SSP
if DAI_INTEL_SSP if DAI_INTEL_SSP

6
drivers/dai/intel/ssp/ssp.c
View File

@@ -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); size = sizeof(struct ssp_intel_ext_ctl);
break; break;
case SSP_LINK_CLK_SOURCE: 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); size = sizeof(struct ssp_intel_link_ctl);
break; break;
#else #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_node_ctl *node;
struct ssp_intel_sync_ctl *sync; struct ssp_intel_sync_ctl *sync;
struct ssp_intel_ext_ctl *ext; 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; struct ssp_intel_link_ctl *link;
#endif #endif
uint8_t *aux_ptr; 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); LOG_INF("ext ext_data %u", ext->ext_data);
break; break;
case SSP_LINK_CLK_SOURCE: 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; link = (struct ssp_intel_link_ctl *)&aux_tlv->val;
#if CONFIG_SOC_INTEL_ACE15_MTPM #if CONFIG_SOC_INTEL_ACE15_MTPM

2
drivers/dai/intel/ssp/ssp.h
View File

@@ -236,7 +236,7 @@
#define SHIM_CLKCTL_I2SFDCGB(x) BIT(20 + x) #define SHIM_CLKCTL_I2SFDCGB(x) BIT(20 + x)
#define SHIM_CLKCTL_I2SEFDCGB(x) BIT(18 + 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. */ /** \brief Offset of MCLK Divider Control Register. */
#define MN_MDIVCTRL 0x100 #define MN_MDIVCTRL 0x100

2
drivers/dma/Kconfig.intel_adsp_gpdma
View File

@@ -21,7 +21,7 @@ config DMA_INTEL_ADSP_GPDMA_NEED_CONTROLLER_OWNERSHIP
config DMA_INTEL_ADSP_GPDMA_HAS_LLP config DMA_INTEL_ADSP_GPDMA_HAS_LLP
bool "Intel ADSP GPDMA Linear Link Position Feature" bool "Intel ADSP GPDMA Linear Link Position Feature"
default y if SOC_SERIES_INTEL_ACE default y if SOC_SERIES_INTEL_ADSP_ACE
help help
Intel ADSP GPDMA may optionally have a linear link position Intel ADSP GPDMA may optionally have a linear link position
feature. feature.

30
drivers/dma/dma_intel_adsp_gpdma.c
View File

@@ -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) static int intel_adsp_gpdma_start(const struct device *dev, uint32_t channel)
{ {
int ret = 0; 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; bool first_use = false;
enum pm_device_state state; 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); 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, /* 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 * we need to make sure that the pm_device_runtime_get and pm_device_runtime_put functions
* calls are balanced. * 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 reg = dev_cfg->shim + GPDMA_CTL_OFFSET;
uint32_t val; 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; val = sys_read32(reg) | GPDMA_CTL_DCGD;
} else { } else {
val = GPDMA_CTL_FDCGB; val = GPDMA_CTL_FDCGB;
@@ -258,7 +258,7 @@ static void intel_adsp_gpdma_clock_enable(const struct device *dev)
#ifdef CONFIG_PM_DEVICE #ifdef CONFIG_PM_DEVICE
static void intel_adsp_gpdma_clock_disable(const struct device *dev) 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; const struct intel_adsp_gpdma_cfg *const dev_cfg = dev->config;
uint32_t reg = dev_cfg->shim + GPDMA_CTL_OFFSET; uint32_t reg = dev_cfg->shim + GPDMA_CTL_OFFSET;
uint32_t val = sys_read32(reg) & ~GPDMA_CTL_DCGD; 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) static void intel_adsp_gpdma_claim_ownership(const struct device *dev)
{ {
#ifdef CONFIG_DMA_INTEL_ADSP_GPDMA_NEED_CONTROLLER_OWNERSHIP #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; const struct intel_adsp_gpdma_cfg *const dev_cfg = dev->config;
uint32_t reg = dev_cfg->shim + GPDMA_CTL_OFFSET; uint32_t reg = dev_cfg->shim + GPDMA_CTL_OFFSET;
uint32_t val = sys_read32(reg) | GPDMA_OSEL(0x3); 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(0));
sys_write32(LPGPDMA_CHOSEL_FLAG | LPGPDMA_CTLOSEL_FLAG, DSP_INIT_LPGPDMA(1)); sys_write32(LPGPDMA_CHOSEL_FLAG | LPGPDMA_CTLOSEL_FLAG, DSP_INIT_LPGPDMA(1));
ARG_UNUSED(dev); 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 */ #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) static void intel_adsp_gpdma_release_ownership(const struct device *dev)
{ {
#ifdef CONFIG_DMA_INTEL_ADSP_GPDMA_NEED_CONTROLLER_OWNERSHIP #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; const struct intel_adsp_gpdma_cfg *const dev_cfg = dev->config;
uint32_t reg = dev_cfg->shim + GPDMA_CTL_OFFSET; uint32_t reg = dev_cfg->shim + GPDMA_CTL_OFFSET;
uint32_t val = sys_read32(reg) & ~GPDMA_OSEL(0x3); 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, /* CHECKME: Do CAVS platforms set ownership over DMA,
* if yes, add support for it releasing. * 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 /* CONFIG_DMA_INTEL_ADSP_GPDMA_NEED_CONTROLLER_OWNERSHIP */
} }
#endif #endif
#ifdef CONFIG_SOC_SERIES_INTEL_ACE #ifdef CONFIG_SOC_SERIES_INTEL_ADSP_ACE
static int intel_adsp_gpdma_enable(const struct device *dev) static int intel_adsp_gpdma_enable(const struct device *dev)
{ {
const struct intel_adsp_gpdma_cfg *const dev_cfg = dev->config; 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; return 0;
} }
#endif /* CONFIG_PM_DEVICE */ #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) static int intel_adsp_gpdma_power_on(const struct device *dev)
{ {
const struct intel_adsp_gpdma_cfg *const dev_cfg = dev->config; const struct intel_adsp_gpdma_cfg *const dev_cfg = dev->config;
int ret; int ret;
#ifdef CONFIG_SOC_SERIES_INTEL_ACE #ifdef CONFIG_SOC_SERIES_INTEL_ADSP_ACE
/* Power up */ /* Power up */
ret = intel_adsp_gpdma_enable(dev); ret = intel_adsp_gpdma_enable(dev);
@@ -377,12 +377,12 @@ static int intel_adsp_gpdma_power_off(const struct device *dev)
/* Relesing DMA ownership*/ /* Relesing DMA ownership*/
intel_adsp_gpdma_release_ownership(dev); intel_adsp_gpdma_release_ownership(dev);
#ifdef CONFIG_SOC_SERIES_INTEL_ACE #ifdef CONFIG_SOC_SERIES_INTEL_ADSP_ACE
/* Power down */ /* Power down */
return intel_adsp_gpdma_disable(dev); return intel_adsp_gpdma_disable(dev);
#else #else
return 0; return 0;
#endif /* CONFIG_SOC_SERIES_INTEL_ACE */ #endif /* CONFIG_SOC_SERIES_INTEL_ADSP_ACE */
} }
#endif /* CONFIG_PM_DEVICE */ #endif /* CONFIG_PM_DEVICE */
@@ -423,7 +423,7 @@ int intel_adsp_gpdma_get_attribute(const struct device *dev, uint32_t type, uint
return 0; return 0;
} }
#ifdef CONFIG_SOC_SERIES_INTEL_ACE #ifdef CONFIG_SOC_SERIES_INTEL_ADSP_ACE
static inline void ace_gpdma_intc_unmask(void) static inline void ace_gpdma_intc_unmask(void)
{ {
ACE_DINT[0].ie[ACE_INTL_GPDMA] = BIT(0); 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(); 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)) { if (pm_device_on_power_domain(dev)) {
pm_device_init_off(dev); pm_device_init_off(dev);
} else { } else {

3
drivers/dma/dma_intel_adsp_hda_host_in.c
View File

@@ -49,7 +49,8 @@ static const struct dma_driver_api intel_adsp_hda_dma_host_in_api = {
DEVICE_DT_INST_GET(inst), \ DEVICE_DT_INST_GET(inst), \
DT_INST_IRQ(inst, sense)); \ DT_INST_IRQ(inst, sense)); \
irq_enable(DT_INST_IRQN(inst)); \ 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) DT_INST_FOREACH_STATUS_OKAY(INTEL_ADSP_HDA_DMA_HOST_IN_INIT)

3
drivers/dma/dma_intel_adsp_hda_host_out.c
View File

@@ -53,7 +53,8 @@ static const struct dma_driver_api intel_adsp_hda_dma_host_out_api = {
DEVICE_DT_INST_GET(inst), \ DEVICE_DT_INST_GET(inst), \
DT_INST_IRQ(inst, sense)); \ DT_INST_IRQ(inst, sense)); \
irq_enable(DT_INST_IRQN(inst)); \ 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) DT_INST_FOREACH_STATUS_OKAY(INTEL_ADSP_HDA_DMA_HOST_OUT_INIT)

8
drivers/mm/mm_drv_intel_adsp_mtl_tlb.c
View File

@@ -94,7 +94,7 @@ static uint32_t get_hpsram_bank_idx(uintptr_t pa)
*/ */
static uint16_t flags_to_tlb_perms(uint32_t flags) 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; uint16_t perms = 0;
if ((flags & SYS_MM_MEM_PERM_RW) == SYS_MM_MEM_PERM_RW) { 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 #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. * 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) 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()) { if (bank_idx > ace_hpsram_get_bank_count()) {
return -1; return -1;
} }
@@ -484,7 +484,7 @@ int sys_mm_drv_page_flag_get(void *virt, uint32_t *flags)
ARG_UNUSED(virt); ARG_UNUSED(virt);
int ret = 0; 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 *tlb_entries = UINT_TO_POINTER(TLB_BASE);
uint16_t ent; uint16_t ent;

4
drivers/timer/intel_adsp_timer.c
View File

@@ -27,7 +27,7 @@
#define COMPARATOR_IDX 0 /* 0 or 1 */ #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) #define TIMER_IRQ ACE_IRQ_TO_ZEPHYR(ACE_INTL_TTS)
#else #else
#define TIMER_IRQ DSP_WCT_IRQ(COMPARATOR_IDX) #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. * (for per-core control) above the interrupt controller.
* Drivers need to do that part. * 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); ACE_DINT[cpu].ie[ACE_INTL_TTS] |= BIT(COMPARATOR_IDX + 1);
sys_write32(sys_read32(DSPWCTCS_ADDR) | ADSP_SHIM_DSPWCTCS_TTIE(COMPARATOR_IDX), sys_write32(sys_read32(DSPWCTCS_ADDR) | ADSP_SHIM_DSPWCTCS_TTIE(COMPARATOR_IDX),
DSPWCTCS_ADDR); DSPWCTCS_ADDR);

2
soc/intel/intel_adsp/CMakeLists.txt
View File

@@ -6,7 +6,7 @@
zephyr_include_directories(common) zephyr_include_directories(common)
add_subdirectory(common) add_subdirectory(common)
if(CONFIG_SOC_SERIES_INTEL_ACE) if(CONFIG_SOC_SERIES_INTEL_ADSP_ACE)
zephyr_include_directories(ace) zephyr_include_directories(ace)
add_subdirectory(ace) add_subdirectory(ace)
endif() endif()

6
soc/intel/intel_adsp/ace/Kconfig
View File

@@ -2,7 +2,7 @@
# #
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
config SOC_SERIES_INTEL_ACE config SOC_SERIES_INTEL_ADSP_ACE
select SOC_FAMILY_INTEL_ADSP select SOC_FAMILY_INTEL_ADSP
select XTENSA select XTENSA
select XTENSA_HAL if (("$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xcc") && ("$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xt-clang")) 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 select HAS_PM
config SOC_INTEL_ACE15_MTPM config SOC_INTEL_ACE15_MTPM
select SOC_SERIES_INTEL_ACE select SOC_SERIES_INTEL_ADSP_ACE
config SOC_INTEL_ACE20_LNL config SOC_INTEL_ACE20_LNL
select SOC_SERIES_INTEL_ACE select SOC_SERIES_INTEL_ADSP_ACE
config SOC_INTEL_COMM_WIDGET config SOC_INTEL_COMM_WIDGET
bool "Intel Communication Widget driver" bool "Intel Communication Widget driver"

4
soc/intel/intel_adsp/ace/Kconfig.defconfig.series
View File

@@ -1,7 +1,7 @@
# Copyright (c) 2022-2024 Intel Corporation # Copyright (c) 2022-2024 Intel Corporation
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
if SOC_SERIES_INTEL_ACE if SOC_SERIES_INTEL_ADSP_ACE
config SMP config SMP
default y default y
@@ -62,4 +62,4 @@ endif # LOG
rsource "Kconfig.defconfig.ace*" rsource "Kconfig.defconfig.ace*"
endif # SOC_SERIES_INTEL_ACE endif # SOC_SERIES_INTEL_ADSP_ACE

6
soc/intel/intel_adsp/ace/Kconfig.soc
View File

@@ -2,16 +2,16 @@
# #
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
config SOC_SERIES_INTEL_ACE config SOC_SERIES_INTEL_ADSP_ACE
bool bool
help help
Intel ADSP ACE Intel ADSP ACE
config SOC_SERIES config SOC_SERIES
default "ace" if SOC_SERIES_INTEL_ACE default "intel_adsp_ace" if SOC_SERIES_INTEL_ADSP_ACE
config SOC_TOOLCHAIN_NAME 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 config SOC_INTEL_ACE15_MTPM
bool bool

2
soc/intel/intel_adsp/common/boot.c
View File

@@ -44,7 +44,7 @@
#define MANIFEST_SEGMENT_COUNT 3 #define MANIFEST_SEGMENT_COUNT 3
/* FIXME: Use Kconfig or some other means */ /* 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 #define RESET_MEMORY_HOLE
#endif #endif

6
soc/intel/intel_adsp/common/clk.c
View File

@@ -26,7 +26,7 @@ static void select_cpu_clock_hw(uint32_t freq_idx)
{ {
uint32_t enc = adsp_clock_freq_enc[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; uint32_t clk_ctl = ADSP_CLKCTL;
clk_ctl &= ~ADSP_CLKCTL_OSC_SOURCE_MASK; clk_ctl &= ~ADSP_CLKCTL_OSC_SOURCE_MASK;
@@ -89,7 +89,7 @@ void adsp_clock_init(void)
int i; int i;
#ifdef ADSP_CLOCK_HAS_WOVCRO #ifdef ADSP_CLOCK_HAS_WOVCRO
#ifdef CONFIG_SOC_SERIES_INTEL_ACE #ifdef CONFIG_SOC_SERIES_INTEL_ADSP_ACE
ACE_DfPMCCU.dfclkctl |= ACE_CLKCTL_WOVCRO; ACE_DfPMCCU.dfclkctl |= ACE_CLKCTL_WOVCRO;
if (ACE_DfPMCCU.dfclkctl & ACE_CLKCTL_WOVCRO) { if (ACE_DfPMCCU.dfclkctl & ACE_CLKCTL_WOVCRO) {
ACE_DfPMCCU.dfclkctl = 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 { } else {
platform_lowest_freq_idx = ADSP_CPU_CLOCK_FREQ_LPRO; 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 */ #endif /* ADSP_CLOCK_HAS_WOVCRO */
unsigned int num_cpus = arch_num_cpus(); unsigned int num_cpus = arch_num_cpus();

4
soc/intel/intel_adsp/common/include/adsp-vectors.h
View File

@@ -24,13 +24,13 @@
#define INTLEVEL4_VECTOR_PADDR_SRAM \ #define INTLEVEL4_VECTOR_PADDR_SRAM \
(VECBASE_RESET_PADDR_SRAM + XCHAL_INTLEVEL4_VECOFS) (VECBASE_RESET_PADDR_SRAM + XCHAL_INTLEVEL4_VECOFS)
#ifndef SOC_SERIES_INTEL_ACE #ifndef SOC_SERIES_INTEL_ADSP_ACE
#define INTLEVEL5_VECTOR_PADDR_SRAM \ #define INTLEVEL5_VECTOR_PADDR_SRAM \
(VECBASE_RESET_PADDR_SRAM + XCHAL_INTLEVEL5_VECOFS) (VECBASE_RESET_PADDR_SRAM + XCHAL_INTLEVEL5_VECOFS)
#define INTLEVEL6_VECTOR_PADDR_SRAM \ #define INTLEVEL6_VECTOR_PADDR_SRAM \
(VECBASE_RESET_PADDR_SRAM + XCHAL_INTLEVEL6_VECOFS) (VECBASE_RESET_PADDR_SRAM + XCHAL_INTLEVEL6_VECOFS)
#endif /* SOC_SERIES_INTEL_ACE */ #endif /* SOC_SERIES_INTEL_ADSP_ACE */
#define INTLEVEL7_VECTOR_PADDR_SRAM \ #define INTLEVEL7_VECTOR_PADDR_SRAM \

2
soc/intel/intel_adsp/common/include/adsp_clk.h
View File

@@ -36,7 +36,7 @@ int adsp_clock_set_cpu_freq(uint32_t freq_idx);
struct adsp_cpu_clock_info *adsp_cpu_clocks_get(void); struct adsp_cpu_clock_info *adsp_cpu_clocks_get(void);
/* Device tree defined constants */ /* Device tree defined constants */
#ifdef CONFIG_SOC_SERIES_INTEL_ACE #ifdef CONFIG_SOC_SERIES_INTEL_ADSP_ACE
#define ADSP_CLKCTL ACE_DfPMCCU.dfclkctl #define ADSP_CLKCTL ACE_DfPMCCU.dfclkctl
#else #else
#define ADSP_CLKCTL CAVS_SHIM.clkctl #define ADSP_CLKCTL CAVS_SHIM.clkctl

4
soc/intel/intel_adsp/common/include/intel_adsp_hda.h
View File

@@ -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) 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; ACE_DfPMCCH.svcfg |= ADSP_FORCE_DECOUPLED_HDMA_L1_EXIT_BIT;
#endif #endif
} }
static inline void intel_adsp_allow_dmi_l1_state(void) 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); ACE_DfPMCCH.svcfg &= ~(ADSP_FORCE_DECOUPLED_HDMA_L1_EXIT_BIT);
#endif #endif
} }

8
soc/intel/intel_adsp/common/ipc.c
View File

@@ -55,7 +55,7 @@ void z_intel_adsp_ipc_isr(const void *devarg)
regs->tdr = INTEL_ADSP_IPC_BUSY; regs->tdr = INTEL_ADSP_IPC_BUSY;
if (done) { if (done) {
#ifdef CONFIG_SOC_SERIES_INTEL_ACE #ifdef CONFIG_SOC_SERIES_INTEL_ADSP_ACE
regs->tda = INTEL_ADSP_IPC_ACE1X_TDA_DONE; regs->tda = INTEL_ADSP_IPC_ACE1X_TDA_DONE;
#else #else
regs->tda = INTEL_ADSP_IPC_DONE; 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->tdr = INTEL_ADSP_IPC_BUSY;
config->regs->ida = INTEL_ADSP_IPC_DONE; 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; config->regs->tda = INTEL_ADSP_IPC_ACE1X_TDA_DONE;
#else #else
config->regs->tda = INTEL_ADSP_IPC_DONE; 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; 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; config->regs->tda = INTEL_ADSP_IPC_ACE1X_TDA_DONE;
#else #else
config->regs->tda = INTEL_ADSP_IPC_DONE; 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 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) static inline void ace_ipc_intc_unmask(void)
{ {
ACE_DINT[0].ie[ACE_INTL_HIPC] = BIT(0); ACE_DINT[0].ie[ACE_INTL_HIPC] = BIT(0);

2
soc/intel/intel_adsp/soc.yml
View File

@@ -1,7 +1,7 @@
family: family:
- name: intel_adsp - name: intel_adsp
series: series:
- name: ace - name: intel_adsp_ace
socs: socs:
- name: ace15_mtpm - name: ace15_mtpm
- name: ace20_lnl - name: ace20_lnl

2
submanifests/optional.yaml
View File

@@ -34,7 +34,7 @@ manifest:
groups: groups:
- optional - optional
- name: sof - name: sof
revision: pull/38/head revision: pull/39/head
path: modules/audio/sof path: modules/audio/sof
remote: upstream remote: upstream
groups: groups: