|
@@ -1695,13 +1695,6 @@ static struct clk_core *__clk_init_parent(struct clk_core *core)
|
|
goto out;
|
|
goto out;
|
|
}
|
|
}
|
|
|
|
|
|
- if (!core->ops->get_parent) {
|
|
|
|
- WARN(!core->ops->get_parent,
|
|
|
|
- "%s: multi-parent clocks must implement .get_parent\n",
|
|
|
|
- __func__);
|
|
|
|
- goto out;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
/*
|
|
/*
|
|
* Do our best to cache parent clocks in core->parents. This prevents
|
|
* Do our best to cache parent clocks in core->parents. This prevents
|
|
* unnecessary and expensive lookups. We don't set core->parent here;
|
|
* unnecessary and expensive lookups. We don't set core->parent here;
|
|
@@ -2333,6 +2326,13 @@ static int __clk_core_init(struct clk_core *core)
|
|
goto out;
|
|
goto out;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ if (core->num_parents > 1 && !core->ops->get_parent) {
|
|
|
|
+ pr_err("%s: %s must implement .get_parent as it has multi parents\n",
|
|
|
|
+ __func__, core->name);
|
|
|
|
+ ret = -EINVAL;
|
|
|
|
+ goto out;
|
|
|
|
+ }
|
|
|
|
+
|
|
if (core->ops->set_rate_and_parent &&
|
|
if (core->ops->set_rate_and_parent &&
|
|
!(core->ops->set_parent && core->ops->set_rate)) {
|
|
!(core->ops->set_parent && core->ops->set_rate)) {
|
|
pr_err("%s: %s must implement .set_parent & .set_rate\n",
|
|
pr_err("%s: %s must implement .set_parent & .set_rate\n",
|