Re: [PATCH v5 2/5] clk: hisilicon: Extract common functions

[Stephen Boyd]

Quoting David Yang (2023-03-20 13:40:35)
> To be reused with other Hi3798 series SoCs.
> 
> Signed-off-by: David Yang <mmyangfl@xxxxxxxxx>
> ---

Please squash this patch in

---8<---
diff --git a/drivers/clk/hisilicon/crg-hi3798.c b/drivers/clk/hisilicon/crg-hi3798.c
index 3a8d70b7c8ec..0d6886bca3ba 100644
--- a/drivers/clk/hisilicon/crg-hi3798.c
+++ b/drivers/clk/hisilicon/crg-hi3798.c
@@ -203,8 +203,9 @@ struct hi3798_clks {
 	int complex_clks_nums;
 };
 
-static struct hisi_clock_data *hi3798_clk_register(
-		struct platform_device *pdev, const struct hi3798_clks *clks)
+static struct hisi_clock_data *
+hi3798_clk_register(struct platform_device *pdev,
+		    const struct hi3798_clks *clks)
 {
 	struct hisi_clock_data *clk_data;
 	int ret;
@@ -257,8 +258,8 @@ static struct hisi_clock_data *hi3798_clk_register(
 	return ERR_PTR(ret);
 }
 
-static void hi3798_clk_unregister(
-		struct platform_device *pdev, const struct hi3798_clks *clks)
+static void hi3798_clk_unregister(struct platform_device *pdev,
+				  const struct hi3798_clks *clks)
 {
 	struct hisi_crg_dev *crg = platform_get_drvdata(pdev);
 
@@ -276,8 +277,9 @@ static void hi3798_clk_unregister(
 
 #define HI3798_SYSCTRL_NR_CLKS 16
 
-static struct hisi_clock_data *hi3798_sysctrl_clk_register(
-		struct platform_device *pdev, const struct hi3798_clks *clks)
+static struct hisi_clock_data *
+hi3798_sysctrl_clk_register(struct platform_device *pdev,
+			    const struct hi3798_clks *clks)
 {
 	struct hisi_clock_data *clk_data;
 	int ret;
@@ -302,8 +304,8 @@ static struct hisi_clock_data *hi3798_sysctrl_clk_register(
 	return ERR_PTR(ret);
 }
 
-static void hi3798_sysctrl_clk_unregister(
-		struct platform_device *pdev, const struct hi3798_clks *clks)
+static void hi3798_sysctrl_clk_unregister(struct platform_device *pdev,
+					  const struct hi3798_clks *clks)
 {
 	struct hisi_crg_dev *crg = platform_get_drvdata(pdev);
 
@@ -623,8 +625,8 @@ static const struct hi3798_clks hi3798cv200_crg_clks = {
 	.phase_clks_nums = ARRAY_SIZE(hi3798mv100_phase_clks),
 };
 
-static struct hisi_clock_data *hi3798cv200_clk_register(
-				struct platform_device *pdev)
+static struct hisi_clock_data *
+hi3798cv200_clk_register(struct platform_device *pdev)
 {
 	return hi3798_clk_register(pdev, &hi3798cv200_crg_clks);
 }
@@ -653,8 +655,8 @@ static const struct hi3798_clks hi3798cv200_sysctrl_clks = {
 	.gate_clks_nums = ARRAY_SIZE(hi3798cv200_sysctrl_gate_clks),
 };
 
-static struct hisi_clock_data *hi3798cv200_sysctrl_clk_register(
-					struct platform_device *pdev)
+static struct hisi_clock_data *
+hi3798cv200_sysctrl_clk_register(struct platform_device *pdev)
 {
 	return hi3798_sysctrl_clk_register(pdev, &hi3798cv200_sysctrl_clks);
 }



> diff --git a/drivers/clk/hisilicon/crg-hi3798.c b/drivers/clk/hisilicon/crg-hi3798.c
> index 7e9507de2..2f8f14e73 100644
> --- a/drivers/clk/hisilicon/crg-hi3798.c
> +++ b/drivers/clk/hisilicon/crg-hi3798.c
> @@ -59,6 +59,119 @@ static const struct hisi_fixed_rate_clock hi3798_fixed_rate_clks[] = {
>         { HI3798_FIXED_250M, "250m", NULL, 0, 250000000, },
>  };
>  
> +struct hi3798_clks {
> +       const struct hisi_gate_clock *gate_clks;
> +       int gate_clks_nums;
> +       const struct hisi_mux_clock *mux_clks;
> +       int mux_clks_nums;
> +       const struct hisi_phase_clock *phase_clks;
> +       int phase_clks_nums;
> +};
> +
> +static struct hisi_clock_data *hi3798_clk_register(
> +               struct platform_device *pdev, const struct hi3798_clks *clks)
> +{
> +       struct hisi_clock_data *clk_data;
> +       int ret;
> +
> +       clk_data = hisi_clk_alloc(pdev, HI3798_CRG_NR_CLKS);
> +       if (!clk_data)
> +               return ERR_PTR(-ENOMEM);
> +
> +       /* hisi_phase_clock is resource managed */
> +       ret = hisi_clk_register_phase(&pdev->dev, clks->phase_clks,
> +                                     clks->phase_clks_nums, clk_data);
> +       if (ret)
> +               return ERR_PTR(ret);
> +
> +       ret = hisi_clk_register_fixed_rate(hi3798_fixed_rate_clks,
> +                                          ARRAY_SIZE(hi3798_fixed_rate_clks),
> +                                          clk_data);
> +       if (ret)
> +               return ERR_PTR(ret);
> +
> +       ret = hisi_clk_register_mux(clks->mux_clks, clks->mux_clks_nums, clk_data);
> +       if (ret)
> +               goto unregister_fixed_rate;
> +
> +       ret = hisi_clk_register_gate(clks->gate_clks, clks->gate_clks_nums, clk_data);

Please make a follow-up patch that passes the pdev->dev pointer to these
registration functions so they can use devm APIs.

> +       if (ret)
> +               goto unregister_mux;
> +
> +       ret = of_clk_add_provider(pdev->dev.of_node,

Please make a follow-up patch that migrates this to
devm_of_clk_add_hw_provider.

> +                       of_clk_src_onecell_get, &clk_data->clk_data);
> +       if (ret)
> +               goto unregister_gate;
> +