forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-05-10 61598093bbdd283a7edc367d900f223070ead8d2
kernel/drivers/clk/ti/clockdomain.c
....@@ -101,16 +101,16 @@
101101 *
102102 * Convert a clockdomain name stored in a struct clk 'clk' into a
103103 * 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.
105105 */
106
-void omap2_init_clk_clkdm(struct clk_hw *hw)
106
+int omap2_init_clk_clkdm(struct clk_hw *hw)
107107 {
108108 struct clk_hw_omap *clk = to_clk_hw_omap(hw);
109109 struct clockdomain *clkdm;
110110 const char *clk_name;
111111
112112 if (!clk->clkdm_name)
113
- return;
113
+ return 0;
114114
115115 clk_name = __clk_get_name(hw->clk);
116116
....@@ -123,6 +123,8 @@
123123 pr_debug("clock: could not associate clk %s to clkdm %s\n",
124124 clk_name, clk->clkdm_name);
125125 }
126
+
127
+ return 0;
126128 }
127129
128130 static void __init of_ti_clockdomain_setup(struct device_node *node)
....@@ -143,7 +145,7 @@
143145 continue;
144146 }
145147 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)) {
147149 pr_warn("can't setup clkdm for basic clk %s\n",
148150 __clk_get_name(clk));
149151 clk_put(clk);