Add the new compatible "fsl,imx-audio-generic" for a generic codec
use case. It allows using the fsl-asoc-card driver with the
spdif_receiver and spdif_transmitter codec drivers used as dummy codecs.
It can be used for cases where there is no real codec or codecs which do
not require declaring controls.
Signed-off-by: Elinor Montmasson <[email protected]>
Co-authored-by: Philip-Dylan Gleonec <philip-dylan.gleonec@savoirfairelinuxcom>
---
sound/soc/fsl/fsl-asoc-card.c | 29 ++++++++++++++++++++++++++---
1 file changed, 26 insertions(+), 3 deletions(-)
diff --git a/sound/soc/fsl/fsl-asoc-card.c b/sound/soc/fsl/fsl-asoc-card.c
index 620a25eb068a..a4ecc9093558 100644
--- a/sound/soc/fsl/fsl-asoc-card.c
+++ b/sound/soc/fsl/fsl-asoc-card.c
@@ -567,6 +567,7 @@ static int fsl_asoc_card_probe(struct platform_device *pdev)
struct platform_device *cpu_pdev;
struct fsl_asoc_card_priv *priv;
struct device *codec_dev[2] = { NULL, NULL };
+ const char *generic_codec_dai_names[2];
const char *codec_dai_name;
const char *codec_dev_name[2];
u32 asrc_fmt = 0;
@@ -744,6 +745,11 @@ static int fsl_asoc_card_probe(struct platform_device *pdev)
priv->codec_priv[0].fll_id = WM8904_CLK_FLL;
priv->codec_priv[0].pll_id = WM8904_FLL_MCLK;
priv->dai_fmt |= SND_SOC_DAIFMT_CBP_CFP;
+ } else if (of_device_is_compatible(np, "fsl,imx-audio-generic")) {
+ generic_codec_dai_names[0] = "dit-hifi";
+ generic_codec_dai_names[1] = "dir-hifi";
+ priv->dai_link[0].num_codecs = 2;
+ priv->dai_link[2].num_codecs = 2;
} else {
dev_err(&pdev->dev, "unknown Device Tree compatible\n");
ret = -EINVAL;
@@ -798,6 +804,12 @@ static int fsl_asoc_card_probe(struct platform_device *pdev)
ret = -EPROBE_DEFER;
goto asrc_fail;
}
+ if (of_device_is_compatible(np, "fsl,imx-audio-generic")
+ && !codec_dev[1]) {
+ dev_dbg(&pdev->dev, "failed to find second codec device\n");
+ ret = -EPROBE_DEFER;
+ goto asrc_fail;
+ }
/* Common settings for corresponding Freescale CPU DAI driver */
if (of_node_name_eq(cpu_np, "ssi")) {
@@ -855,11 +867,21 @@ static int fsl_asoc_card_probe(struct platform_device *pdev)
/* Normal DAI Link */
priv->dai_link[0].cpus->of_node = cpu_np;
- priv->dai_link[0].codecs[0].dai_name = codec_dai_name;
- if (!fsl_asoc_card_is_ac97(priv))
+ if (of_device_is_compatible(np, "fsl,imx-audio-generic")) {
+ priv->dai_link[0].codecs[0].dai_name =
+ generic_codec_dai_names[0];
+ priv->dai_link[0].codecs[1].dai_name =
+ generic_codec_dai_names[1];
+ } else {
+ priv->dai_link[0].codecs[0].dai_name = codec_dai_name;
+ }
+
+ if (!fsl_asoc_card_is_ac97(priv)) {
priv->dai_link[0].codecs[0].of_node = codec_np[0];
- else {
+ if (of_device_is_compatible(np, "fsl,imx-audio-generic"))
+ priv->dai_link[0].codecs[1].of_node = codec_np[1];
+ } else {
u32 idx;
ret = of_property_read_u32(cpu_np, "cell-index", &idx);
@@ -990,6 +1012,7 @@ static const struct of_device_id fsl_asoc_card_dt_ids[] = {
{ .compatible = "fsl,imx-audio-wm8958", },
{ .compatible = "fsl,imx-audio-nau8822", },
{ .compatible = "fsl,imx-audio-wm8904", },
+ { .compatible = "fsl,imx-audio-generic", },
{}
};
MODULE_DEVICE_TABLE(of, fsl_asoc_card_dt_ids);
--
2.34.1