.. | .. |
---|
101 | 101 | * |
---|
102 | 102 | * Convert a clockdomain name stored in a struct clk 'clk' into a |
---|
103 | 103 | * clockdomain pointer, and save it into the struct clk. Intended to be |
---|
104 | | - * called during clk_register(). No return value. |
---|
| 104 | + * called during clk_register(). Returns 0 on success, -EERROR otherwise. |
---|
105 | 105 | */ |
---|
106 | | -void omap2_init_clk_clkdm(struct clk_hw *hw) |
---|
| 106 | +int omap2_init_clk_clkdm(struct clk_hw *hw) |
---|
107 | 107 | { |
---|
108 | 108 | struct clk_hw_omap *clk = to_clk_hw_omap(hw); |
---|
109 | 109 | struct clockdomain *clkdm; |
---|
110 | 110 | const char *clk_name; |
---|
111 | 111 | |
---|
112 | 112 | if (!clk->clkdm_name) |
---|
113 | | - return; |
---|
| 113 | + return 0; |
---|
114 | 114 | |
---|
115 | 115 | clk_name = __clk_get_name(hw->clk); |
---|
116 | 116 | |
---|
.. | .. |
---|
123 | 123 | pr_debug("clock: could not associate clk %s to clkdm %s\n", |
---|
124 | 124 | clk_name, clk->clkdm_name); |
---|
125 | 125 | } |
---|
| 126 | + |
---|
| 127 | + return 0; |
---|
126 | 128 | } |
---|
127 | 129 | |
---|
128 | 130 | static void __init of_ti_clockdomain_setup(struct device_node *node) |
---|
.. | .. |
---|
143 | 145 | continue; |
---|
144 | 146 | } |
---|
145 | 147 | clk_hw = __clk_get_hw(clk); |
---|
146 | | - if (clk_hw_get_flags(clk_hw) & CLK_IS_BASIC) { |
---|
| 148 | + if (!omap2_clk_is_hw_omap(clk_hw)) { |
---|
147 | 149 | pr_warn("can't setup clkdm for basic clk %s\n", |
---|
148 | 150 | __clk_get_name(clk)); |
---|
149 | 151 | clk_put(clk); |
---|