summaryrefslogtreecommitdiff
path: root/drivers/input
diff options
context:
space:
mode:
authorAbinaya P <abinayap@codeaurora.org>2014-10-16 14:16:27 +0530
committerDavid Keitel <dkeitel@codeaurora.org>2016-03-23 20:57:51 -0700
commitd23166718c77b586fec522c00b403b95200c43d7 (patch)
treeccc200ccf76ba03a92f281500999da6111b55718 /drivers/input
parent358da51dda67c6747d8ff119d1311636ceacb7a5 (diff)
input: synaptics_dsx: correct the debug message error
Parse the panel coordinates before using it for the debug message. Change-Id: I6e893b91e9f11cf7d80602058358d8256a96726d Signed-off-by: Abinaya P <abinayap@codeaurora.org>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/touchscreen/synaptics_dsx/synaptics_dsx_core.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/synaptics_dsx/synaptics_dsx_core.c b/drivers/input/touchscreen/synaptics_dsx/synaptics_dsx_core.c
index 8130ff9227bd..1f5b7f3b4e18 100644
--- a/drivers/input/touchscreen/synaptics_dsx/synaptics_dsx_core.c
+++ b/drivers/input/touchscreen/synaptics_dsx/synaptics_dsx_core.c
@@ -2733,7 +2733,9 @@ static int synaptics_rmi4_parse_dt_children(struct device *dev,
*/
continue;
} else if (of_property_read_bool(child,
- "synaptics,bypass-sensor-coords-check")) {
+ "synaptics,bypass-sensor-coords-check") &&
+ of_find_property(child,
+ "synaptics,panel-coords", NULL)) {
/*
* Some unprogrammed panels from touch vendor
* and wrongly programmed panels from factory
@@ -2744,6 +2746,9 @@ static int synaptics_rmi4_parse_dt_children(struct device *dev,
* of coordinate range read from sensor and read
* from DT and continue normal operation.
*/
+ synaptics_dsx_get_dt_coords(dev,
+ "synaptics,panel-coords",
+ rmi4_pdata, child);
dev_info(dev,
"%s Synaptics package id matches %d %d,"
"but bypassing the comparison of sensor"
@@ -2781,6 +2786,10 @@ static int synaptics_rmi4_parse_dt_children(struct device *dev,
(rmi4_pdata->panel_maxy !=
rmi4_data->sensor_max_y))
continue;
+ } else {
+ dev_info(dev, "Smax_x Smax_y = %d:%d\n",
+ rmi4_data->sensor_max_x,
+ rmi4_data->sensor_max_y);
}
}
}