ARM: OMAP2+: hwmod: resolve some OMAP4 warnings

The decision was made a few months ago to allow struct omap_hwmod records and struct clk records to omit clockdomain information if the clockdomain is not software-controllable. See for example commit 868c157df9721675c19729eed2c96bac6c3f1d01 ("ARM: OMAP2+: hwmod: remove prm_clkdm, cm_clkdm; allow hwmods to have no clockdomain").

So convert an existing pr_warning() to a pr_debug() (regarding missing clockdomains in clocks), and add a pr_debug() for missing hwmod clockdomains.

It's still useful to enable these messages for
debugging, since missing clockdomains can cause hard-to-debug problems with power management; see for example commit 6c4a057bffe9823221eab547e11fac181dc18a2b ("ARM: OMAP4: clock data:
Force a DPLL clkdm/pwrdm ON before a relock").

Signed-off-by Paul Walmsley <[email protected]>

Cc Beno?t Cousson <[email protected]>

---
  arch/arm/mach-omap2/omap_hwmod.c |    8 +++++---
  1 file changed, 5 insertions(+), 3 deletions(-)

arch/arm/mach-omap2/omap_hwmod.c +5 -3

index 80cea5b..e05228a 100644
@@ -685,8 +685,8 @@ static int _init_main_clk(struct omap_hwmod *oh)
  	}
 
  	if (!oh->_clk->clkdm)
-		pr_warning("omap_hwmod: %s: missing clockdomain for %s.\n",
-			   oh->main_clk, oh->_clk->name);
+		pr_debug("omap_hwmod: %s: missing clockdomain for %s.\n",
+			 oh->main_clk, oh->_clk->name);
 
  	return ret;
  }

@@ -1380,8 +1380,10 @@ static struct omap_hwmod *_lookup(const char *name)
   */
  static int _init_clkdm(struct omap_hwmod *oh)
  {
-	if (!oh->clkdm_name)
+	if (!oh->clkdm_name) {
+		pr_debug("omap_hwmod: %s: missing clockdomain\n", oh->name);
  		return 0;
+	}
 
  	oh->clkdm = clkdm_lookup(oh->clkdm_name);
  	if (!oh->clkdm) {

Quoted 6 lines · Paul Walmsley

The decision was made a few months ago to allow struct omap_hwmod records and struct clk records to omit clockdomain information if the clockdomain is not software-controllable. See for example commit 868c157df9721675c19729eed2c96bac6c3f1d01 ("ARM: OMAP2+: hwmod: remove prm_clkdm, cm_clkdm; allow hwmods to have no clockdomain").

Quoted 3 lines

So convert an existing pr_warning() to a pr_debug() (regarding missing clockdomains in clocks), and add a pr_debug() for missing hwmod clockdomains.

At some point I sent you a small RFC to still keep the message if neither oh->clkdm nor oh->_clk->clkdm was there. I've never had the time to test it, but that should then cover OMAP2, 3 & 4 cases.

Hi Beno?t,

Quoted 11 lines · Benoit

Quoted 9 lines · Paul Walmsley

The decision was made a few months ago to allow struct omap_hwmod records and struct clk records to omit clockdomain information if the clockdomain is not software-controllable. See for example commit 868c157df9721675c19729eed2c96bac6c3f1d01 ("ARM: OMAP2+: hwmod: remove prm_clkdm, cm_clkdm; allow hwmods to have no clockdomain").

So convert an existing pr_warning() to a pr_debug() (regarding missing clockdomains in clocks), and add a pr_debug() for missing hwmod clockdomains.

Quoted 3 lines

At some point I sent you a small RFC to still keep the message if neither oh->clkdm nor oh->_clk->clkdm was there. I've never had the time to test it, but that should then cover OMAP2, 3 & 4 cases.

OK let's plan to test and add something like that during the 3.8 time frame... probably it should also depend on the value of clkdm_control. It's not clear to me exactly what that conditional should look like...