diff options
| author | Paul Walmsley <paul@pwsan.com> | 2009-12-08 16:34:14 -0700 |
|---|---|---|
| committer | paul <paul@twilight.(none)> | 2009-12-11 17:00:43 -0700 |
| commit | b835d0142196466c5ff3695b90cff1e3ea635c8e (patch) | |
| tree | e48bec55ff5805e8a438cf19784bc80d92f80ffd /arch | |
| parent | 6f8b7ff5b01e16a65c3b17865ce047faeca40907 (diff) | |
| download | linux-3.10-b835d0142196466c5ff3695b90cff1e3ea635c8e.tar.gz linux-3.10-b835d0142196466c5ff3695b90cff1e3ea635c8e.tar.bz2 linux-3.10-b835d0142196466c5ff3695b90cff1e3ea635c8e.zip | |
OMAP3 hwmod: reprogram OCP_SYSCONFIG register after setting SOFTRESET
Reprogram the module's OCP_SYSCONFIG register after module reset (SOFTRESET
= 1). This may not be needed, but the definition of the reset performed by
the SOFTRESET bit is unclear.
Kevin Hilman <khilman@deeprootsystems.com> tested an earlier version of
this patch.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Tested-by: Kevin Hilman <khilman@deeprootsystems.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-omap2/omap_hwmod.c | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c index 7aaf5f1eea7..65a8e0ae394 100644 --- a/arch/arm/mach-omap2/omap_hwmod.c +++ b/arch/arm/mach-omap2/omap_hwmod.c @@ -945,11 +945,19 @@ static int _setup(struct omap_hwmod *oh) _enable(oh); - if (!(oh->flags & HWMOD_INIT_NO_RESET)) - _reset(oh); - - /* XXX OCP AUTOIDLE bit? */ - /* XXX OCP ENAWAKEUP bit? */ + if (!(oh->flags & HWMOD_INIT_NO_RESET)) { + /* + * XXX Do the OCP_SYSCONFIG bits need to be + * reprogrammed after a reset? If not, then this can + * be removed. If they do, then probably the + * _enable() function should be split to avoid the + * rewrite of the OCP_SYSCONFIG register. + */ + if (oh->sysconfig) { + _update_sysc_cache(oh); + _sysc_enable(oh); + } + } if (!(oh->flags & HWMOD_INIT_NO_IDLE)) _idle(oh); |