Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 70c4d271 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "input: touchscreen: add option to ignore Focaltech family-id check"

parents 08a0dc89 e2a0394e

Documentation/devicetree/bindings/input/touchscreen/ft5x06-ts.txt

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ Optional properties: 
 - focaltech,fw-delay-era-flsh-ms : specify the erase flash delay in ms for firmware upgrade

 - focaltech,fw-auto-cal	: specify whether calibration is needed after firmware upgrade

 - focaltech,fw-vkey-support	: specify if virtual keys are supported through firmware

 - focaltech,ignore-id-check : specify ignore family-id check



Example:

	i2c@f9923000{

drivers/input/touchscreen/ft5x06_ts.c

+4 −1
Original line number Diff line number Diff line
@@ -1250,6 +1250,9 @@ static int ft5x06_parse_dt(struct device *dev, 
	pdata->fw_vkey_support = of_property_read_bool(np,

						"focaltech,fw-vkey-support");



	pdata->ignore_id_check = of_property_read_bool(np,

						"focaltech,ignore-id-check");



	rc = of_property_read_u32(np, "focaltech,family-id", &temp_val);

	if (!rc)

		pdata->family_id = temp_val;
@@ -1450,7 +1453,7 @@ static int ft5x06_ts_probe(struct i2c_client *client, 


	dev_info(&client->dev, "Device ID = 0x%x\n", reg_value);



	if (pdata->family_id != reg_value) {

	if ((pdata->family_id != reg_value) && (!pdata->ignore_id_check)) {

		dev_err(&client->dev, "%s:Unsupported controller\n", __func__);

		goto free_reset_gpio;

	}

include/linux/input/ft5x06_ts.h

+1 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ struct ft5x06_ts_platform_data { 
	bool fw_vkey_support;

	bool no_force_update;

	bool i2c_pull_up;

	bool ignore_id_check;

	int (*power_init) (bool);

	int (*power_on) (bool);

};