Received-SPF: pass (google.com: domain of linux-kernel+bounces-93455-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
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 3/4] ASoC: fsl: Let imx-audio-rpmsg register platform device for card
Date: Wed,  6 Mar 2024 16:55:09 +0900
Message-ID: <20240306075510.535963-4-chancel.liu@nxp.com>
In-Reply-To: <20240306075510.535963-1-chancel.liu@nxp.com>
References: <20240306075510.535963-1-chancel.liu@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?us-ascii?Q?oHaffo0X1sfIB/xo0qytN0TW2Msuu/eDOBt2jE5uYwF9mTvLEZ8DNTez5l9r?=
 =?us-ascii?Q?NrZDe3YCosRMtatWYqWGXLVEuWh6rXIJWBKxHYHbNGx5J6Bpg899EJDfcvMl?=
 =?us-ascii?Q?agm3rOEFqe2M2obpET4i5oS3pr+BOESEkpfdlW2dVSBVToGxv/BgdDQ2H0ax?=
 =?us-ascii?Q?OetfVJVAKc62Qb79uAfj20zKpY4f/mBjhuy89SFryn55s9Hgq84acG/g+gLU?=
 =?us-ascii?Q?IJY17ZpAvYeVxNgx27mHuAazthG5e+PmnhBXKBJeTLbIARyL7rFXuGI70nlN?=
 =?us-ascii?Q?gqTO4yOmYPG5PX+2uwDVjrUEOZzW4FiLOkKArKavtBcC9P2gjf7bmqYhzg3X?=
 =?us-ascii?Q?9ZezAO/iE0z4qr5H4WBCIugAptvKKjXdmx9ytiSX2Ghf49uiPQdmWtGkjNbr?=
 =?us-ascii?Q?YHR9Go2lucCcd3u+SEyv9TwK6Hfp6c0tl98Jf9NqD7dFLNxTgj6rVnc9Hkww?=
 =?us-ascii?Q?yEVrxF9ylShz+agWLup2B8I4TjDvcNaOdhOGagw8/zFy4fy7/lXLQZ1X8CGd?=
 =?us-ascii?Q?tlN/2+M3qMzPwbLp+suL8qWPtkrqTTcm9M04DIoBr0hIQ6QD4m3o02QqZbms?=
 =?us-ascii?Q?IncmLYsVfIMdG8fncOu08n5ngC8+Zzet3Jf7p9xBfScFAtND4NKzhYmNHQ4B?=
 =?us-ascii?Q?14AnjGkk08pzX7ZpNdY4pAJWVItCJtdWknZNu95kBParbN0baIrNRlPi5HiW?=
 =?us-ascii?Q?wEdTXVJw04bM99JF5zkGdisNyUVz+ngi5wVrh3QI4g95ldMax4s5dnEglbFs?=
 =?us-ascii?Q?OuQkcD8I9iVN2/PC8E2L9u4NIgHe0XSu+aLJLIGKCq1rnunOWmfv1sOBZl6A?=
 =?us-ascii?Q?POURE3pntwPQKgXO8Zj8LcReVjjDJrpnic1mJ+N5lOmvgZ97Sa8j6/Tee3Sy?=
 =?us-ascii?Q?qIrmqWhY6XfwVYkx71gNdpK+EOhMlskk+CPpDacFAfWGsibNHQIyUof/UgNq?=
 =?us-ascii?Q?pSdJxJhV27QD+6oEp8sD+mCSNu6zoL/cL4VMzLthaICZcFpSPylsZytPS16q?=
 =?us-ascii?Q?5A9GW5XlNaS5kvBsmT1jDWlwNNq9FmXgaU0vJrwuRT1P9itHMsA/OMSs9qTr?=
 =?us-ascii?Q?cYMV87oENaLwT2hcn4sA5kjIxPd0jl6ZTEkZE0aIct9bUHW8n0n/S8tnxKFS?=
 =?us-ascii?Q?lhsL/iXMmSZucwIYg+d7dTg/oz1KuCRAPfr48MCWARamq09ecswG76iTXNqm?=
 =?us-ascii?Q?CtWyuSCfmLBhePznAO37j/xXdmKGjrLQ2D998rZAgdDIcun3AN0SvSbjR7+p?=
 =?us-ascii?Q?hvT3NuuxEzP92C8aGMzMiDybHohhewe0w8gkRPUdpFOAIeWJgz2MiSgsbRkS?=
 =?us-ascii?Q?LtGGluCNzUIjZIAJeLLIwsRAXTAgKR/Qlxk8wdlQ+KoROgp+XPjaGbnoI5Ej?=
 =?us-ascii?Q?yGUjlSGFDTBUTpHiDwocEy/1UgI+L9NTmymBUFcUjUQ6GjDryCwTRBs18Yv/?=
 =?us-ascii?Q?MmLLj2pp8riLbaNp7y8Wv+pVdM0ntfvj5/gE8BGlpuvn1SObY2ucZFugMxMe?=
 =?us-ascii?Q?qMaT/QQAtAK0/GEHA5V9VUP5NyZd8XHahifI2/pE/Szg6IIUZYG1jg2IK99w?=
 =?us-ascii?Q?ah644GE2lpXPtTJdX79tnhrsKOuDuFrQgkdr85yd?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 9ef007f8-46ea-484f-ab02-08dc3db2ecca
