diff options
| author | Michael Turquette <mturquette@baylibre.com> | 2015-06-20 13:29:48 -0700 |
|---|---|---|
| committer | Michael Turquette <mturquette@baylibre.com> | 2015-06-20 13:29:48 -0700 |
| commit | 2cd7b0432888ef2e1f8b54c1c6f8751e1e0e9b5e (patch) | |
| tree | 8ecab6ac6ef54b4ccc7b93a6a079e72a6ff7d640 /drivers/clk/clk.c | |
| parent | 85e88fab134d8896cf4d8be0aac10cc54018ee63 (diff) | |
| parent | 36b7be6d3ea8f434f1e0723f3fb0e85c3e00ebc2 (diff) | |
Merge tag 'tegra-for-4.2-clk' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into clk-next
clk: tegra: Changes for v4.2-rc1
This contains the EMC clock driver that's been exhaustively reviewed and
tested. It also includes a change to the clock core that allows a clock
provider to perform low-level reparenting of clocks. This is required by
the EMC clock driver because the reparenting needs to be done at a very
specific point in time during the EMC frequency switch.
Diffstat (limited to 'drivers/clk/clk.c')
| -rw-r--r-- | drivers/clk/clk.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c index 059e5d25c9ba..ddb4b541016f 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c @@ -1660,6 +1660,14 @@ static void clk_core_reparent(struct clk_core *core, __clk_recalc_rates(core, POST_RATE_CHANGE); } +void clk_hw_reparent(struct clk_hw *hw, struct clk_hw *new_parent) +{ + if (!hw) + return; + + clk_core_reparent(hw->core, !new_parent ? NULL : new_parent->core); +} + /** * clk_has_parent - check if a clock is a possible parent for another * @clk: clock source |