michaelh/zephyr
1
0
Fork 0
Code Releases Activity

driver: ssp: remove use of out-of-tree CONFIG_INTEL_MN

Browse source 
The SSP driver has odd dependency to outside definition of
CONFIG_INTEL_NM. This is in practise tied to SSP hardware
version and always enabled for SSP block version 1.0.

Use the new SSP_IP_VER define to replace the CONFIG_INTEL_MN
preprocssor checks. Also modify the board test case to
remove the obsolete config setting.

Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
This commit is contained in:
Kai Vehmanen 2024-11-21 21:31:17 +02:00 • committed by Henrik Brix Andersen
commit a14ae39e74
4 changed files with 9 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

16
drivers/dai/intel/ssp/ssp.c
View file

@ -122,7 +122,7 @@ static void dai_ssp_update_bits(struct dai_intel_ssp *dp, uint32_t reg, uint32_t
sys_write32((sys_read32(dest) & (~mask)) | (val & mask), dest); sys_write32((sys_read32(dest) & (~mask)) | (val & mask), dest);
} }
#if CONFIG_INTEL_MN #if SSP_IP_VER == SSP_IP_VER_1_0
static int dai_ssp_gcd(int a, int b) static int dai_ssp_gcd(int a, int b)
{ {
int aux; int aux;
@ -411,7 +411,7 @@ static void dai_ssp_mn_release_mclk(struct dai_intel_ssp *dp, uint32_t mclk_id)
k_spin_unlock(&mp->lock, key); k_spin_unlock(&mp->lock, key);
} }
#if CONFIG_INTEL_MN #if SSP_IP_VER == SSP_IP_VER_1_0
/** /**
* \brief Finds valid M/(N * SCR) values for given frequencies. * \brief Finds valid M/(N * SCR) values for given frequencies.
* \param[in] freq SSP clock frequency. * \param[in] freq SSP clock frequency.
@ -1156,7 +1156,7 @@ static void dai_ssp_mclk_disable_unprepare(struct dai_intel_ssp *dp)
static int dai_ssp_bclk_prepare_enable(struct dai_intel_ssp *dp) static int dai_ssp_bclk_prepare_enable(struct dai_intel_ssp *dp)
{ {
#if !(CONFIG_INTEL_MN) #if SSP_IP_VER != SSP_IP_VER_1_0
struct dai_intel_ssp_freq_table *ft = dai_get_ftable(dp); struct dai_intel_ssp_freq_table *ft = dai_get_ftable(dp);
#endif #endif
struct dai_intel_ssp_plat_data *ssp_plat_data = dai_get_plat_data(dp); struct dai_intel_ssp_plat_data *ssp_plat_data = dai_get_plat_data(dp);
@ -1170,7 +1170,7 @@ static int dai_ssp_bclk_prepare_enable(struct dai_intel_ssp *dp)
sscr0 = sys_read32(dai_base(dp) + SSCR0); sscr0 = sys_read32(dai_base(dp) + SSCR0);
#if CONFIG_INTEL_MN #if SSP_IP_VER == SSP_IP_VER_1_0
bool need_ecs = false; bool need_ecs = false;
/* BCLK config */ /* BCLK config */
ret = dai_ssp_mn_set_bclk(dp, dp->dai_index, ssp_plat_data->params.bclk_rate, ret = dai_ssp_mn_set_bclk(dp, dp->dai_index, ssp_plat_data->params.bclk_rate,
@ -1191,12 +1191,10 @@ static int dai_ssp_bclk_prepare_enable(struct dai_intel_ssp *dp)
mdiv = ft[DAI_INTEL_SSP_DEFAULT_IDX].freq / ssp_plat_data->params.bclk_rate; mdiv = ft[DAI_INTEL_SSP_DEFAULT_IDX].freq / ssp_plat_data->params.bclk_rate;
#endif #endif
#if SSP_IP_VER < CONFIG_SOC_INTEL_ACE30 #if SSP_IP_VER == SSP_IP_VER_1_0
#if CONFIG_INTEL_MN
if (need_ecs) { if (need_ecs) {
sscr0 |= SSCR0_ECS; sscr0 |= SSCR0_ECS;
} }
#endif
#endif #endif
/* clock divisor is SCR + 1 */ /* clock divisor is SCR + 1 */
@ -1231,7 +1229,7 @@ static void dai_ssp_bclk_disable_unprepare(struct dai_intel_ssp *dp)
if (!(ssp_plat_data->clk_active & SSP_CLK_BCLK_ACTIVE)) { if (!(ssp_plat_data->clk_active & SSP_CLK_BCLK_ACTIVE)) {
return; return;
} }
#if CONFIG_INTEL_MN #if SSP_IP_VER == SSP_IP_VER_1_0
dai_ssp_mn_release_bclk(dp, ssp_plat_data->ssp_index); dai_ssp_mn_release_bclk(dp, ssp_plat_data->ssp_index);
#endif #endif
ssp_plat_data->clk_active &= ~SSP_CLK_BCLK_ACTIVE; ssp_plat_data->clk_active &= ~SSP_CLK_BCLK_ACTIVE;
@ -2611,7 +2609,7 @@ static int dai_ssp_probe(struct dai_intel_ssp *dp)
dp->state[DAI_DIR_PLAYBACK] = DAI_STATE_READY; dp->state[DAI_DIR_PLAYBACK] = DAI_STATE_READY;
dp->state[DAI_DIR_CAPTURE] = DAI_STATE_READY; dp->state[DAI_DIR_CAPTURE] = DAI_STATE_READY;
#if CONFIG_INTEL_MN #if SSP_IP_VER == SSP_IP_VER_1_0
/* Reset M/N, power-gating functions need it */ /* Reset M/N, power-gating functions need it */
dai_ssp_mn_reset_bclk_divider(dp, ssp_plat_data->ssp_index); dai_ssp_mn_reset_bclk_divider(dp, ssp_plat_data->ssp_index);
#endif #endif

4
drivers/dai/intel/ssp/ssp.h
View file

@ -76,7 +76,7 @@
#error "Missing ssp definitions" #error "Missing ssp definitions"
#endif #endif
#if CONFIG_INTEL_MN #if SSP_IP_VER == SSP_IP_VER_1_0
/** \brief BCLKs can be driven by multiple sources - M/N or XTAL directly. /** \brief BCLKs can be driven by multiple sources - M/N or XTAL directly.
* Even in the case of M/N, the actual clock source can be XTAL, * Even in the case of M/N, the actual clock source can be XTAL,
* Audio cardinal clock (24.576) or 96 MHz PLL. * Audio cardinal clock (24.576) or 96 MHz PLL.
@ -104,7 +104,7 @@ struct dai_intel_ssp_mn {
int mclk_rate[DAI_INTEL_SSP_NUM_MCLK]; int mclk_rate[DAI_INTEL_SSP_NUM_MCLK];
int mclk_source_clock; int mclk_source_clock;
#if CONFIG_INTEL_MN #if SSP_IP_VER == SSP_IP_VER_1_0
enum bclk_source bclk_sources[(CONFIG_DAI_INTEL_SSP_NUM_BASE + enum bclk_source bclk_sources[(CONFIG_DAI_INTEL_SSP_NUM_BASE +
CONFIG_DAI_INTEL_SSP_NUM_EXT)]; CONFIG_DAI_INTEL_SSP_NUM_EXT)];
int bclk_source_mn_clock; int bclk_source_mn_clock;

5
tests/boards/intel_adsp/ssp/Kconfig
View file

@ -7,8 +7,3 @@
mainmenu "Dai SSP Test" mainmenu "Dai SSP Test"
source "Kconfig.zephyr" source "Kconfig.zephyr"
config INTEL_MN
bool "Use mn divider"
help
Use MN divider.

1
tests/boards/intel_adsp/ssp/prj.conf
View file

@ -1,6 +1,5 @@
CONFIG_ZTEST=y CONFIG_ZTEST=y
CONFIG_DAI=y CONFIG_DAI=y
CONFIG_INTEL_MN=y
CONFIG_DMA_DW_HOST_MASK=1 CONFIG_DMA_DW_HOST_MASK=1
CONFIG_HEAP_MEM_POOL_SIZE=512 CONFIG_HEAP_MEM_POOL_SIZE=512
CONFIG_PM=y CONFIG_PM=y