From 93df7b6fa925eadfd85393920d18b2f3c3e08973 Mon Sep 17 00:00:00 2001
From: Liang Chen <cl@rock-chips.com>
Date: Tue, 1 Mar 2022 17:25:15 +0800
Subject: [PATCH] clk: scmi: initialize driver earlier when
 CONFIG_ARCH_ROCKCHIP=y

Make sure scmi_clk_cpu is ready when initialize cpufreq driver.

Change-Id: I8c0d0f59480127b4c98d9bdeb8be6080a1fc3dfd
Signed-off-by: Liang Chen <cl@rock-chips.com>
---
 drivers/clk/clk-scmi.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/drivers/clk/clk-scmi.c b/drivers/clk/clk-scmi.c
index ddc51a6a2e27..7da2c01c4444 100644
--- a/drivers/clk/clk-scmi.c
+++ b/drivers/clk/clk-scmi.c
@@ -202,7 +202,21 @@ static struct scmi_driver scmi_clocks_driver = {
 	.probe = scmi_clocks_probe,
 	.id_table = scmi_id_table,
 };
+#ifdef CONFIG_ARCH_ROCKCHIP
+static int __init scmi_clocks_driver_init(void)
+{
+	return scmi_register(&scmi_clocks_driver);
+}
+subsys_initcall_sync(scmi_clocks_driver_init);
+
+static void __exit scmi_clocks_driver_exit(void)
+{
+	scmi_unregister(&scmi_clocks_driver);
+}
+module_exit(scmi_clocks_driver_exit);
+#else
 module_scmi_driver(scmi_clocks_driver);
+#endif
 
 MODULE_AUTHOR("Sudeep Holla <sudeep.holla@arm.com>");
 MODULE_DESCRIPTION("ARM SCMI clock driver");