GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-21 14:11:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'omap-for-v4.16/soc' into omap-for-v4.16/fixes

Browse source
This commit is contained in:
Tony Lindgren 2018-02-14 08:27:41 -08:00
commit 60c99c7749
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
arch/arm/mach-omap2/omap_hwmod.c
View file

@ -977,6 +977,9 @@ static int _enable_clocks(struct omap_hwmod *oh)
pr_debug("omap_hwmod: %s: enabling clocks\n", oh->name); pr_debug("omap_hwmod: %s: enabling clocks\n", oh->name);
if (oh->flags & HWMOD_OPT_CLKS_NEEDED)
_enable_optional_clocks(oh);
if (oh->_clk) if (oh->_clk)
clk_enable(oh->_clk); clk_enable(oh->_clk);
@ -985,9 +988,6 @@ static int _enable_clocks(struct omap_hwmod *oh)
clk_enable(os->_clk); clk_enable(os->_clk);
} }
if (oh->flags & HWMOD_OPT_CLKS_NEEDED)
_enable_optional_clocks(oh);
/* The opt clocks are controlled by the device driver. */ /* The opt clocks are controlled by the device driver. */
return 0; return 0;