Commit 2b026d13 authored by Paul Walmsley's avatar Paul Walmsley

ARM: OMAP4+: hwmod code: remove clkdm requirement in _omap4_wait_target_*()

We're no longer requiring struct omap_hwmod records to contain a
clockdomain.  So we shouldn't return -EINVAL any more from
_omap4_wait_target_disable() or _omap4_wait_target_ready() if there's
no clockdomain defined, since that just gets passed back to the
caller.  This can result in pointless warnings under the relaxed data
format.
Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
Cc: Benoît Cousson <b-cousson@ti.com>
parent 8bb9fde2
...@@ -927,10 +927,10 @@ static void _am33xx_enable_module(struct omap_hwmod *oh) ...@@ -927,10 +927,10 @@ static void _am33xx_enable_module(struct omap_hwmod *oh)
*/ */
static int _omap4_wait_target_disable(struct omap_hwmod *oh) static int _omap4_wait_target_disable(struct omap_hwmod *oh)
{ {
if (!oh || !oh->clkdm) if (!oh)
return -EINVAL; return -EINVAL;
if (oh->_int_flags & _HWMOD_NO_MPU_PORT) if (oh->_int_flags & _HWMOD_NO_MPU_PORT || !oh->clkdm)
return 0; return 0;
if (oh->flags & HWMOD_NO_IDLEST) if (oh->flags & HWMOD_NO_IDLEST)
...@@ -2635,10 +2635,10 @@ static int _omap2_wait_target_ready(struct omap_hwmod *oh) ...@@ -2635,10 +2635,10 @@ static int _omap2_wait_target_ready(struct omap_hwmod *oh)
*/ */
static int _omap4_wait_target_ready(struct omap_hwmod *oh) static int _omap4_wait_target_ready(struct omap_hwmod *oh)
{ {
if (!oh || !oh->clkdm) if (!oh)
return -EINVAL; return -EINVAL;
if (oh->flags & HWMOD_NO_IDLEST) if (oh->flags & HWMOD_NO_IDLEST || !oh->clkdm)
return 0; return 0;
if (!_find_mpu_rt_port(oh)) if (!_find_mpu_rt_port(oh))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment