Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[sfrench/cifs-2.6.git] / arch / arm / mach-omap2 / omap_hwmod.c

diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
index 4af2e9f0966df3ba500ae2875e74b057ca0f0093..405ac24def05f60558f27b3700f038fdad09d3ad 100644 (file)
--- a/arch/arm/mach-omap2/omap_hwmod.c
+++ b/arch/arm/mach-omap2/omap_hwmod.c
@@ -666,10 +666,10 @@ static struct clockdomain *_get_clkdm(struct omap_hwmod *oh)
        if (oh->clkdm) {
                return oh->clkdm;
        } else if (oh->_clk) {
-               if (__clk_get_flags(oh->_clk) & CLK_IS_BASIC)
+               if (!omap2_clk_is_hw_omap(__clk_get_hw(oh->_clk)))
                        return NULL;
                clk = to_clk_hw_omap(__clk_get_hw(oh->_clk));
-               return  clk->clkdm;
+               return clk->clkdm;
        }
        return NULL;
 }