Skip to content

Commit

Permalink
clk: at91: audio-pll: separate registration from DT parsing
Browse files Browse the repository at this point in the history 
Separate registration out of of_sama5d2_clk_audio_pll*_setup to allow other
code to use it.

Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
[sboyd@kernel.org: Include pmc.h]
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
  • Loading branch information
Alexandre Belloni authored and Stephen Boyd committed Oct 17, 2018
1 parent 61170a9 commit 08979ee
Showing 1 changed file with 111 additions and 38 deletions.
149 changes: 111 additions & 38 deletions drivers/clk/at91/clk-audio-pll.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@
#include <linux/regmap.h>
#include <linux/slab.h>

#include "pmc.h"

#define AUDIO_PLL_DIV_FRAC BIT(22)
#define AUDIO_PLL_ND_MAX (AT91_PMC_AUDIO_PLL_ND_MASK >> \
AT91_PMC_AUDIO_PLL_ND_OFFSET)
Expand Down Expand Up @@ -444,85 +446,156 @@ static const struct clk_ops audio_pll_pmc_ops = {
.set_rate = clk_audio_pll_pmc_set_rate,
};

static int of_sama5d2_clk_audio_pll_setup(struct device_node *np,
struct clk_init_data *init,
struct clk_hw *hw,
struct regmap **clk_audio_regmap)
struct clk_hw * __init
at91_clk_register_audio_pll_frac(struct regmap *regmap, const char *name,
const char *parent_name)
{
struct regmap *regmap;
const char *parent_names[1];
struct clk_audio_frac *frac_ck;
struct clk_init_data init = {};
int ret;

regmap = syscon_node_to_regmap(of_get_parent(np));
if (IS_ERR(regmap))
return PTR_ERR(regmap);
frac_ck = kzalloc(sizeof(*frac_ck), GFP_KERNEL);
if (!frac_ck)
return ERR_PTR(-ENOMEM);

init->name = np->name;
of_clk_parent_fill(np, parent_names, 1);
init->parent_names = parent_names;
init->num_parents = 1;
init.name = name;
init.ops = &audio_pll_frac_ops;
init.parent_names = &parent_name;
init.num_parents = 1;
init.flags = CLK_SET_RATE_GATE;

hw->init = init;
*clk_audio_regmap = regmap;
frac_ck->hw.init = &init;
frac_ck->regmap = regmap;

ret = clk_hw_register(NULL, hw);
if (ret)
return ret;
ret = clk_hw_register(NULL, &frac_ck->hw);
if (ret) {
kfree(frac_ck);
return ERR_PTR(ret);
}

return of_clk_add_hw_provider(np, of_clk_hw_simple_get, hw);
return &frac_ck->hw;
}

static void __init of_sama5d2_clk_audio_pll_frac_setup(struct device_node *np)
{
struct clk_audio_frac *frac_ck;
struct clk_init_data init = {};
struct clk_hw *hw;
const char *name = np->name;
const char *parent_name;
struct regmap *regmap;

frac_ck = kzalloc(sizeof(*frac_ck), GFP_KERNEL);
if (!frac_ck)
regmap = syscon_node_to_regmap(of_get_parent(np));
if (IS_ERR(regmap))
return;

init.ops = &audio_pll_frac_ops;
init.flags = CLK_SET_RATE_GATE;
parent_name = of_clk_get_parent_name(np, 0);

if (of_sama5d2_clk_audio_pll_setup(np, &init, &frac_ck->hw,
&frac_ck->regmap))
kfree(frac_ck);
hw = at91_clk_register_audio_pll_frac(regmap, name, parent_name);
if (IS_ERR(hw))
return;

of_clk_add_hw_provider(np, of_clk_hw_simple_get, hw);
}

static void __init of_sama5d2_clk_audio_pll_pad_setup(struct device_node *np)
struct clk_hw * __init
at91_clk_register_audio_pll_pad(struct regmap *regmap, const char *name,
const char *parent_name)
{
struct clk_audio_pad *apad_ck;
struct clk_init_data init = {};
struct clk_init_data init;
int ret;

apad_ck = kzalloc(sizeof(*apad_ck), GFP_KERNEL);
if (!apad_ck)
return;
return ERR_PTR(-ENOMEM);

init.name = name;
init.ops = &audio_pll_pad_ops;
init.parent_names = &parent_name;
init.num_parents = 1;
init.flags = CLK_SET_RATE_GATE | CLK_SET_PARENT_GATE |
CLK_SET_RATE_PARENT;

if (of_sama5d2_clk_audio_pll_setup(np, &init, &apad_ck->hw,
&apad_ck->regmap))
apad_ck->hw.init = &init;
apad_ck->regmap = regmap;

ret = clk_hw_register(NULL, &apad_ck->hw);
if (ret) {
kfree(apad_ck);
return ERR_PTR(ret);
}

return &apad_ck->hw;
}

static void __init of_sama5d2_clk_audio_pll_pmc_setup(struct device_node *np)
static void __init of_sama5d2_clk_audio_pll_pad_setup(struct device_node *np)
{
struct clk_hw *hw;
const char *name = np->name;
const char *parent_name;
struct regmap *regmap;

regmap = syscon_node_to_regmap(of_get_parent(np));
if (IS_ERR(regmap))
return;

parent_name = of_clk_get_parent_name(np, 0);

hw = at91_clk_register_audio_pll_pad(regmap, name, parent_name);
if (IS_ERR(hw))
return;

of_clk_add_hw_provider(np, of_clk_hw_simple_get, hw);
}

struct clk_hw * __init
at91_clk_register_audio_pll_pmc(struct regmap *regmap, const char *name,
const char *parent_name)
{
struct clk_audio_pmc *apmc_ck;
struct clk_init_data init = {};
struct clk_init_data init;
int ret;

apmc_ck = kzalloc(sizeof(*apmc_ck), GFP_KERNEL);
if (!apmc_ck)
return;
return ERR_PTR(-ENOMEM);

init.name = name;
init.ops = &audio_pll_pmc_ops;
init.parent_names = &parent_name;
init.num_parents = 1;
init.flags = CLK_SET_RATE_GATE | CLK_SET_PARENT_GATE |
CLK_SET_RATE_PARENT;

if (of_sama5d2_clk_audio_pll_setup(np, &init, &apmc_ck->hw,
&apmc_ck->regmap))
apmc_ck->hw.init = &init;
apmc_ck->regmap = regmap;

ret = clk_hw_register(NULL, &apmc_ck->hw);
if (ret) {
kfree(apmc_ck);
return ERR_PTR(ret);
}

return &apmc_ck->hw;
}

static void __init of_sama5d2_clk_audio_pll_pmc_setup(struct device_node *np)
{
struct clk_hw *hw;
const char *name = np->name;
const char *parent_name;
struct regmap *regmap;

regmap = syscon_node_to_regmap(of_get_parent(np));
if (IS_ERR(regmap))
return;

parent_name = of_clk_get_parent_name(np, 0);

hw = at91_clk_register_audio_pll_pmc(regmap, name, parent_name);
if (IS_ERR(hw))
return;

of_clk_add_hw_provider(np, of_clk_hw_simple_get, hw);
}

CLK_OF_DECLARE(of_sama5d2_clk_audio_pll_frac_setup,
Expand Down

0 comments on commit 08979ee

Please sign in to comment.