File tree Expand file tree Collapse file tree 2 files changed +5
-5
lines changed Expand file tree Collapse file tree 2 files changed +5
-5
lines changed Original file line number Diff line number Diff line change 24
24
#include <linux/timekeeping.h>
25
25
#include "clock.h"
26
26
27
- #define NO_IDLEST 0x1
27
+ #define NO_IDLEST 0
28
28
29
29
#define OMAP4_MODULEMODE_MASK 0x3
30
30
@@ -158,7 +158,7 @@ static int _omap4_clkctrl_clk_enable(struct clk_hw *hw)
158
158
159
159
ti_clk_ll_ops -> clk_writel (val , & clk -> enable_reg );
160
160
161
- if (clk -> flags & NO_IDLEST )
161
+ if (test_bit ( NO_IDLEST , & clk -> flags ) )
162
162
return 0 ;
163
163
164
164
/* Wait until module is enabled */
@@ -187,7 +187,7 @@ static void _omap4_clkctrl_clk_disable(struct clk_hw *hw)
187
187
188
188
ti_clk_ll_ops -> clk_writel (val , & clk -> enable_reg );
189
189
190
- if (clk -> flags & NO_IDLEST )
190
+ if (test_bit ( NO_IDLEST , & clk -> flags ) )
191
191
goto exit ;
192
192
193
193
/* Wait until module is disabled */
@@ -596,7 +596,7 @@ static void __init _ti_omap4_clkctrl_setup(struct device_node *node)
596
596
if (reg_data -> flags & CLKF_HW_SUP )
597
597
hw -> enable_bit = MODULEMODE_HWCTRL ;
598
598
if (reg_data -> flags & CLKF_NO_IDLEST )
599
- hw -> flags |= NO_IDLEST ;
599
+ set_bit ( NO_IDLEST , & hw -> flags ) ;
600
600
601
601
if (reg_data -> clkdm_name )
602
602
hw -> clkdm_name = reg_data -> clkdm_name ;
Original file line number Diff line number Diff line change @@ -153,7 +153,7 @@ struct clk_hw_omap {
153
153
u8 fixed_div ;
154
154
struct clk_omap_reg enable_reg ;
155
155
u8 enable_bit ;
156
- u8 flags ;
156
+ unsigned long flags ;
157
157
struct clk_omap_reg clksel_reg ;
158
158
struct dpll_data * dpll_data ;
159
159
const char * clkdm_name ;
You can’t perform that action at this time.
0 commit comments