From: Chancel Liu <chancel.liu@nxp.com>
To: shengjiu.wang@gmail.com, Xiubo.Lee@gmail.com, festevam@gmail.com,
nicoleotsuka@gmail.com, lgirdwood@gmail.com, broonie@kernel.org,
perex@perex.cz, tiwai@suse.com, shawnguo@kernel.org,
s.hauer@pengutronix.de, kernel@pengutronix.de, linux-imx@nxp.com,
alsa-devel@alsa-project.org, linuxppc-dev@lists.ozlabs.org,
linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org
Cc: Chancel Liu <chancel.liu@nxp.com>
Subject: [PATCH v2 4/4] ASoC: fsl: imx-rpmsg: Update to correct DT node
Date: Thu, 7 Mar 2024 16:44:37 +0900 [thread overview]
Message-ID: <20240307074437.1472593-5-chancel.liu@nxp.com> (raw)
In-Reply-To: <20240307074437.1472593-1-chancel.liu@nxp.com>
Platform device for card to probe is registered in imx-audio-rpmsg.
According to this change DT node of ASoC CPU DAI device is updated.
Signed-off-by: Chancel Liu <chancel.liu@nxp.com>
---
sound/soc/fsl/imx-rpmsg.c | 21 ++++++++++++++++++---
1 file changed, 18 insertions(+), 3 deletions(-)
diff --git a/sound/soc/fsl/imx-rpmsg.c b/sound/soc/fsl/imx-rpmsg.c
index e5bd63dab10c..2686125b3043 100644
--- a/sound/soc/fsl/imx-rpmsg.c
+++ b/sound/soc/fsl/imx-rpmsg.c
@@ -108,10 +108,9 @@ static int imx_rpmsg_late_probe(struct snd_soc_card *card)
static int imx_rpmsg_probe(struct platform_device *pdev)
{
struct snd_soc_dai_link_component *dlc;
- struct device *dev = pdev->dev.parent;
/* rpmsg_pdev is the platform device for the rpmsg node that probed us */
- struct platform_device *rpmsg_pdev = to_platform_device(dev);
- struct device_node *np = rpmsg_pdev->dev.of_node;
+ struct platform_device *rpmsg_pdev = NULL;
+ struct device_node *np = NULL;
struct of_phandle_args args;
const char *platform_name;
struct imx_rpmsg *data;
@@ -127,6 +126,22 @@ static int imx_rpmsg_probe(struct platform_device *pdev)
goto fail;
}
+ if (!strcmp(pdev->dev.platform_data, "rpmsg-micfil-channel"))
+ np = of_find_node_by_name(NULL, "rpmsg_micfil");
+ else
+ np = of_find_node_by_name(NULL, "rpmsg_audio");
+ if (!np) {
+ dev_err(&pdev->dev, "failed to parse node\n");
+ ret = -EINVAL;
+ goto fail;
+ }
+ rpmsg_pdev = of_find_device_by_node(np);
+ if (!rpmsg_pdev) {
+ dev_err(&pdev->dev, "failed to parse platform device\n");
+ ret = -EINVAL;
+ goto fail;
+ }
+
ret = of_reserved_mem_device_init_by_idx(&pdev->dev, np, 0);
if (ret)
dev_warn(&pdev->dev, "no reserved DMA memory\n");
--
2.43.0
next prev parent reply other threads:[~2024-03-07 7:45 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-07 7:44 [PATCH v2 0/4] ASoC: fsl: Support register and unregister rpmsg sound card through remoteproc Chancel Liu
2024-03-07 7:44 ` [PATCH v2 1/4] ASoC: fsl: imx_pcm_rpmsg: Register component with rpmsg channel name Chancel Liu
2024-03-07 7:44 ` [PATCH v2 2/4] ASoC: fsl: imx-audio-rpmsg: Register device " Chancel Liu
2024-03-07 7:44 ` [PATCH v2 3/4] ASoC: fsl: Let imx-audio-rpmsg register platform device for card Chancel Liu
2024-03-07 7:44 ` Chancel Liu [this message]
2024-03-07 8:23 ` [PATCH v2 4/4] ASoC: fsl: imx-rpmsg: Update to correct DT node Krzysztof Kozlowski
2024-03-11 7:33 ` Chancel Liu
2024-03-11 7:48 ` Krzysztof Kozlowski
2024-03-11 8:23 ` Chancel Liu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240307074437.1472593-5-chancel.liu@nxp.com \
--to=chancel.liu@nxp.com \
--cc=Xiubo.Lee@gmail.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=festevam@gmail.com \
--cc=kernel@pengutronix.de \
--cc=lgirdwood@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-imx@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sound@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=nicoleotsuka@gmail.com \
--cc=perex@perex.cz \
--cc=s.hauer@pengutronix.de \
--cc=shawnguo@kernel.org \
--cc=shengjiu.wang@gmail.com \
--cc=tiwai@suse.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox