Commit 22a6564f authored by Tero Kristo's avatar Tero Kristo

clk: ti: clkctrl: convert to use bit helper macros instead of bitops

This improves the readibility of the code slightly, and makes modifying
the flags bit simpler.
Signed-off-by: default avatarTero Kristo <t-kristo@ti.com>
parent 581eb61a
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include <linux/timekeeping.h> #include <linux/timekeeping.h>
#include "clock.h" #include "clock.h"
#define NO_IDLEST 0x1 #define NO_IDLEST 0
#define OMAP4_MODULEMODE_MASK 0x3 #define OMAP4_MODULEMODE_MASK 0x3
...@@ -158,7 +158,7 @@ static int _omap4_clkctrl_clk_enable(struct clk_hw *hw) ...@@ -158,7 +158,7 @@ static int _omap4_clkctrl_clk_enable(struct clk_hw *hw)
ti_clk_ll_ops->clk_writel(val, &clk->enable_reg); ti_clk_ll_ops->clk_writel(val, &clk->enable_reg);
if (clk->flags & NO_IDLEST) if (test_bit(NO_IDLEST, &clk->flags))
return 0; return 0;
/* Wait until module is enabled */ /* Wait until module is enabled */
...@@ -187,7 +187,7 @@ static void _omap4_clkctrl_clk_disable(struct clk_hw *hw) ...@@ -187,7 +187,7 @@ static void _omap4_clkctrl_clk_disable(struct clk_hw *hw)
ti_clk_ll_ops->clk_writel(val, &clk->enable_reg); ti_clk_ll_ops->clk_writel(val, &clk->enable_reg);
if (clk->flags & NO_IDLEST) if (test_bit(NO_IDLEST, &clk->flags))
goto exit; goto exit;
/* Wait until module is disabled */ /* Wait until module is disabled */
...@@ -596,7 +596,7 @@ static void __init _ti_omap4_clkctrl_setup(struct device_node *node) ...@@ -596,7 +596,7 @@ static void __init _ti_omap4_clkctrl_setup(struct device_node *node)
if (reg_data->flags & CLKF_HW_SUP) if (reg_data->flags & CLKF_HW_SUP)
hw->enable_bit = MODULEMODE_HWCTRL; hw->enable_bit = MODULEMODE_HWCTRL;
if (reg_data->flags & CLKF_NO_IDLEST) if (reg_data->flags & CLKF_NO_IDLEST)
hw->flags |= NO_IDLEST; set_bit(NO_IDLEST, &hw->flags);
if (reg_data->clkdm_name) if (reg_data->clkdm_name)
hw->clkdm_name = reg_data->clkdm_name; hw->clkdm_name = reg_data->clkdm_name;
......
...@@ -153,7 +153,7 @@ struct clk_hw_omap { ...@@ -153,7 +153,7 @@ struct clk_hw_omap {
u8 fixed_div; u8 fixed_div;
struct clk_omap_reg enable_reg; struct clk_omap_reg enable_reg;
u8 enable_bit; u8 enable_bit;
u8 flags; unsigned long flags;
struct clk_omap_reg clksel_reg; struct clk_omap_reg clksel_reg;
struct dpll_data *dpll_data; struct dpll_data *dpll_data;
const char *clkdm_name; const char *clkdm_name;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment