mk-rootfs.sh

hc

2023-12-11 072de836f53be56a70cecf70b43ae43b7ce17376

 kernel/drivers/clk/meson/meson-aoclk.c
..
..
@@ -14,7 +14,9 @@
14
14
 #include <linux/reset-controller.h>
15
15
 #include <linux/mfd/syscon.h>
16
16
 #include <linux/of_device.h>
17
-#include "clk-regmap.h"
17
+#include <linux/module.h>
18
+
19
+#include <linux/slab.h>
18
20
 #include "meson-aoclk.h"
19
21
 
20
22
 static int meson_aoclk_do_reset(struct reset_controller_dev *rcdev,
..
..
@@ -36,6 +38,7 @@
36
38
 	struct meson_aoclk_reset_controller *rstc;
37
39
 	struct meson_aoclk_data *data;
38
40
 	struct device *dev = &pdev->dev;
41
+	struct device_node *np;
39
42
 	struct regmap *regmap;
40
43
 	int ret, clkid;
41
44
 
..
..
@@ -47,7 +50,9 @@
47
50
 	if (!rstc)
48
51
 		return -ENOMEM;
49
52
 
50
-	regmap = syscon_node_to_regmap(of_get_parent(dev->of_node));
53
+	np = of_get_parent(dev->of_node);
54
+	regmap = syscon_node_to_regmap(np);
55
+	of_node_put(np);
51
56
 	if (IS_ERR(regmap)) {
52
57
 		dev_err(dev, "failed to get regmap\n");
53
58
 		return PTR_ERR(regmap);
..
..
@@ -57,7 +62,7 @@
57
62
 	rstc->data = data;
58
63
 	rstc->regmap = regmap;
59
64
 	rstc->reset.ops = &meson_aoclk_reset_ops;
60
-	rstc->reset.nr_resets = data->num_reset,
65
+	rstc->reset.nr_resets = data->num_reset;
61
66
 	rstc->reset.of_node = dev->of_node;
62
67
 	ret = devm_reset_controller_register(dev, &rstc->reset);
63
68
 	if (ret) {
..
..
@@ -65,17 +70,24 @@
65
70
 		return ret;
66
71
 	}
67
72
 
68
-	/*
69
-	 * Populate regmap and register all clks
70
-	 */
71
-	for (clkid = 0; clkid < data->num_clks; clkid++) {
73
+	/* Populate regmap */
74
+	for (clkid = 0; clkid < data->num_clks; clkid++)
72
75
 		data->clks[clkid]->map = regmap;
73
76
 
77
+	/* Register all clks */
78
+	for (clkid = 0; clkid < data->hw_data->num; clkid++) {
79
+		if (!data->hw_data->hws[clkid])
80
+			continue;
81
+
74
82
 		ret = devm_clk_hw_register(dev, data->hw_data->hws[clkid]);
75
-		if (ret)
83
+		if (ret) {
84
+			dev_err(dev, "Clock registration failed\n");
76
85
 			return ret;
86
+		}
77
87
 	}
78
88
 
79
89
 	return devm_of_clk_add_hw_provider(dev, of_clk_hw_onecell_get,
80
90
 		(void *) data->hw_data);
81
91
 }
92
+EXPORT_SYMBOL_GPL(meson_aoclkc_probe);
93
+MODULE_LICENSE("GPL v2");