Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livep...

[firefly-linux-kernel-4.4.55.git] / drivers / clk / nxp / clk-lpc18xx-ccu.c

diff --git a/drivers/clk/nxp/clk-lpc18xx-ccu.c b/drivers/clk/nxp/clk-lpc18xx-ccu.c
index eeaee97da1105ad79cc0683964cee6fb87527f5b..13aabbb3acbec3ff91d1fd478f097cd3014bfd8d 100644 (file)
--- a/drivers/clk/nxp/clk-lpc18xx-ccu.c
+++ b/drivers/clk/nxp/clk-lpc18xx-ccu.c
@@ -179,9 +179,22 @@ static void lpc18xx_ccu_gate_disable(struct clk_hw *hw)
 
 static int lpc18xx_ccu_gate_is_enabled(struct clk_hw *hw)
 {
-       struct clk_gate *gate = to_clk_gate(hw);
+       const struct clk_hw *parent;
+
+       /*
+        * The branch clock registers are only accessible
+        * if the base (parent) clock is enabled. Register
+        * access with a disabled base clock will hang the
+        * system.
+        */
+       parent = clk_hw_get_parent(hw);
+       if (!parent)
+               return 0;
+
+       if (!clk_hw_is_enabled(parent))
+               return 0;
 
-       return clk_readl(gate->reg) & LPC18XX_CCU_RUN;
+       return clk_gate_ops.is_enabled(hw);
 }
 
 static const struct clk_ops lpc18xx_ccu_gate_ops = {