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

Commit d0c1d15f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 

Pull input updates from Dmitry Torokhov:
 "Just a fix up for the firmware handling to the Silead driver (which is
  a new driver in this release)"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: silead_gsl1680 - use "silead/" prefix for firmware loading
  Input: silead_gsl1680 - document firmware-name, fix implementation
parents 4ee69866 4af2ff91

Documentation/devicetree/bindings/input/touchscreen/silead_gsl1680.txt

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ Required properties: 
- touchscreen-size-y	  : See touchscreen.txt



Optional properties:

- firmware-name		  : File basename (string) for board specific firmware

- touchscreen-inverted-x  : See touchscreen.txt

- touchscreen-inverted-y  : See touchscreen.txt

- touchscreen-swapped-x-y : See touchscreen.txt

drivers/input/touchscreen/silead.c

+9 −7
Original line number Diff line number Diff line
@@ -390,9 +390,10 @@ static void silead_ts_read_props(struct i2c_client *client) 
		data->max_fingers = 5; /* Most devices handle up-to 5 fingers */

	}



	error = device_property_read_string(dev, "touchscreen-fw-name", &str);

	error = device_property_read_string(dev, "firmware-name", &str);

	if (!error)

		snprintf(data->fw_name, sizeof(data->fw_name), "%s", str);

		snprintf(data->fw_name, sizeof(data->fw_name),

			 "silead/%s", str);

	else

		dev_dbg(dev, "Firmware file name read error. Using default.");

}
@@ -410,14 +411,14 @@ static int silead_ts_set_default_fw_name(struct silead_ts_data *data, 
		if (!acpi_id)

			return -ENODEV;



		snprintf(data->fw_name, sizeof(data->fw_name), "%s.fw",

			acpi_id->id);

		snprintf(data->fw_name, sizeof(data->fw_name),

			 "silead/%s.fw", acpi_id->id);



		for (i = 0; i < strlen(data->fw_name); i++)

			data->fw_name[i] = tolower(data->fw_name[i]);

	} else {

		snprintf(data->fw_name, sizeof(data->fw_name), "%s.fw",

			id->name);

		snprintf(data->fw_name, sizeof(data->fw_name),

			 "silead/%s.fw", id->name);

	}



	return 0;
@@ -426,7 +427,8 @@ static int silead_ts_set_default_fw_name(struct silead_ts_data *data, 
static int silead_ts_set_default_fw_name(struct silead_ts_data *data,

					 const struct i2c_device_id *id)

{

	snprintf(data->fw_name, sizeof(data->fw_name), "%s.fw", id->name);

	snprintf(data->fw_name, sizeof(data->fw_name),

		 "silead/%s.fw", id->name);

	return 0;

}

#endif