diff options
| author | Tony Lindgren <tony@atomide.com> | 2014-04-18 16:46:53 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2014-04-18 16:46:53 -0700 |
| commit | be2fa17a568e0b3b6dc5c46d30d5eafdad3a1f77 (patch) | |
| tree | 5d6310f2ee8e7ba70d95350a0a8f2d620c4bf429 /arch/arm/mach-omap2/omap_hwmod.c | |
| parent | cdd705dddc57960f74c67e5a5935e326527f94c6 (diff) | |
| parent | 3d36ad7e7a9be0d130c862727a052ed279046437 (diff) | |
Merge tag 'for-v3.15-rc/omap-fixes-a' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v3.15/fixes
OMAP hwmod and clock fixes for v3.15-rc
A few OMAP hwmod and clock fixes for v3.15-rc. Probably the most useful
fix is the AM43xx DPLL patch.
Basic build, boot, and PM test results are here:
http://www.pwsan.com/omap/testlogs/prcm-fixes-a-v3.15-rc/20140411130021/
Diffstat (limited to 'arch/arm/mach-omap2/omap_hwmod.c')
| -rw-r--r-- | arch/arm/mach-omap2/omap_hwmod.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c index 1f33f5db10d5..66c60fe1104c 100644 --- a/arch/arm/mach-omap2/omap_hwmod.c +++ b/arch/arm/mach-omap2/omap_hwmod.c @@ -2546,11 +2546,12 @@ static int __init _init(struct omap_hwmod *oh, void *data) return -EINVAL; } - if (np) + if (np) { if (of_find_property(np, "ti,no-reset-on-init", NULL)) oh->flags |= HWMOD_INIT_NO_RESET; if (of_find_property(np, "ti,no-idle-on-init", NULL)) oh->flags |= HWMOD_INIT_NO_IDLE; + } oh->_state = _HWMOD_STATE_INITIALIZED; |