clk: sunxi: make use of of_clk_parent_fill helper function
Use of_clk_parent_fill to fill in the parent clock names' array. Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com> Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com> Cc: "Emilio López" <emilio@elopez.com.ar> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
This commit is contained in:
Родитель
0b4e7f0842
Коммит
8a53fb2bce
|
@ -80,9 +80,7 @@ static void __init sun7i_a20_gmac_clk_setup(struct device_node *node)
|
|||
goto free_mux;
|
||||
|
||||
/* gmac clock requires exactly 2 parents */
|
||||
parents[0] = of_clk_get_parent_name(node, 0);
|
||||
parents[1] = of_clk_get_parent_name(node, 1);
|
||||
if (!parents[0] || !parents[1])
|
||||
if (of_clk_parent_fill(node, parents, 2) != 2)
|
||||
goto free_gate;
|
||||
|
||||
reg = of_iomap(node, 0);
|
||||
|
|
|
@ -175,9 +175,7 @@ struct clk *sunxi_factors_register(struct device_node *node,
|
|||
int i = 0;
|
||||
|
||||
/* if we have a mux, we will have >1 parents */
|
||||
while (i < FACTORS_MAX_PARENTS &&
|
||||
(parents[i] = of_clk_get_parent_name(node, i)) != NULL)
|
||||
i++;
|
||||
i = of_clk_parent_fill(node, parents, FACTORS_MAX_PARENTS);
|
||||
|
||||
/*
|
||||
* some factor clocks, such as pll5 and pll6, may have multiple
|
||||
|
|
|
@ -182,7 +182,6 @@ static int sun6i_a31_ar100_clk_probe(struct platform_device *pdev)
|
|||
struct resource *r;
|
||||
struct clk *clk;
|
||||
int nparents;
|
||||
int i;
|
||||
|
||||
ar100 = devm_kzalloc(&pdev->dev, sizeof(*ar100), GFP_KERNEL);
|
||||
if (!ar100)
|
||||
|
@ -197,8 +196,7 @@ static int sun6i_a31_ar100_clk_probe(struct platform_device *pdev)
|
|||
if (nparents > SUN6I_AR100_MAX_PARENTS)
|
||||
nparents = SUN6I_AR100_MAX_PARENTS;
|
||||
|
||||
for (i = 0; i < nparents; i++)
|
||||
parents[i] = of_clk_get_parent_name(np, i);
|
||||
of_clk_parent_fill(np, parents, nparents);
|
||||
|
||||
of_property_read_string(np, "clock-output-names", &clk_name);
|
||||
|
||||
|
|
|
@ -195,17 +195,14 @@ static void __init sun6i_ahb1_clk_setup(struct device_node *node)
|
|||
const char *clk_name = node->name;
|
||||
const char *parents[SUN6I_AHB1_MAX_PARENTS];
|
||||
void __iomem *reg;
|
||||
int i = 0;
|
||||
int i;
|
||||
|
||||
reg = of_io_request_and_map(node, 0, of_node_full_name(node));
|
||||
if (IS_ERR(reg))
|
||||
return;
|
||||
|
||||
/* we have a mux, we will have >1 parents */
|
||||
while (i < SUN6I_AHB1_MAX_PARENTS &&
|
||||
(parents[i] = of_clk_get_parent_name(node, i)) != NULL)
|
||||
i++;
|
||||
|
||||
i = of_clk_parent_fill(node, parents, SUN6I_AHB1_MAX_PARENTS);
|
||||
of_property_read_string(node, "clock-output-names", &clk_name);
|
||||
|
||||
ahb1 = kzalloc(sizeof(struct sun6i_ahb1_clk), GFP_KERNEL);
|
||||
|
@ -786,14 +783,11 @@ static void __init sunxi_mux_clk_setup(struct device_node *node,
|
|||
const char *clk_name = node->name;
|
||||
const char *parents[SUNXI_MAX_PARENTS];
|
||||
void __iomem *reg;
|
||||
int i = 0;
|
||||
int i;
|
||||
|
||||
reg = of_iomap(node, 0);
|
||||
|
||||
while (i < SUNXI_MAX_PARENTS &&
|
||||
(parents[i] = of_clk_get_parent_name(node, i)) != NULL)
|
||||
i++;
|
||||
|
||||
i = of_clk_parent_fill(node, parents, SUNXI_MAX_PARENTS);
|
||||
of_property_read_string(node, "clock-output-names", &clk_name);
|
||||
|
||||
clk = clk_register_mux(NULL, clk_name, parents, i,
|
||||
|
|
Загрузка…
Ссылка в новой задаче