Message ID | 1554365467-1325-3-git-send-email-t-kristo@ti.com |
---|---|
State | New |
Headers | show |
Series | clk: ti: a few OMAP clock fixes | expand |
* Tero Kristo <t-kristo@ti.com> [190404 08:12]: > CLK_IS_BASIC flag is about to get deprecated, and as such, can't be used. > Instead, the API call for checking whether a clock is of type hw_omap shall > be used, so convert the code to use this. Acked-by: Tony Lindgren <tony@atomide.com>
Quoting Tero Kristo (2019-04-04 01:11:03) > CLK_IS_BASIC flag is about to get deprecated, and as such, can't be used. > Instead, the API call for checking whether a clock is of type hw_omap shall > be used, so convert the code to use this. > > Signed-off-by: Tero Kristo <t-kristo@ti.com> > --- Applied to clk-next
diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c index 3a04c73..baadddf 100644 --- a/arch/arm/mach-omap2/omap_hwmod.c +++ b/arch/arm/mach-omap2/omap_hwmod.c @@ -648,10 +648,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; }
CLK_IS_BASIC flag is about to get deprecated, and as such, can't be used. Instead, the API call for checking whether a clock is of type hw_omap shall be used, so convert the code to use this. Signed-off-by: Tero Kristo <t-kristo@ti.com> --- arch/arm/mach-omap2/omap_hwmod.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 1.9.1 -- Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki