From: Jinfeng Wang <[email protected]> Fix the building error: sound/soc/fsl/fsl_micfil.c:190:25: error: 'MICFIL_VAD0_NCONFIG_NOREN_SHIFT' undeclared here (not in a function); did you mean 'MICFIL_VAD0_NCONFIG_NOREN'? 190 | MICFIL_VAD0_NCONFIG_NOREN_SHIFT, | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
This is caused by the commits[1][2][3], the macros are modified in these commits, replace the old macros with the new macros. [1]https://git.yoctoproject.org/linux-yocto/commit/sound/soc/fsl/fsl_micfil.h?h=v5.10/standard/nxp-sdk-5.10/nxp-soc&id=226fc91c860b11bf33a710c55f4ac0f3e8a88f48 [2]https://git.yoctoproject.org/linux-yocto/commit/sound/soc/fsl/fsl_micfil.h?h=v5.10/standard/nxp-sdk-5.10/nxp-soc&id=b2a72a772ef08142a24e3bae1aa7fcc2f4cfc29f [3]https://git.yoctoproject.org/linux-yocto/commit/sound/soc/fsl/fsl_micfil.h?h=v5.10/standard/nxp-sdk-5.10/nxp-soc&id=442dadf32d1cb169a5af36c7f204514c76b34517 Signed-off-by: Jinfeng Wang <[email protected]> --- sound/soc/fsl/fsl_micfil.c | 118 +++++++++++++++++-------------------- sound/soc/fsl/fsl_micfil.h | 2 + 2 files changed, 57 insertions(+), 63 deletions(-) diff --git a/sound/soc/fsl/fsl_micfil.c b/sound/soc/fsl/fsl_micfil.c index e5fc5c22e251..1c9d57bdb2fc 100644 --- a/sound/soc/fsl/fsl_micfil.c +++ b/sound/soc/fsl/fsl_micfil.c @@ -859,7 +859,7 @@ static int configure_hwvad_interrupts(struct device *dev, /* Voice Activity Detector Error Interruption Enable */ ret = regmap_update_bits(micfil->regmap, REG_MICFIL_VAD0_CTRL1, - MICFIL_VAD0_CTRL1_ERIE_MASK, + MICFIL_VAD0_CTRL1_ERIE, vaderie_reg); if (ret) { dev_err(dev, @@ -870,7 +870,7 @@ static int configure_hwvad_interrupts(struct device *dev, /* Voice Activity Detector Interruption Enable */ ret = regmap_update_bits(micfil->regmap, REG_MICFIL_VAD0_CTRL1, - MICFIL_VAD0_CTRL1_IE_MASK, + MICFIL_VAD0_CTRL1_IE, vadie_reg); if (ret) { dev_err(dev, @@ -889,7 +889,7 @@ static int init_hwvad_internal_filters(struct device *dev) /* Voice Activity Detector Internal Filters Initialization*/ ret = regmap_update_bits(micfil->regmap, REG_MICFIL_VAD0_CTRL1, - MICFIL_VAD0_CTRL1_ST10_MASK, + MICFIL_VAD0_CTRL1_ST10, MICFIL_VAD0_CTRL1_ST10); if (ret) { dev_err(dev, @@ -905,7 +905,7 @@ static int init_hwvad_internal_filters(struct device *dev) /* Voice Activity Detector Enabled */ ret = regmap_update_bits(micfil->regmap, REG_MICFIL_VAD0_CTRL1, - MICFIL_VAD0_CTRL1_ST10_MASK, + MICFIL_VAD0_CTRL1_ST10, 0); if (ret) { dev_err(dev, @@ -934,7 +934,7 @@ static int __maybe_unused init_zcd(struct device *dev) if (micfil->vad_zcd_auto) { /* Zero-Crossing Detector Adjustment */ ret = regmap_update_bits(micfil->regmap, REG_MICFIL_VAD0_ZCD, - MICFIL_VAD0_ZCD_ZCDADJ_MASK, + MICFIL_VAD0_ZCD_ZCDADJ, micfil->vad_zcd_adj); if (ret) { dev_err(dev, @@ -946,8 +946,8 @@ static int __maybe_unused init_zcd(struct device *dev) /* Zero-Crossing Detector Threshold */ ret = regmap_update_bits(micfil->regmap, REG_MICFIL_VAD0_ZCD, - MICFIL_VAD0_ZCD_ZCDTH_MASK, - MICFIL_VAD0_ZCD_ZCDTH(micfil->vad_zcd_th)); + MICFIL_VAD0_ZCD_ZCDTH, + FIELD_PREP(MICFIL_VAD0_ZCD_ZCDTH, micfil->vad_zcd_th)); if (ret) { dev_err(dev, "Failed to set ZCDTH in ZCD_VAD0 [%d]\n", ret); return ret; @@ -955,7 +955,7 @@ static int __maybe_unused init_zcd(struct device *dev) /* Zero-Crossing Detector AND Behavior */ ret = regmap_update_bits(micfil->regmap, REG_MICFIL_VAD0_ZCD, - MICFIL_VAD0_ZCD_ZCDAND_MASK, + MICFIL_VAD0_ZCD_ZCDAND, MICFIL_HWVAD_ZCDAND); if (ret) { dev_err(dev, "Failed to set ZCDAND in ZCD_VAD0 [%d]\n", ret); @@ -964,7 +964,7 @@ static int __maybe_unused init_zcd(struct device *dev) /* Zero-Crossing Detector Automatic Threshold */ ret = regmap_update_bits(micfil->regmap, REG_MICFIL_VAD0_ZCD, - MICFIL_VAD0_ZCD_ZCDAUT_MASK, + MICFIL_VAD0_ZCD_ZCDAUT, micfil->vad_zcd_auto); if (ret) { dev_err(dev, @@ -975,7 +975,7 @@ static int __maybe_unused init_zcd(struct device *dev) /* Zero-Crossing Detector Enable */ ret = regmap_update_bits(micfil->regmap, REG_MICFIL_VAD0_ZCD, - MICFIL_VAD0_ZCD_ZCDEN_MASK, + MICFIL_VAD0_ZCD_ZCDEN, MICFIL_VAD0_ZCD_ZCDEN); if (ret) { dev_err(dev, "Failed to set ZCDEN in ZCD_VAD0 [%d]\n", ret); @@ -997,7 +997,7 @@ static int init_hwvad_energy_mode(struct device *dev) /* Voice Activity Detector Reset */ ret = regmap_update_bits(micfil->regmap, REG_MICFIL_VAD0_CTRL1, - MICFIL_VAD0_CTRL1_RST_SHIFT, + MICFIL_VAD0_CTRL1_RST, MICFIL_VAD0_CTRL1_RST); if (ret) { dev_err(dev, "Failed to set VADRST in CTRL1_VAD0 [%d]\n", ret); @@ -1006,7 +1006,7 @@ static int init_hwvad_energy_mode(struct device *dev) /* Voice Activity Detector Enabled */ ret = regmap_update_bits(micfil->regmap, REG_MICFIL_VAD0_CTRL1, - MICFIL_VAD0_CTRL1_EN_MASK, + MICFIL_VAD0_CTRL1_EN, MICFIL_VAD0_CTRL1_EN); if (ret) { dev_err(dev, "Failed to set VADEN in CTRL1_VAD0 [%d]\n", ret); @@ -1028,7 +1028,7 @@ static int init_hwvad_energy_mode(struct device *dev) /* Enable MICFIL module */ ret = regmap_update_bits(micfil->regmap, REG_MICFIL_CTRL1, - MICFIL_CTRL1_PDMIEN_MASK, + MICFIL_CTRL1_PDMIEN, MICFIL_CTRL1_PDMIEN); if (ret) { dev_err(dev, "failed to enable the module\n"); @@ -1044,7 +1044,7 @@ static int init_hwvad_energy_mode(struct device *dev) return ret; } - flag = (stat & MICFIL_VAD0_STAT_INITF_MASK); + flag = (stat & MICFIL_VAD0_STAT_INITF); if (flag == 0) break; @@ -1074,7 +1074,7 @@ static int init_hwvad_envelope_mode(struct device *dev) /* Frame energy disable */ ret = regmap_update_bits(micfil->regmap, REG_MICFIL_VAD0_CTRL2, - MICFIL_VAD0_CTRL2_FRENDIS_MASK, + MICFIL_VAD0_CTRL2_FRENDIS, MICFIL_VAD0_CTRL2_FRENDIS); if (ret) { dev_err(dev, "Failed to set FRENDIS in CTRL2_VAD0 [%d]\n", ret); @@ -1083,7 +1083,7 @@ static int init_hwvad_envelope_mode(struct device *dev) /* Enable pre-filter Noise & Signal */ ret = regmap_update_bits(micfil->regmap, REG_MICFIL_VAD0_CTRL2, - MICFIL_VAD0_CTRL2_PREFEN_MASK, + MICFIL_VAD0_CTRL2_PREFEN, MICFIL_VAD0_CTRL2_PREFEN); if (ret) { dev_err(dev, "Failed to set PREFEN in CTRL2_VAD0 [%d]\n", ret); @@ -1092,7 +1092,7 @@ static int init_hwvad_envelope_mode(struct device *dev) /* Enable Signal Filter */ ret = regmap_update_bits(micfil->regmap, REG_MICFIL_VAD0_SCONFIG, - MICFIL_VAD0_SCONFIG_SFILEN_MASK, + MICFIL_VAD0_SCONFIG_SFILEN, MICFIL_VAD0_SCONFIG_SFILEN); if (ret) { dev_err(dev, @@ -1103,7 +1103,7 @@ static int init_hwvad_envelope_mode(struct device *dev) /* Signal Maximum Enable */ ret = regmap_update_bits(micfil->regmap, REG_MICFIL_VAD0_SCONFIG, - MICFIL_VAD0_SCONFIG_SMAXEN_MASK, + MICFIL_VAD0_SCONFIG_SMAXEN, MICFIL_VAD0_SCONFIG_SMAXEN); if (ret) { dev_err(dev, @@ -1116,7 +1116,7 @@ static int init_hwvad_envelope_mode(struct device *dev) * information */ ret = regmap_update_bits(micfil->regmap, REG_MICFIL_VAD0_NCONFIG, - MICFIL_VAD0_NCONFIG_NFILAUT_MASK, + MICFIL_VAD0_NCONFIG_NFILAUT, 0); if (ret) { dev_err(dev, @@ -1127,7 +1127,7 @@ static int init_hwvad_envelope_mode(struct device *dev) /* Noise Minimum Enable */ ret = regmap_update_bits(micfil->regmap, REG_MICFIL_VAD0_NCONFIG, - MICFIL_VAD0_NCONFIG_NMINEN_MASK, + MICFIL_VAD0_NCONFIG_NMINEN, MICFIL_VAD0_NCONFIG_NMINEN); if (ret) { dev_err(dev, @@ -1138,7 +1138,7 @@ static int init_hwvad_envelope_mode(struct device *dev) /* Noise Decimation Enable */ ret = regmap_update_bits(micfil->regmap, REG_MICFIL_VAD0_NCONFIG, - MICFIL_VAD0_NCONFIG_NDECEN_MASK, + MICFIL_VAD0_NCONFIG_NDECEN, MICFIL_VAD0_NCONFIG_NDECEN); if (ret) { dev_err(dev, @@ -1149,7 +1149,7 @@ static int init_hwvad_envelope_mode(struct device *dev) /* Voice Activity Detector Reset */ ret = regmap_update_bits(micfil->regmap, REG_MICFIL_VAD0_CTRL1, - MICFIL_VAD0_CTRL1_RST_MASK, + MICFIL_VAD0_CTRL1_RST, MICFIL_VAD0_CTRL1_RST); if (ret) { dev_err(dev, "Failed to set VADRST in CTRL1_VAD0 [%d]\n", ret); @@ -1163,7 +1163,7 @@ static int init_hwvad_envelope_mode(struct device *dev) /* Voice Activity Detector Enabled */ ret = regmap_update_bits(micfil->regmap, REG_MICFIL_VAD0_CTRL1, - MICFIL_VAD0_CTRL1_EN_MASK, + MICFIL_VAD0_CTRL1_EN, MICFIL_VAD0_CTRL1_EN); if (ret) { dev_err(dev, "Failed to set VADEN in CTRL1_VAD0 [%d]\n", ret); @@ -1172,7 +1172,7 @@ static int init_hwvad_envelope_mode(struct device *dev) /* Enable MICFIL module */ ret = regmap_update_bits(micfil->regmap, REG_MICFIL_CTRL1, - MICFIL_CTRL1_PDMIEN_MASK, + MICFIL_CTRL1_PDMIEN, MICFIL_CTRL1_PDMIEN); if (ret) { dev_err(dev, "failed to enable the module\n"); @@ -1193,7 +1193,7 @@ static int init_hwvad_envelope_mode(struct device *dev) return ret; } - flag = (stat & MICFIL_VAD0_STAT_INITF_MASK); + flag = (stat & MICFIL_VAD0_STAT_INITF); if (flag == 0) break; @@ -1234,11 +1234,10 @@ static int __maybe_unused init_hwvad(struct device *dev) { struct fsl_micfil *micfil = dev_get_drvdata(dev); int ret; - u32 reg_val; /* configure CIC OSR in VADCICOSR */ ret = regmap_update_bits(micfil->regmap, REG_MICFIL_VAD0_CTRL1, - MICFIL_VAD0_CTRL1_CICOSR_MASK, + MICFIL_VAD0_CTRL1_CICOSR, MICFIL_CTRL2_OSR_DEFAULT); if (ret) { dev_err(dev, "Failed to set CICOSR in CTRL1_VAD0i [%d]\n", ret); @@ -1246,70 +1245,63 @@ static int __maybe_unused init_hwvad(struct device *dev) } /* configure source channel in VADCHSEL */ - reg_val = MICFIL_VAD0_CTRL1_CHSEL(micfil->vad_channel); ret = regmap_update_bits(micfil->regmap, REG_MICFIL_VAD0_CTRL1, - MICFIL_VAD0_CTRL1_CHSEL_MASK, - reg_val); + MICFIL_VAD0_CTRL1_CHSEL, + FIELD_PREP(MICFIL_VAD0_CTRL1_CHSEL, micfil->vad_channel)); if (ret) { dev_err(dev, "Failed to set CHSEL in CTRL1_VAD0 [%d]\n", ret); return ret; } /* configure detector frame time VADFRAMET */ - reg_val = MICFIL_VAD0_CTRL2_FRAMET(micfil->vad_frame_time); ret = regmap_update_bits(micfil->regmap, REG_MICFIL_VAD0_CTRL2, - MICFIL_VAD0_CTRL2_FRAMET_MASK, - reg_val); + MICFIL_VAD0_CTRL2_FRAMET, + FIELD_PREP(MICFIL_VAD0_CTRL2_FRAMET, micfil->vad_frame_time)); if (ret) { dev_err(dev, "Failed to set FRAMET in CTRL2_VAD0 [%d]\n", ret); return ret; } /* configure initialization time in VADINITT */ - reg_val = MICFIL_VAD0_CTRL1_INITT(micfil->vad_init_time); ret = regmap_update_bits(micfil->regmap, REG_MICFIL_VAD0_CTRL1, - MICFIL_VAD0_CTRL1_INITT_MASK, - reg_val); + MICFIL_VAD0_CTRL1_INITT, + FIELD_PREP(MICFIL_VAD0_CTRL1_INITT,micfil->vad_init_time)); if (ret) { dev_err(dev, "Failed to set INITT in CTRL1_VAD0 [%d]\n", ret); return ret; } /* configure input gain in VADINPGAIN */ - reg_val = MICFIL_VAD0_CTRL2_INPGAIN(micfil->vad_input_gain); ret = regmap_update_bits(micfil->regmap, REG_MICFIL_VAD0_CTRL2, - MICFIL_VAD0_CTRL2_INPGAIN_MASK, - reg_val); + MICFIL_VAD0_CTRL2_INPGAIN, + FIELD_PREP(MICFIL_VAD0_CTRL2_INPGAIN,micfil->vad_input_gain)); if (ret) { dev_err(dev, "Failed to set INPGAIN in CTRL2_VAD0 [%d]\n", ret); return ret; } /* configure sound gain in SGAIN */ - reg_val = MICFIL_VAD0_SCONFIG_SGAIN(micfil->vad_sound_gain); ret = regmap_update_bits(micfil->regmap, REG_MICFIL_VAD0_SCONFIG, - MICFIL_VAD0_SCONFIG_SGAIN_MASK, - reg_val); + MICFIL_VAD0_SCONFIG_SGAIN, + FIELD_PREP(MICFIL_VAD0_SCONFIG_SGAIN, micfil->vad_sound_gain)); if (ret) { dev_err(dev, "Failed to set SGAIN in SCONFIG_VAD0 [%d]\n", ret); return ret; } /* configure noise gain in NGAIN */ - reg_val = MICFIL_VAD0_NCONFIG_NGAIN(micfil->vad_noise_gain); ret = regmap_update_bits(micfil->regmap, REG_MICFIL_VAD0_NCONFIG, - MICFIL_VAD0_NCONFIG_NGAIN_MASK, - reg_val); + MICFIL_VAD0_NCONFIG_NGAIN, + FIELD_PREP(MICFIL_VAD0_NCONFIG_NGAIN, micfil->vad_noise_gain)); if (ret) { dev_err(dev, "Failed to set NGAIN in NCONFIG_VAD0 [%d]\n", ret); return ret; } /* configure or clear the VADNFILADJ based on mode */ - reg_val = MICFIL_VAD0_NCONFIG_NFILADJ(micfil->vad_nfil_adjust); ret = regmap_update_bits(micfil->regmap, REG_MICFIL_VAD0_NCONFIG, - MICFIL_VAD0_NCONFIG_NFILADJ_MASK, - reg_val); + MICFIL_VAD0_NCONFIG_NFILADJ, + FIELD_PREP(MICFIL_VAD0_NCONFIG_NFILADJ, micfil->vad_nfil_adjust)); if (ret) { dev_err(dev, "Failed to set VADNFILADJ in NCONFIG_VAD0 [%d]\n", @@ -1318,10 +1310,9 @@ static int __maybe_unused init_hwvad(struct device *dev) } /* enable the high-pass filter in VADHPF */ - reg_val = MICFIL_VAD0_CTRL2_HPF(micfil->vad_hpf); ret = regmap_update_bits(micfil->regmap, REG_MICFIL_VAD0_CTRL2, - MICFIL_VAD0_CTRL2_HPF_MASK, - reg_val); + MICFIL_VAD0_CTRL2_HPF, + FIELD_PREP(MICFIL_VAD0_CTRL2_HPF, micfil->vad_hpf)); if (ret) { dev_err(dev, "Failed to set HPF in CTRL2_VAD0 [%d]\n", ret); return ret; @@ -1678,13 +1669,14 @@ static int fsl_micfil_dai_probe(struct snd_soc_dai *cpu_dai) { struct fsl_micfil *micfil = dev_get_drvdata(cpu_dai->dev); struct device *dev = cpu_dai->dev; + unsigned int val; int ret; int i; /* set qsel to medium */ ret = regmap_update_bits(micfil->regmap, REG_MICFIL_CTRL2, MICFIL_CTRL2_QSEL, - FIELD_PREP(MICFIL_CTRL2_QSEL, MICFIL_VLOW0_QUALITY)); + FIELD_PREP(MICFIL_CTRL2_QSEL, MICFIL_QSEL_VLOW0_QUALITY)); if (ret) { dev_err(dev, "failed to set quality mode bits, reg 0x%X\n", REG_MICFIL_CTRL2); @@ -1897,10 +1889,10 @@ static irqreturn_t hwvad_isr(int irq, void *devid) * 1 to Clear. Since both flags are set, it is enough * to only read one of them */ - if (vad0_reg & MICFIL_VAD0_STAT_IF_MASK) { + if (vad0_reg & MICFIL_VAD0_STAT_IF) { /* Write 1 to clear */ regmap_write_bits(micfil->regmap, REG_MICFIL_VAD0_STAT, - MICFIL_VAD0_STAT_IF_MASK, + MICFIL_VAD0_STAT_IF, MICFIL_VAD0_STAT_IF); /* disable hwvad interrupts */ @@ -1920,10 +1912,10 @@ static irqreturn_t hwvad_err_isr(int irq, void *devid) regmap_read(micfil->regmap, REG_MICFIL_VAD0_STAT, &vad0_reg); - if (vad0_reg & MICFIL_VAD0_STAT_INSATF_MASK) + if (vad0_reg & MICFIL_VAD0_STAT_INSATF) dev_dbg(dev, "voice activity input overflow/underflow detected\n"); - if (vad0_reg & MICFIL_VAD0_STAT_INITF_MASK) + if (vad0_reg & MICFIL_VAD0_STAT_INITF) dev_dbg(dev, "voice activity dectector is initializing\n"); return IRQ_HANDLED; @@ -2094,37 +2086,37 @@ static int disable_hwvad(struct device *dev, bool sync) /* Voice Activity Detector Reset */ ret |= regmap_update_bits(micfil->regmap, REG_MICFIL_VAD0_CTRL1, - MICFIL_VAD0_CTRL1_RST_SHIFT, + MICFIL_VAD0_CTRL1_RST, MICFIL_VAD0_CTRL1_RST); /* Disable HWVAD */ ret |= regmap_update_bits(micfil->regmap, REG_MICFIL_VAD0_CTRL1, - MICFIL_VAD0_CTRL1_EN_MASK, + MICFIL_VAD0_CTRL1_EN, 0); /* Disable Signal Filter */ ret |= regmap_update_bits(micfil->regmap, REG_MICFIL_VAD0_SCONFIG, - MICFIL_VAD0_SCONFIG_SFILEN_MASK, + MICFIL_VAD0_SCONFIG_SFILEN, 0); /* Signal Maximum Enable */ ret |= regmap_update_bits(micfil->regmap, REG_MICFIL_VAD0_SCONFIG, - MICFIL_VAD0_SCONFIG_SMAXEN_MASK, + MICFIL_VAD0_SCONFIG_SMAXEN, 0); /* Enable pre-filter Noise & Signal */ ret |= regmap_update_bits(micfil->regmap, REG_MICFIL_VAD0_CTRL2, - MICFIL_VAD0_CTRL2_PREFEN_MASK, + MICFIL_VAD0_CTRL2_PREFEN, 0); /* Noise Decimation Enable */ ret |= regmap_update_bits(micfil->regmap, REG_MICFIL_VAD0_NCONFIG, - MICFIL_VAD0_NCONFIG_NDECEN_MASK, + MICFIL_VAD0_NCONFIG_NDECEN, 0); /* disable the module and clock only if recording @@ -2135,7 +2127,7 @@ static int disable_hwvad(struct device *dev, bool sync) /* Disable MICFIL module */ ret |= regmap_update_bits(micfil->regmap, REG_MICFIL_CTRL1, - MICFIL_CTRL1_PDMIEN_MASK, + MICFIL_CTRL1_PDMIEN, 0); } diff --git a/sound/soc/fsl/fsl_micfil.h b/sound/soc/fsl/fsl_micfil.h index e1cd6655bab0..ab579d5caf7d 100644 --- a/sound/soc/fsl/fsl_micfil.h +++ b/sound/soc/fsl/fsl_micfil.h @@ -98,6 +98,7 @@ #define MICFIL_VAD0_SCONFIG_SGAIN GENMASK(3, 0) /* MICFIL HWVAD0 Noise CONFIG Register -- REG_MICFIL_VAD0_NCONFIG */ +#define MICFIL_VAD0_NCONFIG_NOREN_SHIFT 28 #define MICFIL_VAD0_NCONFIG_NFILAUT BIT(31) #define MICFIL_VAD0_NCONFIG_NMINEN BIT(30) #define MICFIL_VAD0_NCONFIG_NDECEN BIT(29) @@ -167,6 +168,7 @@ #define MICFIL_SLEEP 100 /* in ms */ #define MICFIL_DMA_MAXBURST_RX 6 +#define MICFIL_CTRL2_CICOSR_SHIFT 16 #define MICFIL_CTRL2_OSR_DEFAULT (0 << MICFIL_CTRL2_CICOSR_SHIFT) #define MICFIL_DEFAULT_RATE 48000 #define MICFIL_CLK_SRC_NUM 3 -- 2.34.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#14753): https://lists.yoctoproject.org/g/linux-yocto/message/14753 Mute This Topic: https://lists.yoctoproject.org/mt/110749577/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
