Received-SPF: pass (google.com: domain of linux-kernel+bounces-43436-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
From: Frank Li <Frank.Li@nxp.com>
To: ilpo.jarvinen@linux.intel.com
Cc: Frank.Li@nxp.com,
	alexandre.belloni@bootlin.com,
	conor.culhane@silvaco.com,
	devicetree@vger.kernel.org,
	gregkh@linuxfoundation.org,
	imx@lists.linux.dev,
	jirislaby@kernel.org,
	joe@perches.com,
	krzysztof.kozlowski+dt@linaro.org,
	krzysztof.kozlowski@linaro.org,
	linux-i3c@lists.infradead.org,
	linux-kernel@vger.kernel.org,
	linux-serial@vger.kernel.org,
	miquel.raynal@bootlin.com,
	robh@kernel.org,
	zbigniew.lukwinski@linux.intel.com
Subject: [PATCH v5 4/8] i3c: svc: Add svc-i3c-main.c and svc-i3c.h
Date: Mon, 29 Jan 2024 14:53:17 -0500
Message-Id: <20240129195321.229867-5-Frank.Li@nxp.com>
In-Reply-To: <20240129195321.229867-1-Frank.Li@nxp.com>
References: <20240129195321.229867-1-Frank.Li@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?D6j/Zd/y2E4EUHXYEQHIwmX6XkQfMmeSlc2kLOdu0orOu8kfCNGi375E3wy4?=
 =?us-ascii?Q?A2BJX7dHsctifCEAYR0DSNF6MpAqyWxE8PzSn+IgcAubqtimFsxkJapMHNYl?=
 =?us-ascii?Q?MYPKX1ZFs6fP/tm5mdE8iBG3CH10F65YR52DavNKuX+Wo9xbU7/cId7gpNu5?=
 =?us-ascii?Q?sUPW1YJi2MXccHzrdUUxO1E/jCNMR8yRtoxIh63a8WyJEOnzlpa3BFECdBIy?=
 =?us-ascii?Q?jpUzJ20Oq/d+RqboV3HPFp5HJ1tRCCYigc5ITDJndND+ZRPbJJs9wLXhsm8w?=
 =?us-ascii?Q?hlEAQavEIkgVo2jFCuV/raW3FEoJ9dGbyRK3usb+8LDd0cWKCwH2tcWOytlr?=
 =?us-ascii?Q?p/FjtUqHLyIuMuRew/U9uOlD9vMZSsR+D3m0q8Yy0mLpXCx9fXpnSx8+e64p?=
 =?us-ascii?Q?wgjFbDOrMjQCViWnKBl/QsOhzBgacYjaaxZmKTAiVIVkQVi0qq3hlsgC6qkp?=
 =?us-ascii?Q?k8ZbX7Eqyg8BKsRHOBgZAoiMTiNnYpJjdIkJvdhrQhC5f4pMSqw8Diangeo7?=
 =?us-ascii?Q?LMIY/1xtU5aLsmtDPNGbLZPkBLxf8+buOnorP16mqN2NkyBM+8d0jZsgrrEV?=
 =?us-ascii?Q?OGK0a+QvC/JZudhXX3BKceJYQMt9GqtU572PWkdLGL31t1naxIhygWtljc+W?=
 =?us-ascii?Q?3T1PS1SGPtlOEOSGuhgJN8DMUxhvmr+g2CdebUOwrUdjdX0kpNz/quYqsXgB?=
 =?us-ascii?Q?XacPvcg0pwiKPMaB0AkOgMuwnbjLx2um0Q7tG7a9Ey7l34RxMFctDTilZKbG?=
 =?us-ascii?Q?j4gg040D8XtCCT8Lu2JmEWS4fwk7frdSm/6eRFTG+hisbodax+EBLoRuRP+Z?=
 =?us-ascii?Q?bI+e7cwx1iDRAGEEc+2a6psFWhBzSVz/EXK8b1b4dagAYQbQ8Npp9ZC7NnEl?=
 =?us-ascii?Q?GScUbdnz8zIYplqT703DJV3/7okYi4SIg9VvRFCtzGjz8ApwzGIO2leQhRZC?=
 =?us-ascii?Q?7FJMvvq4+rMc7UGFb29Nq3FA/7yqSCM+uiaglQCC4uLkMp4DhgC1UV9V0OlB?=
 =?us-ascii?Q?SmV5u8fb9hLIwZiCQDCDOYrt4vPWML/PL90KyGbdSS5VEDlHZpRoXX7lA3dy?=
 =?us-ascii?Q?LuN5cOyPZ4uoHoNs1qjnpQLPvhteuspcrtFHFWYgxb6xY5UUeXcdT8HQbV/w?=
 =?us-ascii?Q?5PyJqvjC+01ksLqO7Pv9VgZmCm61mzLdYswMfZLGSMgF7wVSkcJo5WX86hRF?=
 =?us-ascii?Q?tRU3BSsnzrysi47u3Z8Kz6WzB1EWkLXFDHa3QItu84T2cNkYHGimw3WVRMJY?=
 =?us-ascii?Q?uHPnt1s+2LfK+R9N8Stms4yYEcoADnwlKNiyz+15AJu6rBATknHXhkp+x9nA?=
 =?us-ascii?Q?VerVvLD1F+c6rxwTT0MIV1OY270tMaGB3AG4Jdr0bX+mB7FQ7e2o1xsWcAca?=
 =?us-ascii?Q?wloXvZB03gsDRfO2EYxIQLO0DZ7YnjOqQ6cmjCiOdzaR3p50dfi7EspZBovI?=
 =?us-ascii?Q?DnVg9PcXwhHZrXje74kT2pFsPm/7AEkb0x9PZGAIvDWJlO+UC7H6zPNvTnCi?=
 =?us-ascii?Q?YF1LEp9mH0FX9dlR591tzkFz0SDQINuXAMvcUJxduWdSU+/4V04dTPJGWYGj?=
 =?us-ascii?Q?+gt69wErUcmng7C3fwj9S+DoptBhYE+lS+qDrPP1?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 8a100bb0-cc18-444a-7402-08dc21040726
X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9642.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jan 2024 19:53:56.5271
 (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: 2WchcXB5bB3m1GmhtmsyvtvI39IUKH821r1xLcJT2U7hhMly5comIokZlFqwmXSEDKPBFclNy+612cKx2M3H4g==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8128

SVC i3c is a dual role controller. Move probe() into svc-i3c-main.c. This
prepares to support target probe depending on dts "mode" settings.

Signed-off-by: Frank Li <Frank.Li@nxp.com>
---

Notes:
    Change from v4 to v5
    - add new line at end of file
    
    New file from v4

 drivers/i3c/master/Makefile         |  3 +-
 drivers/i3c/master/svc-i3c-main.c   | 53 +++++++++++++++++++++++++++++
 drivers/i3c/master/svc-i3c-master.c | 34 ++++--------------
 drivers/i3c/master/svc-i3c.h        | 12 +++++++
 4 files changed, 73 insertions(+), 29 deletions(-)
 create mode 100644 drivers/i3c/master/svc-i3c-main.c
 create mode 100644 drivers/i3c/master/svc-i3c.h

diff --git a/drivers/i3c/master/Makefile b/drivers/i3c/master/Makefile
index 3e97960160bc8..484cb81f45821 100644
--- a/drivers/i3c/master/Makefile
+++ b/drivers/i3c/master/Makefile
@@ -2,5 +2,6 @@
 obj-$(CONFIG_CDNS_I3C_MASTER)		+= i3c-master-cdns.o
 obj-$(CONFIG_DW_I3C_MASTER)		+= dw-i3c-master.o
 obj-$(CONFIG_AST2600_I3C_MASTER)	+= ast2600-i3c-master.o
-obj-$(CONFIG_SVC_I3C_MASTER)		+= svc-i3c-master.o
+svc-i3c-objs				+= svc-i3c-main.o svc-i3c-master.o
+obj-$(CONFIG_SVC_I3C_MASTER)		+= svc-i3c.o
 obj-$(CONFIG_MIPI_I3C_HCI)		+= mipi-i3c-hci/
diff --git a/drivers/i3c/master/svc-i3c-main.c b/drivers/i3c/master/svc-i3c-main.c
new file mode 100644
index 0000000000000..6be6a576cdf7a
--- /dev/null
+++ b/drivers/i3c/master/svc-i3c-main.c
@@ -0,0 +1,53 @@
+// SPDX-License-Identifier: GPL-2.0
+
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/platform_device.h>
+#include <linux/pm_runtime.h>
+
+#include "svc-i3c.h"
+
+static int svc_i3c_probe(struct platform_device *pdev)
+{
+	return svc_i3c_master_probe(pdev);
+}
+
+static void svc_i3c_remove(struct platform_device *pdev)
+{
+	svc_i3c_master_remove(pdev);
+}
+
+static int __maybe_unused svc_i3c_runtime_suspend(struct device *dev)
+{
+	return svc_i3c_master_runtime_suspend(dev);
+}
+
+static int __maybe_unused svc_i3c_runtime_resume(struct device *dev)
+{
+	return svc_i3c_master_runtime_resume(dev);
+}
+
+static const struct dev_pm_ops svc_i3c_pm_ops = {
+	SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,
+				      pm_runtime_force_resume)
+	SET_RUNTIME_PM_OPS(svc_i3c_runtime_suspend,
+			   svc_i3c_runtime_resume, NULL)
+};
+
+static const struct of_device_id svc_i3c_master_of_match_tbl[] = {
+	{ .compatible = "silvaco,i3c-master-v1"},
+	{ /* sentinel */ },
+};
+MODULE_DEVICE_TABLE(of, svc_i3c_master_of_match_tbl);
+
+static struct platform_driver svc_i3c_master = {
+	.probe = svc_i3c_probe,
+	.remove_new = svc_i3c_remove,
+	.driver = {
+		.name = "silvaco-i3c-master",
+		.of_match_table = svc_i3c_master_of_match_tbl,
+		.pm = &svc_i3c_pm_ops,
+	},
+};
+module_platform_driver(svc_i3c_master);
+
diff --git a/drivers/i3c/master/svc-i3c-master.c b/drivers/i3c/master/svc-i3c-master.c
index 5ee4db68988e2..4dfe85ab17fd2 100644
--- a/drivers/i3c/master/svc-i3c-master.c
+++ b/drivers/i3c/master/svc-i3c-master.c
@@ -21,6 +21,8 @@
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
 
+#include "svc-i3c.h"
+
 /* Master Mode Registers */
 #define SVC_I3C_MCONFIG      0x000
 #define   SVC_I3C_MCONFIG_MASTER_EN BIT(0)
@@ -1613,7 +1615,7 @@ static void svc_i3c_master_unprepare_clks(struct svc_i3c_master *master)
 	clk_disable_unprepare(master->sclk);
 }
 
-static int svc_i3c_master_probe(struct platform_device *pdev)
+int svc_i3c_master_probe(struct platform_device *pdev)
 {
 	struct device *dev = &pdev->dev;
 	struct svc_i3c_master *master;
@@ -1706,7 +1708,7 @@ static int svc_i3c_master_probe(struct platform_device *pdev)
 	return ret;
 }
 
-static void svc_i3c_master_remove(struct platform_device *pdev)
+void svc_i3c_master_remove(struct platform_device *pdev)
 {
 	struct svc_i3c_master *master = platform_get_drvdata(pdev);
 
@@ -1733,7 +1735,7 @@ static void svc_i3c_restore_regs(struct svc_i3c_master *master)
 	}
 }
 
-static int __maybe_unused svc_i3c_runtime_suspend(struct device *dev)
+int svc_i3c_master_runtime_suspend(struct device *dev)
 {
 	struct svc_i3c_master *master = dev_get_drvdata(dev);
 
@@ -1744,7 +1746,7 @@ static int __maybe_unused svc_i3c_runtime_suspend(struct device *dev)
 	return 0;
 }
 
-static int __maybe_unused svc_i3c_runtime_resume(struct device *dev)
+int svc_i3c_master_runtime_resume(struct device *dev)
 {
 	struct svc_i3c_master *master = dev_get_drvdata(dev);
 
@@ -1756,30 +1758,6 @@ static int __maybe_unused svc_i3c_runtime_resume(struct device *dev)
 	return 0;
 }
 