X-MS-Exchange-CrossTenant-AuthSource: DB9PR04MB9498.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Mar 2024 07:56:26.7987
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 5pMs1NzbT0apiJeB/iRWX44t4OFoWKxuoYvHGQADOBL0SLvlyYgPRLyeoylrNW5dmQX63Qiz6YkOeXPn/HTtUQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB7376

Let imx-audio-rpmsg register platform device for card. So that card
register and unregister can be controlled by rpmsg driver's register
and unregister.

Signed-off-by: Chancel Liu <chancel.liu@nxp.com>
---
 sound/soc/fsl/fsl_rpmsg.c       | 11 -----------
 sound/soc/fsl/imx-audio-rpmsg.c | 18 +++++++++++++++++-
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/sound/soc/fsl/fsl_rpmsg.c b/sound/soc/fsl/fsl_rpmsg.c
index 00852f174a69..53bd517e59d6 100644
--- a/sound/soc/fsl/fsl_rpmsg.c
+++ b/sound/soc/fsl/fsl_rpmsg.c
@@ -240,17 +240,6 @@ static int fsl_rpmsg_probe(struct platform_device *pdev)
 	if (ret)
 		goto err_pm_disable;
 
-	rpmsg->card_pdev = platform_device_register_data(&pdev->dev,
-							 "imx-audio-rpmsg",
-							 PLATFORM_DEVID_AUTO,
-							 NULL,
-							 0);
-	if (IS_ERR(rpmsg->card_pdev)) {
-		dev_err(&pdev->dev, "failed to register rpmsg card\n");
-		ret = PTR_ERR(rpmsg->card_pdev);
-		goto err_pm_disable;
-	}
-
 	return 0;
 
 err_pm_disable:
diff --git a/sound/soc/fsl/imx-audio-rpmsg.c b/sound/soc/fsl/imx-audio-rpmsg.c
index 40820d5ad92d..a6817ce1e92a 100644
--- a/sound/soc/fsl/imx-audio-rpmsg.c
+++ b/sound/soc/fsl/imx-audio-rpmsg.c
@@ -12,6 +12,7 @@
  */
 struct imx_audio_rpmsg {
 	struct platform_device *rpmsg_pdev;
+	struct platform_device *card_pdev;
 };
 
 static int imx_audio_rpmsg_cb(struct rpmsg_device *rpdev, void *data, int len,
@@ -95,6 +96,17 @@ static int imx_audio_rpmsg_probe(struct rpmsg_device *rpdev)
 		ret = PTR_ERR(data->rpmsg_pdev);
 	}
 
+	data->card_pdev = platform_device_register_data(&rpdev->dev,
+							"imx-audio-rpmsg",
+							PLATFORM_DEVID_AUTO,
+							rpdev->id.name,
+							strlen(rpdev->id.name));
+	if (IS_ERR(data->card_pdev)) {
+		dev_err(&rpdev->dev, "failed to register rpmsg card.\n");
+		ret = PTR_ERR(data->card_pdev);
+		goto fail;
+	}
+
 	return ret;
 }
 
@@ -105,6 +117,9 @@ static void imx_audio_rpmsg_remove(struct rpmsg_device *rpdev)
 	if (data->rpmsg_pdev)
 		platform_device_unregister(data->rpmsg_pdev);
 
+	if (data->card_pdev)
+		platform_device_unregister(data->card_pdev);
+
 	dev_info(&rpdev->dev, "audio rpmsg driver is removed\n");
 }
 
@@ -113,6 +128,7 @@ static struct rpmsg_device_id imx_audio_rpmsg_id_table[] = {
 	{ .name = "rpmsg-micfil-channel" },
 	{ },
 };
+MODULE_DEVICE_TABLE(rpmsg, imx_audio_rpmsg_id_table);
 
 static struct rpmsg_driver imx_audio_rpmsg_driver = {
 	.drv.name	= "imx_audio_rpmsg",
@@ -126,5 +142,5 @@ module_rpmsg_driver(imx_audio_rpmsg_driver);
 
 MODULE_DESCRIPTION("Freescale SoC Audio RPMSG interface");
 MODULE_AUTHOR("Shengjiu Wang <shengjiu.wang@nxp.com>");
-MODULE_ALIAS("platform:imx_audio_rpmsg");
+MODULE_ALIAS("rpmsg:imx_audio_rpmsg");
 MODULE_LICENSE("GPL v2");
-- 
2.43.0