aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/clk/sunxi
diff options
context:
space:
mode:
authorChen-Yu Tsai <wens@csie.org>2014-02-02 20:51:40 -0500
committerEmilio López <emilio@elopez.com.ar>2014-02-02 22:24:33 -0500
commit97e36b3ce3106988b82e1ca53b1d1c872bde855a (patch)
tree98701fe174677daf598fb4b699214b8284bbf3bb /drivers/clk/sunxi
parent667f542db542fddc62d1299b17451d7cae84f6e1 (diff)
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 <wens@csie.org> Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com> Acked-by: Mike Turquette <mturquette@linaro.org> Signed-off-by: Emilio López <emilio@elopez.com.ar>
Diffstat (limited to 'drivers/clk/sunxi')
-rw-r--r--drivers/clk/sunxi/clk-sunxi.c3
1 files changed, 2 insertions, 1 deletions
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,
869 struct divs_data *data) 869 struct divs_data *data)
870{ 870{
871 struct clk_onecell_data *clk_data; 871 struct clk_onecell_data *clk_data;
872 const char *parent = node->name; 872 const char *parent;
873 const char *clk_name; 873 const char *clk_name;
874 struct clk **clks, *pclk; 874 struct clk **clks, *pclk;
875 struct clk_hw *gate_hw, *rate_hw; 875 struct clk_hw *gate_hw, *rate_hw;
@@ -883,6 +883,7 @@ static void __init sunxi_divs_clk_setup(struct device_node *node,
883 883
884 /* Set up factor clock that we will be dividing */ 884 /* Set up factor clock that we will be dividing */
885 pclk = sunxi_factors_clk_setup(node, data->factors); 885 pclk = sunxi_factors_clk_setup(node, data->factors);
886 parent = __clk_get_name(pclk);
886 887
887 reg = of_iomap(node, 0); 888 reg = of_iomap(node, 0);
888 889