evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

clock: redefine variable clocks_per_pll as a struct member

Browse source 
redefine variable clocks_per_pll as a struct member

If there are multiple PLL clock nodes, this variable will
get overwritten. Redefining it as a struct member can avoid that.

Signed-off-by: Tang Yuantian <Yuantian.Tang@freescale.com>
Signed-off-by: Michael Turquette <mturquette@linaro.org>
This commit is contained in:
Tang Yuantian 2015-01-15 14:03:40 +08:00 • committed by Michael Turquette
parent 1114428312
commit 57bfd7ee6f
1 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
drivers/clk/clk-ppc-corenet.c
View file

@ -19,6 +19,7 @@
struct cmux_clk { struct cmux_clk {
struct clk_hw hw; struct clk_hw hw;
void __iomem *reg; void __iomem *reg;
unsigned int clk_per_pll;
u32 flags; u32 flags;
}; };
@ -27,14 +28,12 @@ struct cmux_clk {
#define CLKSEL_ADJUST BIT(0) #define CLKSEL_ADJUST BIT(0)
#define to_cmux_clk(p) container_of(p, struct cmux_clk, hw) #define to_cmux_clk(p) container_of(p, struct cmux_clk, hw)
static unsigned int clocks_per_pll;
static int cmux_set_parent(struct clk_hw *hw, u8 idx) static int cmux_set_parent(struct clk_hw *hw, u8 idx)
{ {
struct cmux_clk *clk = to_cmux_clk(hw); struct cmux_clk *clk = to_cmux_clk(hw);
u32 clksel; u32 clksel;
clksel = ((idx / clocks_per_pll) << 2) + idx % clocks_per_pll; clksel = ((idx / clk->clk_per_pll) << 2) + idx % clk->clk_per_pll;
if (clk->flags & CLKSEL_ADJUST) if (clk->flags & CLKSEL_ADJUST)
clksel += 8; clksel += 8;
clksel = (clksel & 0xf) << CLKSEL_SHIFT; clksel = (clksel & 0xf) << CLKSEL_SHIFT;
@ -52,7 +51,7 @@ static u8 cmux_get_parent(struct clk_hw *hw)
clksel = (clksel >> CLKSEL_SHIFT) & 0xf; clksel = (clksel >> CLKSEL_SHIFT) & 0xf;
if (clk->flags & CLKSEL_ADJUST) if (clk->flags & CLKSEL_ADJUST)
clksel -= 8; clksel -= 8;
clksel = (clksel >> 2) * clocks_per_pll + clksel % 4; clksel = (clksel >> 2) * clk->clk_per_pll + clksel % 4;
return clksel; return clksel;
} }
@ -72,6 +71,7 @@ static void __init core_mux_init(struct device_node *np)
u32 offset; u32 offset;
const char *clk_name; const char *clk_name;
const char **parent_names; const char **parent_names;
struct of_phandle_args clkspec;
rc = of_property_read_u32(np, "reg", &offset); rc = of_property_read_u32(np, "reg", &offset);
if (rc) { if (rc) {
@ -105,6 +105,17 @@ static void __init core_mux_init(struct device_node *np)
goto err_clk; goto err_clk;
} }
rc = of_parse_phandle_with_args(np, "clocks", "#clock-cells", 0,
&clkspec);
if (rc) {
pr_err("%s: parse clock node error\n", __func__);
goto err_clk;
}
cmux_clk->clk_per_pll = of_property_count_strings(clkspec.np,
"clock-output-names");
of_node_put(clkspec.np);
node = of_find_compatible_node(NULL, NULL, "fsl,p4080-clockgen"); node = of_find_compatible_node(NULL, NULL, "fsl,p4080-clockgen");
if (node && (offset >= 0x80)) if (node && (offset >= 0x80))
cmux_clk->flags = CLKSEL_ADJUST; cmux_clk->flags = CLKSEL_ADJUST;
@ -181,9 +192,6 @@ static void __init core_pll_init(struct device_node *np)
goto err_map; goto err_map;
} }
/* output clock number per PLL */
clocks_per_pll = count;
subclks = kzalloc(sizeof(struct clk *) * count, GFP_KERNEL); subclks = kzalloc(sizeof(struct clk *) * count, GFP_KERNEL);
if (!subclks) { if (!subclks) {
pr_err("%s: could not allocate subclks\n", __func__); pr_err("%s: could not allocate subclks\n", __func__);