File tree Expand file tree Collapse file tree 1 file changed +6
-12
lines changed Expand file tree Collapse file tree 1 file changed +6
-12
lines changed Original file line number Diff line number Diff line change @@ -1477,6 +1477,11 @@ static int _reset(struct omap_hwmod *oh)
1477
1477
1478
1478
ret = (oh -> class -> reset ) ? oh -> class -> reset (oh ) : _ocp_softreset (oh );
1479
1479
1480
+ if (oh -> class -> sysc ) {
1481
+ _update_sysc_cache (oh );
1482
+ _enable_sysc (oh );
1483
+ }
1484
+
1480
1485
return ret ;
1481
1486
}
1482
1487
@@ -1786,20 +1791,9 @@ static int _setup(struct omap_hwmod *oh, void *data)
1786
1791
return 0 ;
1787
1792
}
1788
1793
1789
- if (!(oh -> flags & HWMOD_INIT_NO_RESET )) {
1794
+ if (!(oh -> flags & HWMOD_INIT_NO_RESET ))
1790
1795
_reset (oh );
1791
1796
1792
- /*
1793
- * OCP_SYSCONFIG bits need to be reprogrammed after a softreset.
1794
- * The _enable() function should be split to
1795
- * avoid the rewrite of the OCP_SYSCONFIG register.
1796
- */
1797
- if (oh -> class -> sysc ) {
1798
- _update_sysc_cache (oh );
1799
- _enable_sysc (oh );
1800
- }
1801
- }
1802
-
1803
1797
postsetup_state = oh -> _postsetup_state ;
1804
1798
if (postsetup_state == _HWMOD_STATE_UNKNOWN )
1805
1799
postsetup_state = _HWMOD_STATE_ENABLED ;
You can’t perform that action at this time.
0 commit comments