Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e3530578 authored by Saravana Kannan's avatar Saravana Kannan Committed by Will McVicker
Browse files

ANDROID: GKI: of: property: Ignore properties that start with "qcom," 



A lot of "qcom," properties accidentally match some of the generic suffix
based DT properties. So, ignore all properties that start with "qcom,"

Bug: 144864161
Signed-off-by: default avatarSaravana Kannan <saravanak@google.com>
Signed-off-by: default avatarWill McVicker <willmcvicker@google.com>
(cherry picked from commit 68ef04dbaee376443a7d557c88ddd34dc0157919)
Change-Id: I8c8c6336cd4387ba51aaeaf447979eba27e0d5c0
parent 89f22102

drivers/of/property.c

+15 −0
Original line number Diff line number Diff line
@@ -1177,6 +1177,20 @@ static struct device_node *parse_msm_bus_name(struct device_node *np, 
	return bus_dev_np;

}



/* Force ignore of any qcom properties. */

static struct device_node *parse_qcom_any(struct device_node *np,

					  const char *prop_name, int index)

{

	if (index || strncmp(prop_name, "qcom,", strlen("qcom,")))

		return NULL;



	/*

	 * Returning np will cause this property to be matched and then

	 * ignored.

	 */

	return np;

}



/**

 * struct supplier_bindings - Property parsing functions for suppliers

 *
@@ -1220,6 +1234,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_qcom_any, },

	{ .parse_prop = parse_clocks, },

	{ .parse_prop = parse_interconnects, },

	{ .parse_prop = parse_iommus, },