-static const struct dev_pm_ops svc_i3c_pm_ops = {
-	SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,
-				      pm_runtime_force_resume)
-	SET_RUNTIME_PM_OPS(svc_i3c_runtime_suspend,
-			   svc_i3c_runtime_resume, NULL)
-};
-
-static const struct of_device_id svc_i3c_master_of_match_tbl[] = {
-	{ .compatible = "silvaco,i3c-master-v1"},
-	{ /* sentinel */ },
-};
-MODULE_DEVICE_TABLE(of, svc_i3c_master_of_match_tbl);
-
-static struct platform_driver svc_i3c_master = {
-	.probe = svc_i3c_master_probe,
-	.remove_new = svc_i3c_master_remove,
-	.driver = {
-		.name = "silvaco-i3c-master",
-		.of_match_table = svc_i3c_master_of_match_tbl,
-		.pm = &svc_i3c_pm_ops,
-	},
-};
-module_platform_driver(svc_i3c_master);
-
 MODULE_AUTHOR("Conor Culhane <conor.culhane@silvaco.com>");
 MODULE_AUTHOR("Miquel Raynal <miquel.raynal@bootlin.com>");
 MODULE_DESCRIPTION("Silvaco dual-role I3C master driver");
diff --git a/drivers/i3c/master/svc-i3c.h b/drivers/i3c/master/svc-i3c.h
new file mode 100644
index 0000000000000..26a3fbcdb6524
--- /dev/null
+++ b/drivers/i3c/master/svc-i3c.h
@@ -0,0 +1,12 @@
+// SPDX-License-Identifier: GPL-2.0
+
+#ifndef SVC_I3C_H
+#define SVC_I3C_H
+
+int svc_i3c_master_probe(struct platform_device *pdev);
+void svc_i3c_master_remove(struct platform_device *pdev);
+int svc_i3c_master_runtime_suspend(struct device *dev);
+int svc_i3c_master_runtime_resume(struct device *dev);
+
+#endif
+
-- 
2.34.1