diff options
author | Stephen Boyd <sboyd@codeaurora.org> | 2016-11-16 22:15:58 +0300 |
---|---|---|
committer | Stephen Boyd <sboyd@codeaurora.org> | 2016-11-16 22:15:58 +0300 |
commit | 977f0ab0581d61b2b46cc08857818c425cd24f55 (patch) | |
tree | bb096d90acab001d80bd88b2f0cfbe30789447d6 /drivers/clk/berlin/bg2q.c | |
parent | 9a881bc55d7b2cb4093005391613a2c517f09516 (diff) | |
parent | c8616671af913ed2c5fb5b45f09c28599458ba1a (diff) | |
download | linux-977f0ab0581d61b2b46cc08857818c425cd24f55.tar.xz |
Merge branch 'clk-fixes' into clk-next
* clk-fixes:
clk: efm32gg: Pass correct type to hw provider registration
clk: berlin: Pass correct type to hw provider registration
clk: sunxi: Fix M factor computation for APB1
clk: sunxi-ng: sun6i-a31: Force AHB1 clock to use PLL6 as parent
Diffstat (limited to 'drivers/clk/berlin/bg2q.c')
-rw-r--r-- | drivers/clk/berlin/bg2q.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/berlin/bg2q.c b/drivers/clk/berlin/bg2q.c index 0718e831475f..3b784b593afd 100644 --- a/drivers/clk/berlin/bg2q.c +++ b/drivers/clk/berlin/bg2q.c @@ -382,7 +382,7 @@ static void __init berlin2q_clock_setup(struct device_node *np) } /* register clk-provider */ - of_clk_add_hw_provider(np, of_clk_hw_onecell_get, &clk_data); + of_clk_add_hw_provider(np, of_clk_hw_onecell_get, clk_data); return; |