From: Chen-Yu Tsai Date: Mon, 3 Feb 2014 01:51:40 +0000 (+0800) Subject: clk: sunxi: get divs parent clock name from parent factor clock X-Git-Tag: Ubuntu-5.2.0-15.16~13700^2~36^2~5 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=97e36b3ce3106988b82e1ca53b1d1c872bde855a;p=mirror_ubuntu-eoan-kernel.git clk: sunxi: get divs parent clock name from parent factor clock Divs clocks consist of a parent factor clock with multiple outputs, and seperate clocks for each output. Get the name of the parent clock from the parent factor clock, instead of the DT node name. Signed-off-by: Chen-Yu Tsai Acked-by: Maxime Ripard Acked-by: Mike Turquette Signed-off-by: Emilio López --- diff --git a/drivers/clk/sunxi/clk-sunxi.c b/drivers/clk/sunxi/clk-sunxi.c index 7a2ed98c353e..736fb604bfbc 100644 --- a/drivers/clk/sunxi/clk-sunxi.c +++ b/drivers/clk/sunxi/clk-sunxi.c @@ -869,7 +869,7 @@ static void __init sunxi_divs_clk_setup(struct device_node *node, struct divs_data *data) { struct clk_onecell_data *clk_data; - const char *parent = node->name; + const char *parent; const char *clk_name; struct clk **clks, *pclk; struct clk_hw *gate_hw, *rate_hw; @@ -883,6 +883,7 @@ static void __init sunxi_divs_clk_setup(struct device_node *node, /* Set up factor clock that we will be dividing */ pclk = sunxi_factors_clk_setup(node, data->factors); + parent = __clk_get_name(pclk); reg = of_iomap(node, 0);