From 89f2210269f2b2a36504e58cb310d7f44942f1d3 Mon Sep 17 00:00:00 2001 From: Saravana Kannan Date: Fri, 1 Nov 2019 14:54:14 -0700 Subject: [PATCH] ANDROID: GKI: of: property: Add support for parsing qcom,msm-bus,name property This is 4.19 specific fix. Will not be needed for 5.x since we'll have the interconnect framework and a proper common binding to use. Bug: 143786221 Signed-off-by: Saravana Kannan Signed-off-by: Will McVicker (cherry picked from commit 3acde98f213562f891110bca4cfca155d27875a7) Change-Id: I81f9969ef620cd63ca549c4ed90f5887de5b44fd --- drivers/of/property.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/drivers/of/property.c b/drivers/of/property.c index 099d37d1a03b..1e35bfd19722 100644 --- a/drivers/of/property.c +++ b/drivers/of/property.c @@ -1162,6 +1162,21 @@ static struct device_node *parse_##fname(struct device_node *np, \ return parse_suffix_prop_cells(np, prop_name, index, suffix, cells); \ } +static struct device_node *parse_msm_bus_name(struct device_node *np, + const char *prop_name, int index) +{ + static struct device_node *bus_dev_np; + + if (index || strcmp(prop_name, "qcom,msm-bus,name")) + return NULL; + + if (!bus_dev_np) + bus_dev_np = of_find_compatible_node(NULL, NULL, + "qcom,msm-bus-device"); + + return bus_dev_np; +} + /** * struct supplier_bindings - Property parsing functions for suppliers * @@ -1204,6 +1219,7 @@ static struct device_node *parse_iommu_maps(struct device_node *np, } static const struct supplier_bindings of_supplier_bindings[] = { + { .parse_prop = parse_msm_bus_name, }, { .parse_prop = parse_clocks, }, { .parse_prop = parse_interconnects, }, { .parse_prop = parse_iommus, },