Commit 34a921a0 authored by Daniel Baluta's avatar Daniel Baluta Committed by ZhangPeng
Browse files

ASoC: SOF: imx8m: Fix DSP control regmap retrieval 

stable inclusion
from stable-v6.6.44
commit 0e51f66977e33ab2af28c51464c9de6a026fc8e1
bugzilla: https://gitee.com/openeuler/kernel/issues/IAHMJO

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=0e51f66977e33ab2af28c51464c9de6a026fc8e1



--------------------------------

[ Upstream commit 2634f745eac25a33f032df32cf98fca8538a534a ]

According to Documentation/devicetree/bindings/dsp/fsl,dsp.yaml
fsl,dsp-ctrl is a phandle to syscon block so we need to use correct
function to retrieve it.

Currently there is no SOF DSP DTS merged into mainline so there is no
need to support the old way of retrieving the dsp control node.

Fixes: 9ba23717 ("ASoC: SOF: imx8m: Implement DSP start")
Signed-off-by: default avatarDaniel Baluta <daniel.baluta@nxp.com>
Link: https://patch.msgid.link/20240715151653.114751-1-daniel.baluta@oss.nxp.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarZhangPeng <zhangpeng362@huawei.com>
parent af7e82bd

sound/soc/sof/imx/imx8m.c

+1 −1
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@ static int imx8m_probe(struct snd_sof_dev *sdev) 
	/* set default mailbox offset for FW ready message */

	sdev->dsp_box.offset = MBOX_OFFSET;



	priv->regmap = syscon_regmap_lookup_by_compatible("fsl,dsp-ctrl");

	priv->regmap = syscon_regmap_lookup_by_phandle(np, "fsl,dsp-ctrl");

	if (IS_ERR(priv->regmap)) {

		dev_err(sdev->dev, "cannot find dsp-ctrl registers");

		ret = PTR_ERR(priv->regmap);