summaryrefslogtreecommitdiffstats
path: root/drivers/input/rmi4/rmi_f11.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/input/rmi4/rmi_f11.c')
-rw-r--r--drivers/input/rmi4/rmi_f11.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/input/rmi4/rmi_f11.c b/drivers/input/rmi4/rmi_f11.c
index 948a360b6261..77a5eb84aed9 100644
--- a/drivers/input/rmi4/rmi_f11.c
+++ b/drivers/input/rmi4/rmi_f11.c
@@ -1059,8 +1059,13 @@ static int rmi_f11_initialize(struct rmi_function *fn)
if (!f11)
return -ENOMEM;
- if (pdata->sensor_pdata)
+ if (fn->dev.of_node) {
+ rc = rmi_2d_sensor_of_probe(&fn->dev, &f11->sensor_pdata);
+ if (rc)
+ return rc;
+ } else if (pdata->sensor_pdata) {
f11->sensor_pdata = *pdata->sensor_pdata;
+ }
f11->rezero_wait_ms = f11->sensor_pdata.rezero_wait;