forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-05-10 61598093bbdd283a7edc367d900f223070ead8d2
kernel/drivers/clk/meson/meson-aoclk.c
....@@ -14,7 +14,9 @@
1414 #include <linux/reset-controller.h>
1515 #include <linux/mfd/syscon.h>
1616 #include <linux/of_device.h>
17
-#include "clk-regmap.h"
17
+#include <linux/module.h>
18
+
19
+#include <linux/slab.h>
1820 #include "meson-aoclk.h"
1921
2022 static int meson_aoclk_do_reset(struct reset_controller_dev *rcdev,
....@@ -36,6 +38,7 @@
3638 struct meson_aoclk_reset_controller *rstc;
3739 struct meson_aoclk_data *data;
3840 struct device *dev = &pdev->dev;
41
+ struct device_node *np;
3942 struct regmap *regmap;
4043 int ret, clkid;
4144
....@@ -47,7 +50,9 @@
4750 if (!rstc)
4851 return -ENOMEM;
4952
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);
5156 if (IS_ERR(regmap)) {
5257 dev_err(dev, "failed to get regmap\n");
5358 return PTR_ERR(regmap);
....@@ -57,7 +62,7 @@
5762 rstc->data = data;
5863 rstc->regmap = regmap;
5964 rstc->reset.ops = &meson_aoclk_reset_ops;
60
- rstc->reset.nr_resets = data->num_reset,
65
+ rstc->reset.nr_resets = data->num_reset;
6166 rstc->reset.of_node = dev->of_node;
6267 ret = devm_reset_controller_register(dev, &rstc->reset);
6368 if (ret) {
....@@ -65,17 +70,24 @@
6570 return ret;
6671 }
6772
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++)
7275 data->clks[clkid]->map = regmap;
7376
77
+ /* Register all clks */
78
+ for (clkid = 0; clkid < data->hw_data->num; clkid++) {
79
+ if (!data->hw_data->hws[clkid])
80
+ continue;
81
+
7482 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");
7685 return ret;
86
+ }
7787 }
7888
7989 return devm_of_clk_add_hw_provider(dev, of_clk_hw_onecell_get,
8090 (void *) data->hw_data);
8191 }
92
+EXPORT_SYMBOL_GPL(meson_aoclkc_probe);
93
+MODULE_LICENSE("GPL v2");