On 2020-09-02 07:50, Elaine Zhang wrote:
support CLK_OF_DECLARE and builtin_platform_driver_probe
double clk init method.
add module author, description and license to support building
Soc Rk3399 clock driver as module.

Signed-off-by: Elaine Zhang <zhangq...@rock-chips.com>
---
  drivers/clk/rockchip/clk-rk3399.c | 40 +++++++++++++++++++++++++++++++
  1 file changed, 40 insertions(+)

diff --git a/drivers/clk/rockchip/clk-rk3399.c 
b/drivers/clk/rockchip/clk-rk3399.c
index ce1d2446f142..a1d5704b9ba2 100644
--- a/drivers/clk/rockchip/clk-rk3399.c
+++ b/drivers/clk/rockchip/clk-rk3399.c
@@ -5,9 +5,11 @@
   */
#include <linux/clk-provider.h>
+#include <linux/module.h>
  #include <linux/io.h>
  #include <linux/of.h>
  #include <linux/of_address.h>
+#include <linux/of_device.h>
  #include <linux/platform_device.h>
  #include <linux/regmap.h>
  #include <dt-bindings/clock/rk3399-cru.h>
@@ -1600,3 +1602,41 @@ static void __init rk3399_pmu_clk_init(struct 
device_node *np)
        rockchip_clk_of_add_provider(np, ctx);
  }
  CLK_OF_DECLARE(rk3399_cru_pmu, "rockchip,rk3399-pmucru", rk3399_pmu_clk_init);
+
+static int __init clk_rk3399_probe(struct platform_device *pdev)
+{
+       struct device_node *np = pdev->dev.of_node;
+       unsigned long data;
+
+       data = (unsigned long)of_device_get_match_data(&pdev->dev);
+       if (data)
+               rk3399_pmu_clk_init(np);
+       else
+               rk3399_clk_init(np);

It might be clearer and simpler to just store a function pointer in the match data directly - there's already precedent for that elsewhere.

Robin.

+
+       return 0;
+}
+
+static const struct of_device_id clk_rk3399_match_table[] = {
+       {
+               .compatible = "rockchip,rk3399-cru",
+               .data = (void *)0
+       },  {
+               .compatible = "rockchip,rk3399-pmucru",
+               .data = (void *)1,
+       },
+       { }
+};
+MODULE_DEVICE_TABLE(of, clk_rk3399_match_table);
+
+static struct platform_driver clk_rk3399_driver = {
+       .driver         = {
+               .name   = "clk-rk3399",
+               .of_match_table = clk_rk3399_match_table,
+       },
+};
+builtin_platform_driver_probe(clk_rk3399_driver, clk_rk3399_probe);
+
+MODULE_DESCRIPTION("Rockchip RK3399 Clock Driver");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:clk-rk3399");

Reply via email to