Merge "input: touchscreen: synaptics_tcm: Enable pinctrl for touch driver" (bd262581) · Commits · e / devices / android_kernel_xiaomi_nabu

drivers/input/touchscreen/synaptics_tcm/synaptics_tcm_core.c

+86 −0

Original line number	Diff line number	Diff line
		@@ -2851,6 +2851,15 @@ static int syna_tcm_resume(struct device *dev)
		if (!tcm_hcd->in_suspend)
		return 0;

		retval = pinctrl_select_state(
		tcm_hcd->ts_pinctrl,
		tcm_hcd->pinctrl_state_active);
		if (retval < 0) {
		LOGE(tcm_hcd->pdev->dev.parent,
		"%s: Failed to select %s pinstate %d\n",
		__func__, PINCTRL_STATE_ACTIVE, retval);
		}

		if (tcm_hcd->host_download_mode) {
		#ifndef WAKEUP_GESTURE
		syna_tcm_check_hdl(tcm_hcd);
		@@ -2940,6 +2949,13 @@ static int syna_tcm_suspend(struct device *dev)
		if (tcm_hcd->in_suspend \|\| !tcm_hcd->init_okay)
		return 0;

		if (pinctrl_select_state(
		tcm_hcd->ts_pinctrl,
		tcm_hcd->pinctrl_state_suspend))
		LOGE(tcm_hcd->pdev->dev.parent,
		"%s: Failed to select %s pinstate\n",
		__func__, PINCTRL_STATE_RELEASE);

		mutex_lock(&mod_pool.mutex);

		if (!list_empty(&mod_pool.list)) {
		@@ -2975,6 +2991,13 @@ static int syna_tcm_early_suspend(struct device *dev)
		if (tcm_hcd->in_suspend \|\| !tcm_hcd->init_okay)
		return 0;

		if (pinctrl_select_state(
		tcm_hcd->ts_pinctrl,
		tcm_hcd->pinctrl_state_suspend))
		LOGE(tcm_hcd->pdev->dev.parent,
		"%s: Failed to select %s pinstate\n",
		__func__, PINCTRL_STATE_RELEASE);

		tcm_hcd->update_watchdog(tcm_hcd, false);

		if (tcm_hcd->id_info.mode != MODE_APPLICATION \|\|
		@@ -3168,6 +3191,57 @@ static int syna_tcm_fb_notifier_cb(struct notifier_block *nb,
		}
		#endif

		static int synaptics_tcm_pinctrl_init(struct syna_tcm_hcd *tcm_hcd)
		{
		int retval;

		/* Get pinctrl if target uses pinctrl */
		tcm_hcd->ts_pinctrl = devm_pinctrl_get((tcm_hcd->pdev->dev.parent));
		if (IS_ERR_OR_NULL(tcm_hcd->ts_pinctrl)) {
		retval = PTR_ERR(tcm_hcd->ts_pinctrl);
		LOGE(tcm_hcd->pdev->dev.parent,
		"Target does not use pinctrl %d\n", retval);
		goto err_pinctrl_get;
		}

		tcm_hcd->pinctrl_state_active
		= pinctrl_lookup_state(tcm_hcd->ts_pinctrl, "pmx_ts_active");
		if (IS_ERR_OR_NULL(tcm_hcd->pinctrl_state_active)) {
		retval = PTR_ERR(tcm_hcd->pinctrl_state_active);
		LOGE(tcm_hcd->pdev->dev.parent,
		"Can not lookup %s pinstate %d\n",
		PINCTRL_STATE_ACTIVE, retval);
		goto err_pinctrl_lookup;
		}

		tcm_hcd->pinctrl_state_suspend
		= pinctrl_lookup_state(tcm_hcd->ts_pinctrl, "pmx_ts_suspend");
		if (IS_ERR_OR_NULL(tcm_hcd->pinctrl_state_suspend)) {
		retval = PTR_ERR(tcm_hcd->pinctrl_state_suspend);
		LOGE(tcm_hcd->pdev->dev.parent,
		"Can not lookup %s pinstate %d\n",
		PINCTRL_STATE_SUSPEND, retval);
		goto err_pinctrl_lookup;
		}

		tcm_hcd->pinctrl_state_release
		= pinctrl_lookup_state(tcm_hcd->ts_pinctrl, "pmx_ts_release");
		if (IS_ERR_OR_NULL(tcm_hcd->pinctrl_state_release)) {
		retval = PTR_ERR(tcm_hcd->pinctrl_state_release);
		LOGE(tcm_hcd->pdev->dev.parent,
		"Can not lookup %s pinstate %d\n",
		PINCTRL_STATE_RELEASE, retval);
		}

		return 0;

		err_pinctrl_lookup:
		devm_pinctrl_put(tcm_hcd->ts_pinctrl);
		err_pinctrl_get:
		tcm_hcd->ts_pinctrl = NULL;
		return retval;
		}

		static int syna_tcm_probe(struct platform_device *pdev)
		{
		int retval;
		@@ -3296,6 +3370,18 @@ static int syna_tcm_probe(struct platform_device *pdev)
		goto err_config_gpio;
		}

		retval = synaptics_tcm_pinctrl_init(tcm_hcd);
		if (!retval && tcm_hcd->ts_pinctrl) {
		retval = pinctrl_select_state(
		tcm_hcd->ts_pinctrl,
		tcm_hcd->pinctrl_state_active);
		if (retval < 0) {
		LOGE(tcm_hcd->pdev->dev.parent,
		"%s: Failed to select %s pinstate %d\n",
		__func__, PINCTRL_STATE_ACTIVE, retval);
		}
		}

		sysfs_dir = kobject_create_and_add(PLATFORM_DRIVER_NAME,
		&pdev->dev.kobj);
		if (!sysfs_dir) {

drivers/input/touchscreen/synaptics_tcm/synaptics_tcm_core.h

+8 −0

Original line number	Diff line number	Diff line
		@@ -144,6 +144,10 @@ static struct device_attribute dev_attr_##a_name = \

		#define ATTRIFY(a_name) (&dev_attr_##a_name)

		#define PINCTRL_STATE_ACTIVE "pmx_ts_active"
		#define PINCTRL_STATE_SUSPEND "pmx_ts_suspend"
		#define PINCTRL_STATE_RELEASE "pmx_ts_release"

		enum module_type {
		TCM_TOUCH = 0,
		TCM_DEVICE = 1,
		@@ -423,6 +427,10 @@ struct syna_tcm_hcd {
		struct delayed_work polling_work;
		struct workqueue_struct *polling_workqueue;
		struct task_struct *notifier_thread;
		struct pinctrl *ts_pinctrl;
		struct pinctrl_state *pinctrl_state_active;
		struct pinctrl_state *pinctrl_state_suspend;
		struct pinctrl_state *pinctrl_state_release;
		#if defined(CONFIG_DRM) \|\| defined(CONFIG_FB)
		struct notifier_block fb_notifier;
		#endif