@@ -21,7 +21,7 @@ LOG_MODULE_REGISTER(LOG_DOMAIN);
2121extern struct dai_dmic_global_shared dai_dmic_global ;
2222
2323/* Base addresses (in PDM scope) of 2ch PDM controllers and coefficient RAM. */
24- static const uint32_t base [4 ] = {PDM0 , PDM1 , PDM2 , PDM3 };
24+ static const uint32_t dmic_base [4 ] = {PDM0 , PDM1 , PDM2 , PDM3 };
2525
2626static inline void dai_dmic_write (const struct dai_intel_dmic * dmic ,
2727 uint32_t reg , uint32_t val )
@@ -131,13 +131,13 @@ static int dai_nhlt_get_clock_div(const struct dai_intel_dmic *dmic, const int p
131131 uint32_t val ;
132132 int p_mcic , p_clkdiv , p_mfir , rate_div ;
133133
134- val = dai_dmic_read (dmic , base [pdm ] + CIC_CONFIG );
134+ val = dai_dmic_read (dmic , dmic_base [pdm ] + CIC_CONFIG );
135135 p_mcic = FIELD_GET (CIC_CONFIG_COMB_COUNT , val ) + 1 ;
136136
137- val = dai_dmic_read (dmic , base [pdm ] + MIC_CONTROL );
137+ val = dai_dmic_read (dmic , dmic_base [pdm ] + MIC_CONTROL );
138138 p_clkdiv = FIELD_GET (MIC_CONTROL_PDM_CLKDIV , val ) + 2 ;
139139
140- val = dai_dmic_read (dmic , base [pdm ] +
140+ val = dai_dmic_read (dmic , dmic_base [pdm ] +
141141 FIR_CHANNEL_REGS_SIZE * dmic -> dai_config_params .dai_index + FIR_CONFIG );
142142 LOG_ERR ("pdm = %d, FIR_CONFIG = 0x%08X" , pdm , val );
143143
@@ -187,8 +187,8 @@ static int dai_ipm_source_to_enable(struct dai_intel_dmic *dmic,
187187
188188 if (* count < pdm_count ) {
189189 (* count )++ ;
190- mic_swap = FIELD_GET (MIC_CONTROL_CLK_EDGE , dai_dmic_read (dmic , base [ source_pdm ] +
191- MIC_CONTROL ));
190+ mic_swap = FIELD_GET (MIC_CONTROL_CLK_EDGE , dai_dmic_read (
191+ dmic , dmic_base [ source_pdm ] + MIC_CONTROL ));
192192 if (stereo )
193193 dmic -> enable [source_pdm ] = 0x3 ; /* PDMi MIC A and B */
194194 else
@@ -357,16 +357,16 @@ static int dai_nhlt_dmic_dai_params_get(struct dai_intel_dmic *dmic)
357357 return - EINVAL ;
358358 }
359359
360- fir_control [0 ] = dai_dmic_read (dmic , base [0 ] +
360+ fir_control [0 ] = dai_dmic_read (dmic , dmic_base [0 ] +
361361 dmic -> dai_config_params .dai_index * FIR_CHANNEL_REGS_SIZE +
362362 FIR_CONTROL );
363363
364- fir_control [1 ] = dai_dmic_read (dmic , base [1 ] +
364+ fir_control [1 ] = dai_dmic_read (dmic , dmic_base [1 ] +
365365 dmic -> dai_config_params .dai_index * FIR_CHANNEL_REGS_SIZE +
366366 FIR_CONTROL );
367367
368- mic_control [0 ] = dai_dmic_read (dmic , base [0 ] + MIC_CONTROL );
369- mic_control [1 ] = dai_dmic_read (dmic , base [1 ] + MIC_CONTROL );
368+ mic_control [0 ] = dai_dmic_read (dmic , dmic_base [0 ] + MIC_CONTROL );
369+ mic_control [1 ] = dai_dmic_read (dmic , dmic_base [1 ] + MIC_CONTROL );
370370
371371 switch (FIELD_GET (OUTCONTROL_IPM , outcontrol )) {
372372 case 0 :
@@ -721,7 +721,7 @@ int dai_dmic_set_config_nhlt(struct dai_intel_dmic *dmic, const void *bespoke_cf
721721 pdm_cfg = (const struct nhlt_pdm_ctrl_cfg * )p ;
722722
723723 for (pdm_idx = 0 ; pdm_idx < CONFIG_DAI_DMIC_HW_CONTROLLERS ; pdm_idx ++ ) {
724- pdm_base = base [pdm_idx ];
724+ pdm_base = dmic_base [pdm_idx ];
725725
726726 if (!(pdm_ctrl_mask & (1 << pdm_idx ))) {
727727 /* Set MIC_MUTE bit to unused PDM */
0 commit comments