Received-SPF: pass (google.com: domain of linux-kernel+bounces-95078-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
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 3/4] ASoC: fsl: Let imx-audio-rpmsg register platform device for card
Date: Thu,  7 Mar 2024 16:44:36 +0900
Message-ID: <20240307074437.1472593-4-chancel.liu@nxp.com>
In-Reply-To: <20240307074437.1472593-1-chancel.liu@nxp.com>
References: <20240307074437.1472593-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?vQOxgWPFUzUHuFlnq+UbZyZrqCCLNVpXQbaYw22ppExgN1T+JEII0dlEr96l?=
 =?us-ascii?Q?VF0Q383A2I8e+E7fb+hKbiVaPr8B3ZgOR2eutO4LQ1LZNlnk4BybrPvkj7yC?=
 =?us-ascii?Q?yqwc5RSt5Ew6YLiO14v0dC7+X0Ee/vhH+trWk4aqfLRn3DiY7unkLJPnMT7G?=
 =?us-ascii?Q?AglN+a8FgCX4xVxw/SMSqb77nhB0nhh0LBGMGKKZPJgSRJWxMi2x1su07tpW?=
 =?us-ascii?Q?fmQrXMglw6SmDftRlYjZAvjYLagi9DHYwn3la5kxynivzfhaUGYDhVY0izWm?=
 =?us-ascii?Q?NI1laIYvlprSVmoROLPXOC0UYXArTw18qvoQoJyZY+pz07/wv00W2PvYV+fT?=
 =?us-ascii?Q?Xw10l+zB+JElVggs8vRPjjgz59BaJx7t0nE/R4wHWtarxeVpUIfpjM/a9APM?=
 =?us-ascii?Q?kx4FWGoZLikRapY6ievUGkG1/kNAJOMIO+UCvl/RL/NKxWsZn6ij3SzJ1JiG?=
 =?us-ascii?Q?MMxZSg8emGTjuwHFoQQVNLkaroidprVuYeWbyaosdTJb79rmbA7VY0SdwZVT?=
 =?us-ascii?Q?V4kNSnSkFTHB1yb5qKUhKqSZi+y9QQ9Ox8hZ+tegg+sMb8zz4kK55UXFJji/?=
 =?us-ascii?Q?HzDG7vnkq5y3QZ3ENoQa6Y5/XtJZqLYZ4n/fRvfZa30APicY1fnzY/WqwPxy?=
 =?us-ascii?Q?Ig2AamZ+UPUpdVZ1AMbGcMgEKZuqP008vUxhtfxwTHWkSVTAuQk1JzQakn9Z?=
 =?us-ascii?Q?ZaKWo8SxzAULC0amwUL+iljaoB5A/1kaax7snbx/ctU1YM82106qVs072gxj?=
 =?us-ascii?Q?j9zmg7YR7y0cOuMr++oZqWMP8KWRT636fJV0q4XJzmscAnx91zNyV5yDkdf3?=
 =?us-ascii?Q?VY9wQT3wqyN3+qmN+Ib5ysq6NqmSeST6NtYuehTmGfIpVy2OUeVT7vFtoATM?=
 =?us-ascii?Q?wLjG0pXKOU34VZh70Nz+RJSNbBhre1lx4Mn6lMyLc0Uk8SQ4mAFUZNZeOJOg?=
 =?us-ascii?Q?jGRA07m2c4rM2k+a+wR+v32y5flAxbxswC1U0w1xVcGq3QG6zlpWgu8u1tpg?=
 =?us-ascii?Q?ghPw91jy4lUWN0KIa99HEAn2q60tJXGjduPTOsYLkshu0Zii6OIxlynE8xoy?=
 =?us-ascii?Q?T7Rh0iUJjMkngWOB6J4iF5wn8a9nE0wCoast1KrKMgSlG9fHmmPx12dUqe2t?=
 =?us-ascii?Q?60uGHqC8UCAvfIy/HMRtutfUO2dl2VN2j6N4v1ozK1CvOdwU0oXSfZdgEN+/?=
 =?us-ascii?Q?QiMeHQwDcbkChRyN2t0S5QA9XFJnEi2ocgBoalLUTLGxukRHCyddS2TcBGFm?=
 =?us-ascii?Q?MWq3nt9Qh0TkLnTfGbiyFLSxQzS00gmJWqDA0wHEYYnIrMex4iBJJDDJpQ7h?=
 =?us-ascii?Q?z+NHdgt3SDly2kUmLjoFWn1XvMcYtWS+OtEfkrdeQDbYnIbz1mWKni0EFi9+?=
 =?us-ascii?Q?04TgsXGl5Yh/WQIFKHpdmnylxMUPG4e3qfAMmMNq3kc6irCoXLbz3cAaKTvR?=
 =?us-ascii?Q?L3n8al4kdQg/vpY1XeuQwcGO8NMPEJve50IWuElj0m8R7j1y9bY5rA9swNmj?=
 =?us-ascii?Q?mnw4TJzqPJztYfa4kJGXAAG4PNxWkD9D9qwLdxVss+FIa/BZG5Mko2vSKFrj?=
 =?us-ascii?Q?kQtuiMUohYKjCt6YSg6ApP+zuQBOAO91JM4uC5Oj?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: f0ecbf9d-514e-493d-6ecb-08dc3e7a8b97
X-MS-Exchange-CrossTenant-AuthSource: DB9PR04MB9498.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Mar 2024 07:45:23.0398
 (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: yGMT21PAjoFlZ4KvMAYDcVCsFGFKBpS1kxem+oDqsLZQJdA1U2aP1kLjxqcpJ3c025j9wRjHG53WIWNHPGS8XQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB9789

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 | 17 ++++++++++++++++-
 2 files changed, 16 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..60f27b0a2530 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,16 @@ 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);
+	}
+
 	return ret;
 }
 
@@ -105,6 +116,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 +127,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 +141,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