summaryrefslogtreecommitdiffstats
path: root/drivers/clk/socfpga
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2021-06-02 11:54:46 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2021-06-07 12:46:13 +0200
commitf173bcb384dde795641a990dda55893ad78c4548 (patch)
tree82c23aafb2951e3c7625c6bd068c383f27c67efe /drivers/clk/socfpga
parentbf762dc778be9f95dc58d6c80d4b840c2c8a9490 (diff)
downloadbarebox-f173bcb384dde795641a990dda55893ad78c4548.tar.gz
barebox-f173bcb384dde795641a990dda55893ad78c4548.tar.xz
clk: rename clk_register() to bclk_register()
Linux has a clk_register() function with a different semantics than barebox. Rename this function to bclk_register() so that we later can introduce a clk_register() function with the same semantics as Linux. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Reviewed-by: Ahmad Fatoum <a.fatoum@pengutronix.de> Link: https://lore.barebox.org/20210602095507.24609-4-s.hauer@pengutronix.de Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/clk/socfpga')
-rw-r--r--drivers/clk/socfpga/clk-gate-a10.c2
-rw-r--r--drivers/clk/socfpga/clk-periph-a10.c2
-rw-r--r--drivers/clk/socfpga/clk-pll-a10.c2
-rw-r--r--drivers/clk/socfpga/clk.c6
4 files changed, 6 insertions, 6 deletions
diff --git a/drivers/clk/socfpga/clk-gate-a10.c b/drivers/clk/socfpga/clk-gate-a10.c
index 401eb20d24..57459d0e2b 100644
--- a/drivers/clk/socfpga/clk-gate-a10.c
+++ b/drivers/clk/socfpga/clk-gate-a10.c
@@ -171,7 +171,7 @@ static struct clk *__socfpga_gate_init(struct device_node *node,
socfpga_clk->clk.num_parents = i;
socfpga_clk->clk.parent_names = socfpga_clk->parent_names;
- rc = clk_register(&socfpga_clk->clk);
+ rc = bclk_register(&socfpga_clk->clk);
if (rc) {
free(socfpga_clk);
return ERR_PTR(rc);
diff --git a/drivers/clk/socfpga/clk-periph-a10.c b/drivers/clk/socfpga/clk-periph-a10.c
index 4ef00052e4..3fa636d990 100644
--- a/drivers/clk/socfpga/clk-periph-a10.c
+++ b/drivers/clk/socfpga/clk-periph-a10.c
@@ -104,7 +104,7 @@ static struct clk *__socfpga_periph_init(struct device_node *node,
periph_clk->clk.name = xstrdup(clk_name);
periph_clk->clk.ops = ops;
- rc = clk_register(&periph_clk->clk);
+ rc = bclk_register(&periph_clk->clk);
if (rc) {
free(periph_clk);
return ERR_PTR(rc);
diff --git a/drivers/clk/socfpga/clk-pll-a10.c b/drivers/clk/socfpga/clk-pll-a10.c
index fcf31e9ea1..e0c34d8486 100644
--- a/drivers/clk/socfpga/clk-pll-a10.c
+++ b/drivers/clk/socfpga/clk-pll-a10.c
@@ -117,7 +117,7 @@ static struct clk *__socfpga_pll_init(struct device_node *node,
clk_pll_ops.enable = clk_socfpga_enable;
clk_pll_ops.disable = clk_socfpga_disable;
- rc = clk_register(&pll_clk->clk);
+ rc = bclk_register(&pll_clk->clk);
if (rc) {
free(pll_clk);
return NULL;
diff --git a/drivers/clk/socfpga/clk.c b/drivers/clk/socfpga/clk.c
index 09e2039bd5..bdc8023820 100644
--- a/drivers/clk/socfpga/clk.c
+++ b/drivers/clk/socfpga/clk.c
@@ -97,7 +97,7 @@ static struct clk *socfpga_pll_clk(struct device_node *node)
of_property_read_u32(node, "reg", &pll->regofs);
- ret = clk_register(&pll->clk);
+ ret = bclk_register(&pll->clk);
if (ret) {
free(pll);
return ERR_PTR(ret);
@@ -169,7 +169,7 @@ static struct clk *socfpga_periph_clk(struct device_node *node)
of_property_read_u32(node, "reg", &periph->regofs);
of_property_read_u32(node, "fixed-divider", &periph->fixed_div);
- ret = clk_register(&periph->clk);
+ ret = bclk_register(&periph->clk);
if (ret) {
free(periph);
return ERR_PTR(ret);
@@ -356,7 +356,7 @@ static struct clk *socfpga_gate_clk(struct device_node *node)
cs->clk.name = xstrdup(node->name);
cs->clk.ops = &clk_socfpga_ops;
- ret = clk_register(&cs->clk);
+ ret = bclk_register(&cs->clk);
if (ret) {
free(cs);
return ERR_PTR(ret);