From e45fa615bf9fe9d2484800166fa37affeb938c8e Mon Sep 17 00:00:00 2001 From: Anand Ravi Date: Thu, 16 Jul 2020 13:16:52 -0700 Subject: [PATCH] msm: camera: smmu: Fixes label_is_string warning in camera dtsi files Property 'label' is a reserved property of type string. At present, device trees use the property as list of strings. Rename the property to 'cam-smmu-label' to resolve conflict. CRs-Fixed: 2729703 Change-Id: I8bfb3af4daeaad4cc9dfc633a0256186ba1416c9 Signed-off-by: Anand Ravi --- drivers/cam_smmu/cam_smmu_api.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/cam_smmu/cam_smmu_api.c b/drivers/cam_smmu/cam_smmu_api.c index 4e6ee1b10d4f..5f82359c1d62 100644 --- a/drivers/cam_smmu/cam_smmu_api.c +++ b/drivers/cam_smmu/cam_smmu_api.c @@ -3864,7 +3864,7 @@ static int cam_populate_smmu_context_banks(struct device *dev, of_property_read_bool(dev->of_node, "multiple-client-devices"); cb->num_shared_hdl = of_property_count_strings(dev->of_node, - "label"); + "cam-smmu-label"); if (cb->num_shared_hdl > CAM_SMMU_SHARED_HDL_MAX) { @@ -3877,7 +3877,7 @@ static int cam_populate_smmu_context_banks(struct device *dev, /* set the name of the context bank */ for (i = 0; i < cb->num_shared_hdl; i++) rc = of_property_read_string_index(dev->of_node, - "label", i, &cb->name[i]); + "cam-smmu-label", i, &cb->name[i]); if (rc < 0) { CAM_ERR(CAM_SMMU, "Error: failed to read label from sub device");