diff options
| author | Daniel Baluta <daniel.baluta@nxp.com> | 2017-06-15 18:48:22 +0300 |
|---|---|---|
| committer | Leonard Crestez <leonard.crestez@nxp.com> | 2018-08-24 12:41:33 +0300 |
| commit | daca519039b5b77e26ac7ec26786d9d9ba83d961 (patch) | |
| tree | 828271bc71bf6d0dcf87233b33bcf7bce59822bc /sound | |
| parent | c8ededb1a39c39de1b5f6f285e08924aea9120ce (diff) | |
MLK-14663-2: ASoC: fsl: imx-wm8960: Kill warning for non-gpr boards
A side effect of commit 5555277e693a7 ("MLK-13574-1: ASoC: imx-wm8960:
remove the gpr dependency") is that a warning was printed for boards
without gpr. This can be confusing.
imx7d boards do not have a gpr setting, so use imx7d-evk-wm8960
compatible string to avoid printing the warning.
Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/fsl/imx-wm8960.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sound/soc/fsl/imx-wm8960.c b/sound/soc/fsl/imx-wm8960.c index 58f0bedcd429..8dbf997d3d8c 100644 --- a/sound/soc/fsl/imx-wm8960.c +++ b/sound/soc/fsl/imx-wm8960.c @@ -427,6 +427,10 @@ static int of_parse_gpr(struct platform_device *pdev, int ret; struct of_phandle_args args; + if (of_device_is_compatible(pdev->dev.of_node, + "fsl,imx7d-evk-wm8960")) + return 0; + ret = of_parse_phandle_with_fixed_args(pdev->dev.of_node, "gpr", 3, 0, &args); if (ret) { @@ -649,6 +653,7 @@ static int imx_wm8960_remove(struct platform_device *pdev) static const struct of_device_id imx_wm8960_dt_ids[] = { { .compatible = "fsl,imx-audio-wm8960", }, + { .compatible = "fsl,imx7d-evk-wm8960" }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, imx_wm8960_dt_ids); |