aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Baryshkov <dmitry.baryshkov@linaro.org>2021-11-25 21:27:07 +0300
committerDmitry Baryshkov <dmitry.baryshkov@linaro.org>2023-01-08 08:41:55 +0200
commit30bdf8fbdc1295c9538deb0ff30f09c8af4aea4f (patch)
tree5c44006b1273b69d761f0fff6118f257d8b3c480
parent3412357e63765c628ee765b1c0d01647ff0276f4 (diff)
of: property: do not create clocks device link for clock controllers
Do not create device link for clock controllers. Some of the clocks provided to the device via OF can be the clocks that are just parents to the clocks provided by this clock controller. Clock subsystem already has support for handling missing clock parents correctly (clock orphans). Later when the parent clock is registered, clocks get populated properly. An example of the system where this matters is the SDM8450 MTP board (see arch/arm64/boot/dts/qcom/sdm845-mtp.dts). Here the dispcc uses clocks provided by dsi0_phy and dsi1_phy device tree nodes. However the dispcc itself provides clocks to both PHYs, to the PHY parent device, etc. With just dsi0_phy in place devlink is able to break the dependency, but with two PHYs, dispcc doesn't get probed at all, thus breaking display support. Cc: Bjorn Andersson <bjorn.andersson@linaro.org> Cc: Stephen Boyd <swboyd@chromium.org> Cc: Saravana Kannan <saravanak@google.com> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
-rw-r--r--drivers/of/property.c16
1 files changed, 15 insertions, 1 deletions
diff --git a/drivers/of/property.c b/drivers/of/property.c
index 134cfc980b70..d323bf26a613 100644
--- a/drivers/of/property.c
+++ b/drivers/of/property.c
@@ -1297,7 +1297,6 @@ struct supplier_bindings {
bool node_not_dev;
};
-DEFINE_SIMPLE_PROP(clocks, "clocks", "#clock-cells")
DEFINE_SIMPLE_PROP(interconnects, "interconnects", "#interconnect-cells")
DEFINE_SIMPLE_PROP(iommus, "iommus", "#iommu-cells")
DEFINE_SIMPLE_PROP(mboxes, "mboxes", "#mbox-cells")
@@ -1327,6 +1326,21 @@ DEFINE_SIMPLE_PROP(backlight, "backlight", NULL)
DEFINE_SUFFIX_PROP(regulators, "-supply", NULL)
DEFINE_SUFFIX_PROP(gpio, "-gpio", "#gpio-cells")
+static struct device_node *parse_clocks(struct device_node *np,
+ const char *prop_name, int index)
+{
+ /*
+ * Do not create clock-related device links for clocks controllers,
+ * clock orphans will handle missing clock parents automatically.
+ */
+ if (!strcmp(prop_name, "clocks") &&
+ of_find_property(np, "#clock-cells", NULL))
+ return NULL;
+
+ return parse_prop_cells(np, prop_name, index, "clocks",
+ "#clock-cells");
+}
+
static struct device_node *parse_gpios(struct device_node *np,
const char *prop_name, int index)
{