diff options
| author | Tony Lindgren <tony@atomide.com> | 2018-02-14 08:27:41 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2018-02-14 08:27:41 -0800 |
| commit | 60c99c7749f2a86e8891b003496fa8f6e985b8b5 (patch) | |
| tree | 667db4fb327abd7d077797e0fb616a6592738d89 /arch/arm | |
| parent | 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 (diff) | |
| parent | 392ea5dd0ff265f7557405fcbdf35acd34cf4ab8 (diff) | |
Merge branch 'omap-for-v4.16/soc' into omap-for-v4.16/fixes
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-omap2/omap_hwmod.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c index 124f9af34a15..34156eca8e23 100644 --- a/arch/arm/mach-omap2/omap_hwmod.c +++ b/arch/arm/mach-omap2/omap_hwmod.c @@ -977,6 +977,9 @@ static int _enable_clocks(struct omap_hwmod *oh) pr_debug("omap_hwmod: %s: enabling clocks\n", oh->name); + if (oh->flags & HWMOD_OPT_CLKS_NEEDED) + _enable_optional_clocks(oh); + if (oh->_clk) clk_enable(oh->_clk); @@ -985,9 +988,6 @@ static int _enable_clocks(struct omap_hwmod *oh) clk_enable(os->_clk); } - if (oh->flags & HWMOD_OPT_CLKS_NEEDED) - _enable_optional_clocks(oh); - /* The opt clocks are controlled by the device driver. */ return 0; |