From 82d59a39a0442d6d23d4d069c575f02da0fa39c0 Mon Sep 17 00:00:00 2001 From: hujing3 Date: Thu, 12 Nov 2020 11:00:45 +0800 Subject: [PATCH] nova_0flash_mmi: improve panel-supplier Capri plus: panel-supplier name is not matched with panel name completely improve panel-supplier logic for this case NO_PROP_NEEDED Change-Id: Ia43fdff4cae8dd17c97940a05b03981e02a1280c Signed-off-by: hujing3 Reviewed-on: https://gerrit.mot.com/1800288 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Xiangpo Zhao Reviewed-by: Jun Weng Submit-Approved: Jira Key --- drivers/input/touchscreen/nova_0flash_mmi/nt36xxx.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/input/touchscreen/nova_0flash_mmi/nt36xxx.c b/drivers/input/touchscreen/nova_0flash_mmi/nt36xxx.c index 2f070248a893..75e0182c1caa 100644 --- a/drivers/input/touchscreen/nova_0flash_mmi/nt36xxx.c +++ b/drivers/input/touchscreen/nova_0flash_mmi/nt36xxx.c @@ -1204,7 +1204,7 @@ static int32_t nvt_parse_dt(struct device *dev) #if defined(NVT_CONFIG_DRM_PANEL) num_of_panel_supplier = of_property_count_strings(np, "novatek,panel-supplier"); NVT_LOG("%s: get novatek,panel-supplier count=%d", __func__, num_of_panel_supplier); - if (active_panel_name && num_of_panel_supplier > 0) { + if (active_panel_name && num_of_panel_supplier > 1) { for (j = 0; j < num_of_panel_supplier; j++) { ret = of_property_read_string_index(np, "novatek,panel-supplier", j, &panel_supplier); if (ret < 0) { @@ -1216,6 +1216,10 @@ static int32_t nvt_parse_dt(struct device *dev) break; } } + } else if (1 == num_of_panel_supplier) { + //in case the panel-supplier info does not completely contained in panel name. + ret = of_property_read_string(np, "novatek,panel-supplier", + &ts->panel_supplier); } else { ret = -EINVAL; }