android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

input: synaptics_s3907: Remove spi pinctrl setup logic

Browse Source 
Change-Id: Ife23ce354ceab1a4909895fb55b4252830f40afd
Signed-off-by: Jens Reidel <adrian@travitia.xyz>
This commit is contained in:
Jens Reidel 2024-04-17 20:03:43 +02:00
parent 079b6a4037
commit 629fb1f2b4
No known key found for this signature in database
GPG Key ID: 23C1E5F512C12303
2 changed files with 0 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
drivers/input/touchscreen/synaptics_s3907/synaptics_tcm_core.c
View File

@ -6232,34 +6232,6 @@ static int ts_check_panel(struct device_node *np)
return PTR_ERR(panel);
}
*/
static int syna_pinctrl_init(struct syna_tcm_hcd *tcm_hcd,
struct spi_device *spi)
{
int retval = 0;
/* Get pinctrl if target uses pinctrl */
tcm_hcd->ts_pinctrl = devm_pinctrl_get(&spi->dev);
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 pinctrll=%d\n", retval);
goto err_pinctrl_get;
}
tcm_hcd->pinctrl_state_spi =
pinctrl_lookup_state(tcm_hcd->ts_pinctrl, PINCTRL_STATE_SPI);
if (IS_ERR_OR_NULL(tcm_hcd->pinctrl_state_spi)) {
retval = PTR_ERR(tcm_hcd->pinctrl_state_spi);
LOGE(tcm_hcd->pdev->dev.parent,
"Can not lookup %s pinstate %d\n", PINCTRL_STATE_SPI,
retval);
goto err_pinctrl_lookup;
}
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)
{
@ -6415,19 +6387,6 @@ static int syna_tcm_probe(struct platform_device *pdev)
"Failed to enable regulators, retval=%d\n", retval);
goto err_enable_regulator;
}
retval = syna_pinctrl_init(tcm_hcd, spi);
if (!retval && tcm_hcd->ts_pinctrl) {
retval = pinctrl_select_state(tcm_hcd->ts_pinctrl,
tcm_hcd->pinctrl_state_spi);
if (retval < 0) {
LOGE(tcm_hcd->pdev->dev.parent,
"Failed to select %s pinstate %d\n",
PINCTRL_STATE_SPI, retval);
}
} else {
LOGE(tcm_hcd->pdev->dev.parent, "Failed to init pinctrl\n");
goto ProbeErrorExit_1;
}
retval = syna_tcm_config_gpio(tcm_hcd);
if (retval < 0) {
@ -6800,7 +6759,6 @@ static int syna_tcm_probe(struct platform_device *pdev)
syna_tcm_set_gpio(tcm_hcd, bdata->reset_gpio, false, 0, 0);
err_config_gpio:
ProbeErrorExit_1:
err_enable_regulator:
if (!tcm_hcd->avdd || !tcm_hcd->iovdd)
LOGE(tcm_hcd->pdev->dev.parent,

5
drivers/input/touchscreen/synaptics_s3907/synaptics_tcm_core.h
View File

@ -701,11 +701,6 @@ struct syna_tcm_hcd {
int maintenance_result;
struct mutex cmd_update_mutex;
/* SPI Pinctrl set up */
struct pinctrl *ts_pinctrl;
struct pinctrl_state *pinctrl_state_spi;
/* SPI Pinctrl setup end */
#ifdef SYNA_TCM_XIAOMI_TOUCHFEATURE
struct work_struct cmd_update_work;
struct work_struct grip_mode_work;