diff options
| author | Rajendra Nayak <rnayak@ti.com> | 2012-04-12 19:11:38 +0530 |
|---|---|---|
| committer | Guillaume Aubertin <g-aubertin@ti.com> | 2012-06-26 12:21:15 +0200 |
| commit | cea599511bb899ef0c23a77533a0056c91cd2b16 (patch) | |
| tree | 2bf4b04ddc71d9fd59aee5a313cabfea9e86817d | |
| parent | 4b4f02323ca835e4a6e5b9de8b8b09e782c36ab7 (diff) | |
ARM: omap: hwmod: warn only when clkdm is missing from both clk and hwmod
On OMAP4+, the clkdm association is moved to hwmod while on older OMAPs'
its associated with a clk.
Hence look for a clkdm in both clk and hwmod and warn only when
its missing in both. Also fix the pr_warning() to print the correct
hwmod name.
Signed-off-by: Rajendra Nayak <rnayak@ti.com>
| -rw-r--r-- | arch/arm/mach-omap2/omap_hwmod.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c index 3e260ef46a3e..632344c9a791 100644 --- a/arch/arm/mach-omap2/omap_hwmod.c +++ b/arch/arm/mach-omap2/omap_hwmod.c @@ -568,9 +568,11 @@ static int _init_main_clk(struct omap_hwmod *oh) oh->name, oh->main_clk); return -EINVAL; } + if (!oh->_clk->clkdm && !oh->clkdm_name) pr_warning("omap_hwmod: %s: missing clockdomain for %s.\n", - oh->main_clk, oh->_clk->name); + oh->name, oh->_clk->name); + return ret; } |