From: David Heidelberg <[email protected]> Platform data may define touchscreen-x-mm and touchscreen-y-mm, but these are quietly overridden by data provided by sensor.
Warn when detected data doesn't match the device-tree data. Signed-off-by: David Heidelberg <[email protected]> --- drivers/input/rmi4/rmi_f12.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/drivers/input/rmi4/rmi_f12.c b/drivers/input/rmi4/rmi_f12.c index 88c28089de993..88797556e738c 100644 --- a/drivers/input/rmi4/rmi_f12.c +++ b/drivers/input/rmi4/rmi_f12.c @@ -95,16 +95,17 @@ static int rmi_f12_read_sensor_tuning(struct f12_data *f12) { const struct rmi_register_desc_item *item; struct rmi_2d_sensor *sensor = &f12->sensor; struct rmi_function *fn = sensor->fn; struct rmi_device *rmi_dev = fn->rmi_dev; int ret; int offset; u8 buf[15]; + u8 x_mm, y_mm; int pitch_x = 0; int pitch_y = 0; int rx_receivers = 0; int tx_receivers = 0; u16 query_dpm_addr = 0; int dpm_resolution = 0; item = rmi_get_register_desc_item(&f12->control_reg_desc, 8); @@ -166,33 +167,46 @@ static int rmi_f12_read_sensor_tuning(struct f12_data *f12) query_dpm_addr = fn->fd.query_base_addr + offset; ret = rmi_read(fn->rmi_dev, query_dpm_addr, buf); if (ret) { dev_err(&fn->dev, "Failed to read DPM value: %d\n", ret); return ret; } dpm_resolution = buf[0]; - sensor->x_mm = sensor->max_x / dpm_resolution; - sensor->y_mm = sensor->max_y / dpm_resolution; + x_mm = sensor->max_x / dpm_resolution; + y_mm = sensor->max_y / dpm_resolution; } else { if (rmi_register_desc_has_subpacket(item, 3)) { rx_receivers = buf[offset]; tx_receivers = buf[offset + 1]; offset += 2; } /* Skip over sensor flags */ if (rmi_register_desc_has_subpacket(item, 4)) offset += 1; - sensor->x_mm = (pitch_x * rx_receivers) >> 12; - sensor->y_mm = (pitch_y * tx_receivers) >> 12; + x_mm = (pitch_x * rx_receivers) >> 12; + y_mm = (pitch_y * tx_receivers) >> 12; } + if (sensor->x_mm && sensor->x_mm != x_mm) + dev_warn(&fn->dev, + "platform data x_mm (%d) != detected x_mm: (%d)\n", + sensor->x_mm, x_mm); + + if (sensor->y_mm && sensor->y_mm != y_mm) + dev_warn(&fn->dev, + "platform data y_mm (%d) != detected y_mm: (%d)\n", + sensor->y_mm, y_mm); + + sensor->x_mm = x_mm; + sensor->y_mm = y_mm; + rmi_dbg(RMI_DEBUG_FN, &fn->dev, "%s: x_mm: %d y_mm: %d\n", __func__, sensor->x_mm, sensor->y_mm); return 0; } static void rmi_f12_process_objects(struct f12_data *f12, u8 *data1, u32 size) { -- 2.53.0
