From 814f0c227cf548cf053a6b42c8d5cc2a18a6fd38 Mon Sep 17 00:00:00 2001 From: haojl2 Date: Fri, 15 May 2020 16:11:53 +0800 Subject: [PATCH] touchscreen_mmi: selete on state when panel register. If vendor dtsi add touchscreen mmi pinctrl on state, select this state when panel registered to touchscreen class. Change-Id: I01c989da2e2b66dd57c818c8322f0969e127dc25 Signed-off-by: haojl2 Reviewed-on: https://gerrit.mot.com/1557379 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Jianqi Yang Reviewed-by: Submit-Approved: Jira Key --- .../input/touchscreen/touchscreen_mmi/touchscreen_mmi_class.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/input/touchscreen/touchscreen_mmi/touchscreen_mmi_class.c b/drivers/input/touchscreen/touchscreen_mmi/touchscreen_mmi_class.c index 84298fe891c5..ce1c393ee9b7 100644 --- a/drivers/input/touchscreen/touchscreen_mmi/touchscreen_mmi_class.c +++ b/drivers/input/touchscreen/touchscreen_mmi/touchscreen_mmi_class.c @@ -558,6 +558,9 @@ int ts_mmi_dev_register(struct device *parent, !IS_ERR_OR_NULL(touch_cdev->pinctrl_off_state)) { dev_info(DEV_TS, "%s: No pinctrl method add default\n", __func__); touch_cdev->mdata->pinctrl = ts_mmi_default_pinctrl; + if (!IS_ERR_OR_NULL(touch_cdev->pinctrl_on_state)) + pinctrl_select_state(touch_cdev->pinctrl_node, + touch_cdev->pinctrl_on_state); } }