clk: ti: clkctrl: Fix clkdm_clk handling [Linux 5.2]

clk: ti: clkctrl: Fix clkdm_clk handling [Linux 5.2]

This Linux kernel change "clk: ti: clkctrl: Fix clkdm_clk handling" is included in the Linux 5.2 release. This change is authored by Tony Lindgren <tony [at] atomide.com> on Mon May 6 14:08:54 2019 -0700. The commit for this change in Linux stable tree is 1cc5407 (patch).

clk: ti: clkctrl: Fix clkdm_clk handling

We need to always call clkdm_clk_enable() and clkdm_clk_disable() even
the clkctrl clock(s) enabled for the domain do not have any gate register
bits. Otherwise clockdomains may never get enabled except when devices get
probed with the legacy "ti,hwmods" devicetree property.

Fixes: 88a172526c32 ("clk: ti: add support for clkctrl clocks")
Signed-off-by: Tony Lindgren <[email protected]>
Signed-off-by: Stephen Boyd <[email protected]>

There are 8 lines of Linux source code added/deleted in this change. Code changes to Linux kernel are as follows.

 drivers/clk/ti/clkctrl.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/clk/ti/clkctrl.c b/drivers/clk/ti/clkctrl.c
index 96d65a1..8e83431 100644
--- a/drivers/clk/ti/clkctrl.c
+++ b/drivers/clk/ti/clkctrl.c
@@ -137,9 +137,6 @@ static int _omap4_clkctrl_clk_enable(struct clk_hw *hw)
    int ret;
    union omap4_timeout timeout = { 0 };

-   if (!clk->enable_bit)
-       return 0;
-
    if (clk->clkdm) {
        ret = ti_clk_ll_ops->clkdm_clk_enable(clk->clkdm, hw->clk);
        if (ret) {
@@ -151,6 +148,9 @@ static int _omap4_clkctrl_clk_enable(struct clk_hw *hw)
        }
    }

+   if (!clk->enable_bit)
+       return 0;
+
    val = ti_clk_ll_ops->clk_readl(&clk->enable_reg);

    val &= ~OMAP4_MODULEMODE_MASK;
@@ -179,7 +179,7 @@ static void _omap4_clkctrl_clk_disable(struct clk_hw *hw)
    union omap4_timeout timeout = { 0 };

    if (!clk->enable_bit)
-       return;
+       goto exit;

    val = ti_clk_ll_ops->clk_readl(&clk->enable_reg);

Leave a Reply

Your email address will not be published. Required fields are marked *