<div dir="ltr"><div dir="ltr"><br></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Thu, Jul 27, 2023 at 11:15 AM Chancel Liu <<a href="mailto:chancel.liu@nxp.com">chancel.liu@nxp.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">fsl_micfil_check_version can help to parse the version info in VERID<br>
and PARAM registers. Since the two registers are added only on i.MX93<br>
platform, a member flag called check_version is introduced to soc data<br>
structure which indicates need to check version.<br>
<br>
Signed-off-by: Chancel Liu <<a href="mailto:chancel.liu@nxp.com" target="_blank">chancel.liu@nxp.com</a>><br>
---<br>
sound/soc/fsl/fsl_micfil.c | 76 +++++++++++++++++++++++++++++++++++++-<br>
sound/soc/fsl/fsl_micfil.h | 36 ++++++++++++++++++<br>
2 files changed, 110 insertions(+), 2 deletions(-)<br>
<br>
diff --git a/sound/soc/fsl/fsl_micfil.c b/sound/soc/fsl/fsl_micfil.c<br>
index b15febf19c02..46eda6e8c4b6 100644<br>
--- a/sound/soc/fsl/fsl_micfil.c<br>
+++ b/sound/soc/fsl/fsl_micfil.c<br>
@@ -56,6 +56,8 @@ struct fsl_micfil {<br>
int vad_init_mode;<br>
int vad_enabled;<br>
int vad_detected;<br>
+ struct fsl_micfil_verid verid;<br>
+ struct fsl_micfil_param param;<br>
};<br>
<br>
struct fsl_micfil_soc_data {<br>
@@ -64,6 +66,7 @@ struct fsl_micfil_soc_data {<br>
unsigned int dataline;<br>
bool imx;<br>
bool use_edma;<br>
+ bool check_version;<br></blockquote><div><br></div><div>Maybe using "use_verid" is better? for in the future</div><div>there will be "use_fsync_ctrl" added?</div><div><br></div><div>best regards</div><div>wang shengjiu </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
u64 formats;<br>
};<br>
<br>
@@ -90,6 +93,7 @@ static struct fsl_micfil_soc_data fsl_micfil_imx93 = {<br>
.dataline = 0xf,<br>
.formats = SNDRV_PCM_FMTBIT_S32_LE,<br>
.use_edma = true,<br>
+ .check_version = true,<br>
};<br>
<br>
static const struct of_device_id fsl_micfil_dt_ids[] = {<br>
@@ -356,6 +360,49 @@ static const struct snd_kcontrol_new fsl_micfil_snd_controls[] = {<br>
SOC_SINGLE_BOOL_EXT("VAD Detected", 0, hwvad_detected, NULL),<br>
};<br>
<br>
+static int fsl_micfil_check_version(struct device *dev)<br>
+{<br>
+ struct fsl_micfil *micfil = dev_get_drvdata(dev);<br>
+ unsigned int val;<br>
+ int ret;<br>
+<br>
+ if (!micfil->soc->check_version)<br>
+ return 0;<br>
+<br>
+ ret = regmap_read(micfil->regmap, REG_MICFIL_VERID, &val);<br>
+ if (ret < 0)<br>
+ return ret;<br>
+<br>
+ dev_dbg(dev, "VERID: 0x%016X\n", val);<br>
+<br>
+ micfil->verid.version = val &<br>
+ (MICFIL_VERID_MAJOR_MASK | MICFIL_VERID_MINOR_MASK);<br>
+ micfil->verid.version >>= MICFIL_VERID_MINOR_SHIFT;<br>
+ micfil->verid.feature = val & MICFIL_VERID_FEATURE_MASK;<br>
+<br>
+ ret = regmap_read(micfil->regmap, REG_MICFIL_PARAM, &val);<br>
+ if (ret < 0)<br>
+ return ret;<br>
+<br>
+ dev_dbg(dev, "PARAM: 0x%016X\n", val);<br>
+<br>
+ micfil->param.hwvad_num = (val & MICFIL_PARAM_NUM_HWVAD_MASK) >><br>
+ MICFIL_PARAM_NUM_HWVAD_SHIFT;<br>
+ micfil->param.hwvad_zcd = val & MICFIL_PARAM_HWVAD_ZCD;<br>
+ micfil->param.hwvad_energy_mode = val & MICFIL_PARAM_HWVAD_ENERGY_MODE;<br>
+ micfil->param.hwvad = val & MICFIL_PARAM_HWVAD;<br>
+ micfil->param.dc_out_bypass = val & MICFIL_PARAM_DC_OUT_BYPASS;<br>
+ micfil->param.dc_in_bypass = val & MICFIL_PARAM_DC_IN_BYPASS;<br>
+ micfil->param.low_power = val & MICFIL_PARAM_LOW_POWER;<br>
+ micfil->param.fil_out_width = val & MICFIL_PARAM_FIL_OUT_WIDTH;<br>
+ micfil->param.fifo_ptrwid = (val & MICFIL_PARAM_FIFO_PTRWID_MASK) >><br>
+ MICFIL_PARAM_FIFO_PTRWID_SHIFT;<br>
+ micfil->param.npair = (val & MICFIL_PARAM_NPAIR_MASK) >><br>
+ MICFIL_PARAM_NPAIR_SHIFT;<br>
+<br>
+ return 0;<br>
+}<br>
+<br>
/* The SRES is a self-negated bit which provides the CPU with the<br>
* capability to initialize the PDM Interface module through the<br>
* slave-bus interface. This bit always reads as zero, and this<br>
@@ -1037,6 +1084,9 @@ static irqreturn_t hwvad_err_isr(int irq, void *devid)<br>
return IRQ_HANDLED;<br>
}<br>
<br>
+static int fsl_micfil_runtime_suspend(struct device *dev);<br>
+static int fsl_micfil_runtime_resume(struct device *dev);<br>
+<br>
static int fsl_micfil_probe(struct platform_device *pdev)<br>
{<br>
struct device_node *np = pdev->dev.of_node;<br>
@@ -1156,6 +1206,25 @@ static int fsl_micfil_probe(struct platform_device *pdev)<br>
platform_set_drvdata(pdev, micfil);<br>
<br>
pm_runtime_enable(&pdev->dev);<br>
+ if (!pm_runtime_enabled(&pdev->dev)) {<br>
+ ret = fsl_micfil_runtime_resume(&pdev->dev);<br>
+ if (ret)<br>
+ goto err_pm_disable;<br>
+ }<br>
+<br>
+ ret = pm_runtime_resume_and_get(&pdev->dev);<br>
+ if (ret < 0)<br>
+ goto err_pm_get_sync;<br>
+<br>
+ /* Get micfil version */<br>
+ ret = fsl_micfil_check_version(&pdev->dev);<br>
+ if (ret < 0)<br>
+ dev_warn(&pdev->dev, "Error reading MICFIL version: %d\n", ret);<br>
+<br>
+ ret = pm_runtime_put_sync(&pdev->dev);<br>
+ if (ret < 0 && ret != -ENOSYS)<br>
+ goto err_pm_get_sync;<br>
+<br>
regcache_cache_only(micfil->regmap, true);<br>
<br>
/*<br>
@@ -1180,6 +1249,9 @@ static int fsl_micfil_probe(struct platform_device *pdev)<br>
<br>
return ret;<br>
<br>
+err_pm_get_sync:<br>
+ if (!pm_runtime_status_suspended(&pdev->dev))<br>
+ fsl_micfil_runtime_suspend(&pdev->dev);<br>
err_pm_disable:<br>
pm_runtime_disable(&pdev->dev);<br>
<br>
@@ -1191,7 +1263,7 @@ static void fsl_micfil_remove(struct platform_device *pdev)<br>
pm_runtime_disable(&pdev->dev);<br>
}<br>
<br>
-static int __maybe_unused fsl_micfil_runtime_suspend(struct device *dev)<br>
+static int fsl_micfil_runtime_suspend(struct device *dev)<br>
{<br>
struct fsl_micfil *micfil = dev_get_drvdata(dev);<br>
<br>
@@ -1203,7 +1275,7 @@ static int __maybe_unused fsl_micfil_runtime_suspend(struct device *dev)<br>
return 0;<br>
}<br>
<br>
-static int __maybe_unused fsl_micfil_runtime_resume(struct device *dev)<br>
+static int fsl_micfil_runtime_resume(struct device *dev)<br>
{<br>
struct fsl_micfil *micfil = dev_get_drvdata(dev);<br>
int ret;<br>
diff --git a/sound/soc/fsl/fsl_micfil.h b/sound/soc/fsl/fsl_micfil.h<br>
index b3c392ef5daf..231a52aff024 100644<br>
--- a/sound/soc/fsl/fsl_micfil.h<br>
+++ b/sound/soc/fsl/fsl_micfil.h<br>
@@ -174,4 +174,40 @@<br>
#define MICFIL_HWVAD_ENVELOPE_MODE 0<br>
#define MICFIL_HWVAD_ENERGY_MODE 1<br>
<br>
+/**<br>
+ * struct fsl_micfil_verid - version id data<br>
+ * @version: version number<br>
+ * @feature: feature specification number<br>
+ */<br>
+struct fsl_micfil_verid {<br>
+ u32 version;<br>
+ u32 feature;<br>
+};<br>
+<br>
+/**<br>
+ * struct fsl_micfil_param - parameter data<br>
+ * @hwvad_num: the number of HWVADs<br>
+ * @hwvad_zcd: HWVAD zero-cross detector is active<br>
+ * @hwvad_energy_mode: HWVAD energy mode is active<br>
+ * @hwvad: HWVAD is active<br>
+ * @dc_out_bypass: points out if the output DC remover is disabled<br>
+ * @dc_in_bypass: points out if the input DC remover is disabled<br>
+ * @low_power: low power decimation filter<br>
+ * @fil_out_width: filter output width<br>
+ * @fifo_ptrwid: FIFO pointer width<br>
+ * @npair: number of microphone pairs<br>
+ */<br>
+struct fsl_micfil_param {<br>
+ u32 hwvad_num;<br>
+ bool hwvad_zcd;<br>
+ bool hwvad_energy_mode;<br>
+ bool hwvad;<br>
+ bool dc_out_bypass;<br>
+ bool dc_in_bypass;<br>
+ bool low_power;<br>
+ bool fil_out_width;<br>
+ u32 fifo_ptrwid;<br>
+ u32 npair;<br>
+};<br>
+<br>
#endif /* _FSL_MICFIL_H */<br>
-- <br>
2.25.1<br>
<br>
</blockquote></div></div>