diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2021-06-02 11:54:46 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2021-06-07 12:46:13 +0200 |
commit | f173bcb384dde795641a990dda55893ad78c4548 (patch) | |
tree | 82c23aafb2951e3c7625c6bd068c383f27c67efe /drivers/clk/at91 | |
parent | bf762dc778be9f95dc58d6c80d4b840c2c8a9490 (diff) | |
download | barebox-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/at91')
-rw-r--r-- | drivers/clk/at91/clk-audio-pll.c | 6 | ||||
-rw-r--r-- | drivers/clk/at91/clk-generated.c | 2 | ||||
-rw-r--r-- | drivers/clk/at91/clk-h32mx.c | 2 | ||||
-rw-r--r-- | drivers/clk/at91/clk-i2s-mux.c | 2 | ||||
-rw-r--r-- | drivers/clk/at91/clk-main.c | 8 | ||||
-rw-r--r-- | drivers/clk/at91/clk-master.c | 2 | ||||
-rw-r--r-- | drivers/clk/at91/clk-peripheral.c | 4 | ||||
-rw-r--r-- | drivers/clk/at91/clk-pll.c | 2 | ||||
-rw-r--r-- | drivers/clk/at91/clk-plldiv.c | 2 | ||||
-rw-r--r-- | drivers/clk/at91/clk-programmable.c | 2 | ||||
-rw-r--r-- | drivers/clk/at91/clk-sam9x60-pll.c | 2 | ||||
-rw-r--r-- | drivers/clk/at91/clk-slow.c | 2 | ||||
-rw-r--r-- | drivers/clk/at91/clk-smd.c | 2 | ||||
-rw-r--r-- | drivers/clk/at91/clk-system.c | 2 | ||||
-rw-r--r-- | drivers/clk/at91/clk-usb.c | 6 | ||||
-rw-r--r-- | drivers/clk/at91/clk-utmi.c | 2 | ||||
-rw-r--r-- | drivers/clk/at91/sckc.c | 8 |
17 files changed, 28 insertions, 28 deletions
diff --git a/drivers/clk/at91/clk-audio-pll.c b/drivers/clk/at91/clk-audio-pll.c index 47bff32fe8..25be69ec6f 100644 --- a/drivers/clk/at91/clk-audio-pll.c +++ b/drivers/clk/at91/clk-audio-pll.c @@ -442,7 +442,7 @@ at91_clk_register_audio_pll_frac(struct regmap *regmap, const char *name, frac_ck->regmap = regmap; - ret = clk_register(&frac_ck->clk); + ret = bclk_register(&frac_ck->clk); if (ret) { kfree(frac_ck); return ERR_PTR(ret); @@ -472,7 +472,7 @@ at91_clk_register_audio_pll_pad(struct regmap *regmap, const char *name, apad_ck->regmap = regmap; - ret = clk_register(&apad_ck->clk); + ret = bclk_register(&apad_ck->clk); if (ret) { kfree(apad_ck); return ERR_PTR(ret); @@ -502,7 +502,7 @@ at91_clk_register_audio_pll_pmc(struct regmap *regmap, const char *name, apmc_ck->regmap = regmap; - ret = clk_register(&apmc_ck->clk); + ret = bclk_register(&apmc_ck->clk); if (ret) { kfree(apmc_ck); return ERR_PTR(ret); diff --git a/drivers/clk/at91/clk-generated.c b/drivers/clk/at91/clk-generated.c index 56b800facb..23d193f9dd 100644 --- a/drivers/clk/at91/clk-generated.c +++ b/drivers/clk/at91/clk-generated.c @@ -191,7 +191,7 @@ at91_clk_register_generated(struct regmap *regmap, clk_generated_startup(gck); hw = &gck->hw; - ret = clk_register(&gck->hw); + ret = bclk_register(&gck->hw); if (ret) { kfree(gck); hw = ERR_PTR(ret); diff --git a/drivers/clk/at91/clk-h32mx.c b/drivers/clk/at91/clk-h32mx.c index 6052886cca..1bcd30be75 100644 --- a/drivers/clk/at91/clk-h32mx.c +++ b/drivers/clk/at91/clk-h32mx.c @@ -103,7 +103,7 @@ at91_clk_register_h32mx(struct regmap *regmap, const char *name, h32mxclk->regmap = regmap; - ret = clk_register(&h32mxclk->hw); + ret = bclk_register(&h32mxclk->hw); if (ret) { kfree(h32mxclk); return ERR_PTR(ret); diff --git a/drivers/clk/at91/clk-i2s-mux.c b/drivers/clk/at91/clk-i2s-mux.c index f906007ed5..6e3d1e8f59 100644 --- a/drivers/clk/at91/clk-i2s-mux.c +++ b/drivers/clk/at91/clk-i2s-mux.c @@ -76,7 +76,7 @@ at91_clk_i2s_mux_register(struct regmap *regmap, const char *name, i2s_ck->bus_id = bus_id; i2s_ck->regmap = regmap; - ret = clk_register(&i2s_ck->clk); + ret = bclk_register(&i2s_ck->clk); if (ret) { kfree(i2s_ck); return ERR_PTR(ret); diff --git a/drivers/clk/at91/clk-main.c b/drivers/clk/at91/clk-main.c index 08abb1673b..74c26a1516 100644 --- a/drivers/clk/at91/clk-main.c +++ b/drivers/clk/at91/clk-main.c @@ -154,7 +154,7 @@ at91_clk_register_main_osc(struct regmap *regmap, AT91_PMC_MOSCEN, AT91_PMC_OSCBYPASS | AT91_PMC_KEY); - ret = clk_register(&osc->clk); + ret = bclk_register(&osc->clk); if (ret) { free(osc); return ERR_PTR(ret); @@ -254,7 +254,7 @@ at91_clk_register_main_rc_osc(struct regmap *regmap, osc->regmap = regmap; osc->frequency = frequency; - ret = clk_register(&osc->clk); + ret = bclk_register(&osc->clk); if (ret) { kfree(osc); return ERR_PTR(ret); @@ -347,7 +347,7 @@ at91_clk_register_rm9200_main(struct regmap *regmap, clkmain->clk.num_parents = 1; clkmain->regmap = regmap; - ret = clk_register(&clkmain->clk); + ret = bclk_register(&clkmain->clk); if (ret) { kfree(clkmain); return ERR_PTR(ret); @@ -463,7 +463,7 @@ at91_clk_register_sam9x5_main(struct regmap *regmap, regmap_read(clkmain->regmap, AT91_CKGR_MOR, &status); clkmain->parent = clk_main_parent_select(status); - ret = clk_register(&clkmain->clk); + ret = bclk_register(&clkmain->clk); if (ret) { kfree(clkmain); return ERR_PTR(ret); diff --git a/drivers/clk/at91/clk-master.c b/drivers/clk/at91/clk-master.c index da5e316988..dcdc4fceda 100644 --- a/drivers/clk/at91/clk-master.c +++ b/drivers/clk/at91/clk-master.c @@ -131,7 +131,7 @@ at91_clk_register_master(struct regmap *regmap, master->characteristics = characteristics; master->regmap = regmap; - ret = clk_register(&master->clk); + ret = bclk_register(&master->clk); if (ret) { kfree(master); return ERR_PTR(ret); diff --git a/drivers/clk/at91/clk-peripheral.c b/drivers/clk/at91/clk-peripheral.c index 2b9008eb2c..055c8c3b98 100644 --- a/drivers/clk/at91/clk-peripheral.c +++ b/drivers/clk/at91/clk-peripheral.c @@ -119,7 +119,7 @@ at91_clk_register_peripheral(struct regmap *regmap, const char *name, periph->id = id; periph->regmap = regmap; - ret = clk_register(&periph->clk); + ret = bclk_register(&periph->clk); if (ret) { kfree(periph); return ERR_PTR(ret); @@ -338,7 +338,7 @@ at91_clk_register_sam9x5_peripheral(struct regmap *regmap, periph->layout = layout; periph->range = *range; - ret = clk_register(&periph->clk); + ret = bclk_register(&periph->clk); if (ret) { kfree(periph); return ERR_PTR(ret); diff --git a/drivers/clk/at91/clk-pll.c b/drivers/clk/at91/clk-pll.c index 5cb156e784..04d915706a 100644 --- a/drivers/clk/at91/clk-pll.c +++ b/drivers/clk/at91/clk-pll.c @@ -304,7 +304,7 @@ at91_clk_register_pll(struct regmap *regmap, const char *name, pll->div = PLL_DIV(pllr); pll->mul = PLL_MUL(pllr, layout); - ret = clk_register(&pll->clk); + ret = bclk_register(&pll->clk); if (ret) { kfree(pll); return ERR_PTR(ret); diff --git a/drivers/clk/at91/clk-plldiv.c b/drivers/clk/at91/clk-plldiv.c index 1cbb61bb2c..3a8b0dc9ee 100644 --- a/drivers/clk/at91/clk-plldiv.c +++ b/drivers/clk/at91/clk-plldiv.c @@ -95,7 +95,7 @@ at91_clk_register_plldiv(struct regmap *regmap, const char *name, plldiv->regmap = regmap; - ret = clk_register(&plldiv->clk); + ret = bclk_register(&plldiv->clk); if (ret) { kfree(plldiv); return ERR_PTR(ret); diff --git a/drivers/clk/at91/clk-programmable.c b/drivers/clk/at91/clk-programmable.c index 99a0fa29a3..70a8ca6d93 100644 --- a/drivers/clk/at91/clk-programmable.c +++ b/drivers/clk/at91/clk-programmable.c @@ -156,7 +156,7 @@ at91_clk_register_programmable(struct regmap *regmap, prog->layout = layout; prog->regmap = regmap; - ret = clk_register(&prog->clk); + ret = bclk_register(&prog->clk); if (ret) { kfree(prog); return ERR_PTR(ret); diff --git a/drivers/clk/at91/clk-sam9x60-pll.c b/drivers/clk/at91/clk-sam9x60-pll.c index 9ca77f8722..91c6b62667 100644 --- a/drivers/clk/at91/clk-sam9x60-pll.c +++ b/drivers/clk/at91/clk-sam9x60-pll.c @@ -311,7 +311,7 @@ sam9x60_clk_register_pll(struct regmap *regmap, regmap_read(regmap, PMC_PLL_CTRL1, &pllr); pll->mul = FIELD_GET(PMC_PLL_CTRL1_MUL_MSK, pllr); - ret = clk_register(&pll->clk); + ret = bclk_register(&pll->clk); if (ret) { kfree(pll); return ERR_PTR(ret); diff --git a/drivers/clk/at91/clk-slow.c b/drivers/clk/at91/clk-slow.c index bcce810fa5..1768f0ad5e 100644 --- a/drivers/clk/at91/clk-slow.c +++ b/drivers/clk/at91/clk-slow.c @@ -63,7 +63,7 @@ at91_clk_register_sam9260_slow(struct regmap *regmap, slowck->clk.num_parents = num_parents; slowck->regmap = regmap; - ret = clk_register(&slowck->clk); + ret = bclk_register(&slowck->clk); if (ret) { kfree(slowck); return ERR_PTR(ret); diff --git a/drivers/clk/at91/clk-smd.c b/drivers/clk/at91/clk-smd.c index 366f2eaad5..ad376d03c9 100644 --- a/drivers/clk/at91/clk-smd.c +++ b/drivers/clk/at91/clk-smd.c @@ -127,7 +127,7 @@ at91sam9x5_clk_register_smd(struct regmap *regmap, const char *name, /* init.flags = CLK_SET_RATE_GATE | CLK_SET_PARENT_GATE; */ smd->regmap = regmap; - ret = clk_register(&smd->clk); + ret = bclk_register(&smd->clk); if (ret) { kfree(smd); return ERR_PTR(ret); diff --git a/drivers/clk/at91/clk-system.c b/drivers/clk/at91/clk-system.c index 77f0dff98b..db9d7b3d61 100644 --- a/drivers/clk/at91/clk-system.c +++ b/drivers/clk/at91/clk-system.c @@ -105,7 +105,7 @@ at91_clk_register_system(struct regmap *regmap, const char *name, sys->id = id; sys->regmap = regmap; - ret = clk_register(&sys->clk); + ret = bclk_register(&sys->clk); if (ret) { kfree(sys); return ERR_PTR(ret); diff --git a/drivers/clk/at91/clk-usb.c b/drivers/clk/at91/clk-usb.c index 4ca076e777..d60232f771 100644 --- a/drivers/clk/at91/clk-usb.c +++ b/drivers/clk/at91/clk-usb.c @@ -165,7 +165,7 @@ _at91sam9x5_clk_register_usb(struct regmap *regmap, const char *name, usb->usbs_mask = usbs_mask; usb->num_parents = num_parents; - ret = clk_register(&usb->clk); + ret = bclk_register(&usb->clk); if (ret) { kfree(usb); return ERR_PTR(ret); @@ -206,7 +206,7 @@ at91sam9n12_clk_register_usb(struct regmap *regmap, const char *name, /* init.flags = CLK_SET_RATE_GATE | CLK_SET_RATE_PARENT; */ usb->regmap = regmap; - ret = clk_register(&usb->clk); + ret = bclk_register(&usb->clk); if (ret) { kfree(usb); return ERR_PTR(ret); @@ -321,7 +321,7 @@ at91rm9200_clk_register_usb(struct regmap *regmap, const char *name, usb->regmap = regmap; memcpy(usb->divisors, divisors, sizeof(usb->divisors)); - ret = clk_register(&usb->clk); + ret = bclk_register(&usb->clk); if (ret) { kfree(usb); return ERR_PTR(ret); diff --git a/drivers/clk/at91/clk-utmi.c b/drivers/clk/at91/clk-utmi.c index 3d71cd615f..df3904e5a0 100644 --- a/drivers/clk/at91/clk-utmi.c +++ b/drivers/clk/at91/clk-utmi.c @@ -147,7 +147,7 @@ at91_clk_register_utmi(struct regmap *regmap_pmc, struct regmap *regmap_sfr, utmi->regmap_pmc = regmap_pmc; utmi->regmap_sfr = regmap_sfr; - ret = clk_register(&utmi->clk); + ret = bclk_register(&utmi->clk); if (ret) { kfree(utmi); return ERR_PTR(ret); diff --git a/drivers/clk/at91/sckc.c b/drivers/clk/at91/sckc.c index d9898f718c..bf55589c80 100644 --- a/drivers/clk/at91/sckc.c +++ b/drivers/clk/at91/sckc.c @@ -152,7 +152,7 @@ at91_clk_register_slow_osc(void __iomem *sckcr, writel((readl(sckcr) & ~osc->bits->cr_osc32en) | osc->bits->cr_osc32byp, sckcr); - ret = clk_register(&osc->clk); + ret = bclk_register(&osc->clk); if (ret) { kfree(osc); return ERR_PTR(ret); @@ -237,7 +237,7 @@ at91_clk_register_slow_rc_osc(void __iomem *sckcr, osc->frequency = frequency; osc->startup_usec = startup; - ret = clk_register(&osc->clk); + ret = bclk_register(&osc->clk); if (ret) { kfree(osc); return ERR_PTR(ret); @@ -318,7 +318,7 @@ at91_clk_register_sam9x5_slow(void __iomem *sckcr, slowck->bits = bits; slowck->parent = !!(readl(sckcr) & slowck->bits->cr_oscsel); - ret = clk_register(&slowck->clk); + ret = bclk_register(&slowck->clk); if (ret) { kfree(slowck); return ERR_PTR(ret); @@ -571,7 +571,7 @@ static void __init of_sama5d4_sckc_setup(struct device_node *np) osc->startup_usec = 1200000; osc->bits = &at91sama5d4_bits; - ret = clk_register(&osc->clk); + ret = bclk_register(&osc->clk); if (ret) goto free_slow_osc_data; |