2020-09-03 06:33:19

by zhangqing

Subject: [PATCH v2 4/6] clk: rockchip: Export some clock common APIs for module drivers

This is used by the Rockchip clk driver, export it to allow that
driver to be compiled as a module.

Signed-off-by: Elaine Zhang <[email protected]>
---
drivers/clk/rockchip/clk.c | 52 ++++++++++++++++++++++----------------
1 file changed, 30 insertions(+), 22 deletions(-)

diff --git a/drivers/clk/rockchip/clk.c b/drivers/clk/rockchip/clk.c
index b51f320e5733..b7664224e64a 100644
--- a/drivers/clk/rockchip/clk.c
+++ b/drivers/clk/rockchip/clk.c
@@ -359,8 +359,9 @@ static struct clk *rockchip_clk_register_factor_branch(const char *name,
return hw->clk;
}

-struct rockchip_clk_provider * __init rockchip_clk_init(struct device_node *np,
- void __iomem *base, unsigned long nr_clks)
+struct rockchip_clk_provider *rockchip_clk_init(struct device_node *np,
+ void __iomem *base,
+ unsigned long nr_clks)
{
struct rockchip_clk_provider *ctx;
struct clk **clk_table;
@@ -392,14 +393,16 @@ struct rockchip_clk_provider * __init rockchip_clk_init(struct device_node *np,
kfree(ctx);
return ERR_PTR(-ENOMEM);
}
+EXPORT_SYMBOL(rockchip_clk_init);

-void __init rockchip_clk_of_add_provider(struct device_node *np,
- struct rockchip_clk_provider *ctx)
+void rockchip_clk_of_add_provider(struct device_node *np,
+ struct rockchip_clk_provider *ctx)
{
if (of_clk_add_provider(np, of_clk_src_onecell_get,
&ctx->clk_data))
pr_err("%s: could not register clk provider\n", __func__);
}
+EXPORT_SYMBOL(rockchip_clk_of_add_provider);

void rockchip_clk_add_lookup(struct rockchip_clk_provider *ctx,
struct clk *clk, unsigned int id)
@@ -407,8 +410,9 @@ void rockchip_clk_add_lookup(struct rockchip_clk_provider *ctx,
if (ctx->clk_data.clks && id)
ctx->clk_data.clks[id] = clk;
}
+EXPORT_SYMBOL(rockchip_clk_add_lookup);

-void __init rockchip_clk_register_plls(struct rockchip_clk_provider *ctx,
+void rockchip_clk_register_plls(struct rockchip_clk_provider *ctx,
struct rockchip_pll_clock *list,
unsigned int nr_pll, int grf_lock_offset)
{
@@ -431,11 +435,11 @@ void __init rockchip_clk_register_plls(struct rockchip_clk_provider *ctx,
rockchip_clk_add_lookup(ctx, clk, list->id);
}
}
+EXPORT_SYMBOL(rockchip_clk_register_plls);

-void __init rockchip_clk_register_branches(
- struct rockchip_clk_provider *ctx,
- struct rockchip_clk_branch *list,
- unsigned int nr_clk)
+void rockchip_clk_register_branches(struct rockchip_clk_provider *ctx,
+ struct rockchip_clk_branch *list,
+ unsigned int nr_clk)
{
struct clk *clk = NULL;
unsigned int idx;
@@ -564,14 +568,15 @@ void __init rockchip_clk_register_branches(
rockchip_clk_add_lookup(ctx, clk, list->id);
}
}
-
-void __init rockchip_clk_register_armclk(struct rockchip_clk_provider *ctx,
- unsigned int lookup_id,
- const char *name, const char *const *parent_names,
- u8 num_parents,
- const struct rockchip_cpuclk_reg_data *reg_data,
- const struct rockchip_cpuclk_rate_table *rates,
- int nrates)
+EXPORT_SYMBOL(rockchip_clk_register_branches);
+
+void rockchip_clk_register_armclk(struct rockchip_clk_provider *ctx,
+ unsigned int lookup_id,
+ const char *name, const char *const *parent_names,
+ u8 num_parents,
+ const struct rockchip_cpuclk_reg_data *reg_data,
+ const struct rockchip_cpuclk_rate_table *rates,
+ int nrates)
{
struct clk *clk;

@@ -586,9 +591,10 @@ void __init rockchip_clk_register_armclk(struct rockchip_clk_provider *ctx,

rockchip_clk_add_lookup(ctx, clk, lookup_id);
}
+EXPORT_SYMBOL(rockchip_clk_register_armclk);

-void __init rockchip_clk_protect_critical(const char *const clocks[],
- int nclocks)
+void rockchip_clk_protect_critical(const char *const clocks[],
+ int nclocks)
{
int i;

@@ -600,6 +606,7 @@ void __init rockchip_clk_protect_critical(const char *const clocks[],
clk_prepare_enable(clk);
}
}
+EXPORT_SYMBOL(rockchip_clk_protect_critical);

static void __iomem *rst_base;
static unsigned int reg_restart;
@@ -619,10 +626,10 @@ static struct notifier_block rockchip_restart_handler = {
.priority = 128,
};

-void __init
+void
rockchip_register_restart_notifier(struct rockchip_clk_provider *ctx,
- unsigned int reg,
- void (*cb)(void))
+ unsigned int reg,
+ void (*cb)(void))
{
int ret;

@@ -634,3 +641,4 @@ rockchip_register_restart_notifier(struct rockchip_clk_provider *ctx,
pr_err("%s: cannot register restart handler, %d\n",
__func__, ret);
}
+EXPORT_SYMBOL(rockchip_register_restart_notifier);
--
2.17.1

2020-09-03 10:11:09

by Kever Yang

Subject: Re: [PATCH v2 4/6] clk: rockchip: Export some clock common APIs for module drivers

On 2020/9/3 下午2:31, Elaine Zhang wrote:
> This is used by the Rockchip clk driver, export it to allow that
> driver to be compiled as a module.
>
> Signed-off-by: Elaine Zhang <[email protected]>
> ---
> drivers/clk/rockchip/clk.c | 52 ++++++++++++++++++++++----------------
> 1 file changed, 30 insertions(+), 22 deletions(-)
>
> diff --git a/drivers/clk/rockchip/clk.c b/drivers/clk/rockchip/clk.c
> index b51f320e5733..b7664224e64a 100644
> --- a/drivers/clk/rockchip/clk.c
> +++ b/drivers/clk/rockchip/clk.c
> @@ -359,8 +359,9 @@ static struct clk *rockchip_clk_register_factor_branch(const char *name,
> return hw->clk;
> }
>
> -struct rockchip_clk_provider * __init rockchip_clk_init(struct device_node *np,
> - void __iomem *base, unsigned long nr_clks)
> +struct rockchip_clk_provider *rockchip_clk_init(struct device_node *np,
> + void __iomem *base,
> + unsigned long nr_clks)
> {
> struct rockchip_clk_provider *ctx;
> struct clk **clk_table;
> @@ -392,14 +393,16 @@ struct rockchip_clk_provider * __init rockchip_clk_init(struct device_node *np,
> kfree(ctx);
> return ERR_PTR(-ENOMEM);
> }
> +EXPORT_SYMBOL(rockchip_clk_init);
>
> -void __init rockchip_clk_of_add_provider(struct device_node *np,
> - struct rockchip_clk_provider *ctx)
> +void rockchip_clk_of_add_provider(struct device_node *np,
> + struct rockchip_clk_provider *ctx)
> {
> if (of_clk_add_provider(np, of_clk_src_onecell_get,
> &ctx->clk_data))
> pr_err("%s: could not register clk provider\n", __func__);
> }
> +EXPORT_SYMBOL(rockchip_clk_of_add_provider);
>
> void rockchip_clk_add_lookup(struct rockchip_clk_provider *ctx,
> struct clk *clk, unsigned int id)
> @@ -407,8 +410,9 @@ void rockchip_clk_add_lookup(struct rockchip_clk_provider *ctx,
> if (ctx->clk_data.clks && id)
> ctx->clk_data.clks[id] = clk;
> }
> +EXPORT_SYMBOL(rockchip_clk_add_lookup);
>
> -void __init rockchip_clk_register_plls(struct rockchip_clk_provider *ctx,
> +void rockchip_clk_register_plls(struct rockchip_clk_provider *ctx,
> struct rockchip_pll_clock *list,
> unsigned int nr_pll, int grf_lock_offset)
> {
> @@ -431,11 +435,11 @@ void __init rockchip_clk_register_plls(struct rockchip_clk_provider *ctx,
> rockchip_clk_add_lookup(ctx, clk, list->id);
> }
> }
> +EXPORT_SYMBOL(rockchip_clk_register_plls);
>
> -void __init rockchip_clk_register_branches(
> - struct rockchip_clk_provider *ctx,
> - struct rockchip_clk_branch *list,
> - unsigned int nr_clk)
> +void rockchip_clk_register_branches(struct rockchip_clk_provider *ctx,
> + struct rockchip_clk_branch *list,
> + unsigned int nr_clk)
> {
> struct clk *clk = NULL;
> unsigned int idx;
> @@ -564,14 +568,15 @@ void __init rockchip_clk_register_branches(
> rockchip_clk_add_lookup(ctx, clk, list->id);
> }
> }
> -
> -void __init rockchip_clk_register_armclk(struct rockchip_clk_provider *ctx,
> - unsigned int lookup_id,
> - const char *name, const char *const *parent_names,
> - u8 num_parents,
> - const struct rockchip_cpuclk_reg_data *reg_data,
> - const struct rockchip_cpuclk_rate_table *rates,
> - int nrates)
> +EXPORT_SYMBOL(rockchip_clk_register_branches);
> +
> +void rockchip_clk_register_armclk(struct rockchip_clk_provider *ctx,
> + unsigned int lookup_id,
> + const char *name, const char *const *parent_names,
> + u8 num_parents,
> + const struct rockchip_cpuclk_reg_data *reg_data,
> + const struct rockchip_cpuclk_rate_table *rates,
> + int nrates)
> {
> struct clk *clk;
>
> @@ -586,9 +591,10 @@ void __init rockchip_clk_register_armclk(struct rockchip_clk_provider *ctx,
>
> rockchip_clk_add_lookup(ctx, clk, lookup_id);
> }
> +EXPORT_SYMBOL(rockchip_clk_register_armclk);
>
> -void __init rockchip_clk_protect_critical(const char *const clocks[],
> - int nclocks)
> +void rockchip_clk_protect_critical(const char *const clocks[],
> + int nclocks)
> {
> int i;
>
> @@ -600,6 +606,7 @@ void __init rockchip_clk_protect_critical(const char *const clocks[],
> clk_prepare_enable(clk);
> }
> }
> +EXPORT_SYMBOL(rockchip_clk_protect_critical);
>
> static void __iomem *rst_base;
> static unsigned int reg_restart;
> @@ -619,10 +626,10 @@ static struct notifier_block rockchip_restart_handler = {
> .priority = 128,
> };
>
> -void __init
> +void
> rockchip_register_restart_notifier(struct rockchip_clk_provider *ctx,
> - unsigned int reg,
> - void (*cb)(void))
> + unsigned int reg,
> + void (*cb)(void))
> {
> int ret;
>
> @@ -634,3 +641,4 @@ rockchip_register_restart_notifier(struct rockchip_clk_provider *ctx,
> pr_err("%s: cannot register restart handler, %d\n",
> __func__, ret);
> }
> +EXPORT_SYMBOL(rockchip_register_restart_notifier);


This looks good to me, so

Reviewed-by: Kever Yang <[email protected]>

Thanks,

- Kever