forked from ~ljy/RK356X_SDK_RELEASE
blame | history | patch | commit | commitdiff
hc
2024-05-11 04dd17822334871b23ea2862f7798fb0e0007777 
 kernel/drivers/clk/clk-composite.c
....@@ -1,20 +1,8 @@
1
+// SPDX-License-Identifier: GPL-2.0
12 /*
23  * Copyright (c) 2013 NVIDIA CORPORATION.  All rights reserved.
3
- *
4
- * This program is free software; you can redistribute it and/or modify it
5
- * under the terms and conditions of the GNU General Public License,
6
- * version 2, as published by the Free Software Foundation.
7
- *
8
- * This program is distributed in the hope it will be useful, but WITHOUT
9
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
10
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
11
- * more details.
12
- *
13
- * You should have received a copy of the GNU General Public License
14
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
154  */
165 
17
-#include <linux/clk.h>
186 #include <linux/clk-provider.h>
197 #include <linux/err.h>
208 #include <linux/slab.h>
....@@ -161,31 +149,7 @@
161149 	const struct clk_ops *mux_ops = composite->mux_ops;
162150 	struct clk_hw *rate_hw = composite->rate_hw;
163151 	struct clk_hw *mux_hw = composite->mux_hw;
164
-	struct clk_hw *brother_hw = composite->brother_hw;
165152 	unsigned long temp_rate;
166
-
167
-	if (brother_hw) {
168
-		struct clk_composite *bcomposite = to_clk_composite(brother_hw);
169
-		const struct clk_ops *brate_ops = bcomposite->rate_ops;
170
-		struct clk_hw *brate_hw = bcomposite->rate_hw;
171
-		struct clk_hw *parent_hw = clk_hw_get_parent(brother_hw);
172
-		struct clk_hw *new_parent_hw = clk_hw_get_parent(hw);
173
-
174
-		__clk_hw_set_clk(brate_hw, brother_hw);
175
-
176
-		temp_rate = brate_ops->recalc_rate(brate_hw, parent_rate);
177
-		if (temp_rate > rate)
178
-			brate_ops->set_rate(brate_hw, rate, parent_rate);
179
-		if (clk_hw_is_prepared(brother_hw)) {
180
-			clk_prepare_enable(new_parent_hw->clk);
181
-			clk_enable(brother_hw->clk);
182
-		}
183
-		clk_hw_reparent(brother_hw, new_parent_hw);
184
-		if (clk_hw_is_prepared(brother_hw)) {
185
-			clk_disable(brother_hw->clk);
186
-			clk_disable_unprepare(parent_hw->clk);
187
-		}
188
-	}
189153 
190154 	__clk_hw_set_clk(rate_hw, hw);
191155 	__clk_hw_set_clk(mux_hw, hw);
....@@ -235,8 +199,9 @@
235199 	gate_ops->disable(gate_hw);
236200 }
237201 
238
-struct clk_hw *clk_hw_register_composite(struct device *dev, const char *name,
239
-			const char * const *parent_names, int num_parents,
202
+static struct clk_hw *__clk_hw_register_composite(struct device *dev,
203
+			const char *name, const char * const *parent_names,
204
+			const struct clk_parent_data *pdata, int num_parents,
240205 			struct clk_hw *mux_hw, const struct clk_ops *mux_ops,
241206 			struct clk_hw *rate_hw, const struct clk_ops *rate_ops,
242207 			struct clk_hw *gate_hw, const struct clk_ops *gate_ops,
....@@ -253,8 +218,11 @@
253218 		return ERR_PTR(-ENOMEM);
254219 
255220 	init.name = name;
256
-	init.flags = flags | CLK_IS_BASIC;
257
-	init.parent_names = parent_names;
221
+	init.flags = flags;
222
+	if (parent_names)
223
+		init.parent_names = parent_names;
224
+	else
225
+		init.parent_data = pdata;
258226 	init.num_parents = num_parents;
259227 	hw = &composite->hw;
260228 
....@@ -348,6 +316,35 @@
348316 	return hw;
349317 }
350318 
319
+struct clk_hw *clk_hw_register_composite(struct device *dev, const char *name,
320
+			const char * const *parent_names, int num_parents,
321
+			struct clk_hw *mux_hw, const struct clk_ops *mux_ops,
322
+			struct clk_hw *rate_hw, const struct clk_ops *rate_ops,
323
+			struct clk_hw *gate_hw, const struct clk_ops *gate_ops,
324
+			unsigned long flags)
325
+{
326
+	return __clk_hw_register_composite(dev, name, parent_names, NULL,
327
+					   num_parents, mux_hw, mux_ops,
328
+					   rate_hw, rate_ops, gate_hw,
329
+					   gate_ops, flags);
330
+}
331
+EXPORT_SYMBOL_GPL(clk_hw_register_composite);
332
+
333
+struct clk_hw *clk_hw_register_composite_pdata(struct device *dev,
334
+			const char *name,
335
+			const struct clk_parent_data *parent_data,
336
+			int num_parents,
337
+			struct clk_hw *mux_hw, const struct clk_ops *mux_ops,
338
+			struct clk_hw *rate_hw, const struct clk_ops *rate_ops,
339
+			struct clk_hw *gate_hw, const struct clk_ops *gate_ops,
340
+			unsigned long flags)
341
+{
342
+	return __clk_hw_register_composite(dev, name, NULL, parent_data,
343
+					   num_parents, mux_hw, mux_ops,
344
+					   rate_hw, rate_ops, gate_hw,
345
+					   gate_ops, flags);
346
+}
347
+
351348 struct clk *clk_register_composite(struct device *dev, const char *name,
352349 			const char * const *parent_names, int num_parents,
353350 			struct clk_hw *mux_hw, const struct clk_ops *mux_ops,
....@@ -360,6 +357,25 @@
360357 	hw = clk_hw_register_composite(dev, name, parent_names, num_parents,
361358 			mux_hw, mux_ops, rate_hw, rate_ops, gate_hw, gate_ops,
362359 			flags);
360
+	if (IS_ERR(hw))
361
+		return ERR_CAST(hw);
362
+	return hw->clk;
363
+}
364
+EXPORT_SYMBOL_GPL(clk_register_composite);
365
+
366
+struct clk *clk_register_composite_pdata(struct device *dev, const char *name,
367
+			const struct clk_parent_data *parent_data,
368
+			int num_parents,
369
+			struct clk_hw *mux_hw, const struct clk_ops *mux_ops,
370
+			struct clk_hw *rate_hw, const struct clk_ops *rate_ops,
371
+			struct clk_hw *gate_hw, const struct clk_ops *gate_ops,
372
+			unsigned long flags)
373
+{
374
+	struct clk_hw *hw;
375
+
376
+	hw = clk_hw_register_composite_pdata(dev, name, parent_data,
377
+			num_parents, mux_hw, mux_ops, rate_hw, rate_ops,
378
+			gate_hw, gate_ops, flags);
363379 	if (IS_ERR(hw))
364380 		return ERR_CAST(hw);
365381 	return hw->clk;
....@@ -379,3 +395,14 @@
379395 	clk_unregister(clk);
380396 	kfree(composite);
381397 }
398
+
399
+void clk_hw_unregister_composite(struct clk_hw *hw)
400
+{
401
+	struct clk_composite *composite;
402
+
403
+	composite = to_clk_composite(hw);
404
+
405
+	clk_hw_unregister(hw);
406
+	kfree(composite);
407
+}
408
+EXPORT_SYMBOL_GPL(clk_hw_unregister_composite);