Commit ce363f0d authored by Nick Dyer's avatar Nick Dyer Committed by Dmitry Torokhov
Browse files

Input: synaptics-rmi4 - add sysfs interfaces for hardware IDs 



These attributes provide various bits of information which may be enumerated
under the RMI4 protocol to user space.

This may be useful for displaying the particular version which is in use, or
selecting the correct firmware to flash.

Signed-off-by: default avatarNick Dyer <nick@shmanahar.org>
Tested-by: default avatarChris Healy <cphealy@gmail.com>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 5a89916d

drivers/input/rmi4/rmi_driver.c

+1 −1
Original line number Diff line number Diff line
@@ -365,7 +365,7 @@ static void rmi_driver_set_input_name(struct rmi_device *rmi_dev, 
				struct input_dev *input)

{

	struct rmi_driver_data *data = dev_get_drvdata(&rmi_dev->dev);

	char *device_name = rmi_f01_get_product_ID(data->f01_container);

	const char *device_name = rmi_f01_get_product_ID(data->f01_container);

	char *name;



	name = devm_kasprintf(&rmi_dev->dev, GFP_KERNEL,

drivers/input/rmi4/rmi_driver.h

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ int rmi_init_functions(struct rmi_driver_data *data); 
int rmi_initial_reset(struct rmi_device *rmi_dev, void *ctx,

		      const struct pdt_entry *pdt);



char *rmi_f01_get_product_ID(struct rmi_function *fn);

const char *rmi_f01_get_product_ID(struct rmi_function *fn);



#ifdef CONFIG_RMI4_F34

int rmi_f34_create_sysfs(struct rmi_device *rmi_dev);

drivers/input/rmi4/rmi_f01.c

+102 −2
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <linux/slab.h>

#include <linux/uaccess.h>

#include <linux/of.h>

#include <asm/unaligned.h>

#include "rmi_driver.h"



#define RMI_PRODUCT_ID_LENGTH    10
@@ -55,6 +56,7 @@ struct f01_basic_properties { 
	u8 product_id[RMI_PRODUCT_ID_LENGTH + 1];

	u16 productinfo;

	u32 firmware_id;

	u32 package_id;

};



/* F01 device status bits */
@@ -221,8 +223,19 @@ static int rmi_f01_read_properties(struct rmi_device *rmi_dev, 
			has_build_id_query = !!(queries[0] & BIT(1));

		}



		if (has_package_id_query)

		if (has_package_id_query) {

			ret = rmi_read_block(rmi_dev, prod_info_addr,

					     queries, sizeof(__le64));

			if (ret) {

				dev_err(&rmi_dev->dev,

					"Failed to read package info: %d\n",

					ret);

				return ret;

			}



			props->package_id = get_unaligned_le64(queries);

			prod_info_addr++;

		}



		if (has_build_id_query) {

			ret = rmi_read_block(rmi_dev, prod_info_addr, queries,
@@ -242,13 +255,90 @@ static int rmi_f01_read_properties(struct rmi_device *rmi_dev, 
	return 0;

}



char *rmi_f01_get_product_ID(struct rmi_function *fn)

const char *rmi_f01_get_product_ID(struct rmi_function *fn)

{

	struct f01_data *f01 = dev_get_drvdata(&fn->dev);



	return f01->properties.product_id;

}



static ssize_t rmi_driver_manufacturer_id_show(struct device *dev,

					       struct device_attribute *dattr,

					       char *buf)

{

	struct rmi_driver_data *data = dev_get_drvdata(dev);

	struct f01_data *f01 = dev_get_drvdata(&data->f01_container->dev);



	return scnprintf(buf, PAGE_SIZE, "%d\n",

			 f01->properties.manufacturer_id);

}



static DEVICE_ATTR(manufacturer_id, 0444,

		   rmi_driver_manufacturer_id_show, NULL);



static ssize_t rmi_driver_dom_show(struct device *dev,

				   struct device_attribute *dattr, char *buf)

{

	struct rmi_driver_data *data = dev_get_drvdata(dev);

	struct f01_data *f01 = dev_get_drvdata(&data->f01_container->dev);



	return scnprintf(buf, PAGE_SIZE, "%s\n", f01->properties.dom);

}



static DEVICE_ATTR(date_of_manufacture, 0444, rmi_driver_dom_show, NULL);



static ssize_t rmi_driver_product_id_show(struct device *dev,

					  struct device_attribute *dattr,

					  char *buf)

{

	struct rmi_driver_data *data = dev_get_drvdata(dev);

	struct f01_data *f01 = dev_get_drvdata(&data->f01_container->dev);



	return scnprintf(buf, PAGE_SIZE, "%s\n", f01->properties.product_id);

}



static DEVICE_ATTR(product_id, 0444, rmi_driver_product_id_show, NULL);



static ssize_t rmi_driver_firmware_id_show(struct device *dev,

					   struct device_attribute *dattr,

					   char *buf)

{

	struct rmi_driver_data *data = dev_get_drvdata(dev);

	struct f01_data *f01 = dev_get_drvdata(&data->f01_container->dev);



	return scnprintf(buf, PAGE_SIZE, "%d\n", f01->properties.firmware_id);

}



static DEVICE_ATTR(firmware_id, 0444, rmi_driver_firmware_id_show, NULL);



static ssize_t rmi_driver_package_id_show(struct device *dev,

					  struct device_attribute *dattr,

					  char *buf)

{

	struct rmi_driver_data *data = dev_get_drvdata(dev);

	struct f01_data *f01 = dev_get_drvdata(&data->f01_container->dev);



	u32 package_id = f01->properties.package_id;



	return scnprintf(buf, PAGE_SIZE, "%04x.%04x\n",

			 package_id & 0xffff, (package_id >> 16) & 0xffff);

}



static DEVICE_ATTR(package_id, 0444, rmi_driver_package_id_show, NULL);



static struct attribute *rmi_f01_attrs[] = {

	&dev_attr_manufacturer_id.attr,

	&dev_attr_date_of_manufacture.attr,

	&dev_attr_product_id.attr,

	&dev_attr_firmware_id.attr,

	&dev_attr_package_id.attr,

	NULL

};



static struct attribute_group rmi_f01_attr_group = {

	.attrs = rmi_f01_attrs,

};



#ifdef CONFIG_OF

static int rmi_f01_of_probe(struct device *dev,

				struct rmi_device_platform_data *pdata)
@@ -481,9 +571,18 @@ static int rmi_f01_probe(struct rmi_function *fn) 


	dev_set_drvdata(&fn->dev, f01);



	error = sysfs_create_group(&fn->rmi_dev->dev.kobj, &rmi_f01_attr_group);

	if (error)

		dev_warn(&fn->dev, "Failed to create sysfs group: %d\n", error);



	return 0;

}



static void rmi_f01_remove(struct rmi_function *fn)

{

	sysfs_remove_group(&fn->rmi_dev->dev.kobj, &rmi_f01_attr_group);

}



static int rmi_f01_config(struct rmi_function *fn)

{

	struct f01_data *f01 = dev_get_drvdata(&fn->dev);
@@ -623,6 +722,7 @@ struct rmi_function_handler rmi_f01_handler = { 
	},

	.func		= 0x01,

	.probe		= rmi_f01_probe,

	.remove		= rmi_f01_remove,

	.config		= rmi_f01_config,

	.attention	= rmi_f01_attention,

	.suspend	= rmi_f01_suspend,

drivers/input/rmi4/rmi_f34.c

+48 −0
Original line number Diff line number Diff line
@@ -301,6 +301,52 @@ static int rmi_f34_status(struct rmi_function *fn) 
	return f34->update_status;

}



static ssize_t rmi_driver_bootloader_id_show(struct device *dev,

					     struct device_attribute *dattr,

					     char *buf)

{

	struct rmi_driver_data *data = dev_get_drvdata(dev);

	struct rmi_function *fn = data->f34_container;

	struct f34_data *f34;



	if (fn) {

		f34 = dev_get_drvdata(&fn->dev);



		if (f34->bl_version == 5)

			return scnprintf(buf, PAGE_SIZE, "%c%c\n",

					 f34->bootloader_id[0],

					 f34->bootloader_id[1]);

		else

			return scnprintf(buf, PAGE_SIZE, "V%d.%d\n",

					 f34->bootloader_id[1],

					 f34->bootloader_id[0]);

	}



	return 0;

}



static DEVICE_ATTR(bootloader_id, 0444, rmi_driver_bootloader_id_show, NULL);



static ssize_t rmi_driver_configuration_id_show(struct device *dev,

						struct device_attribute *dattr,

						char *buf)

{

	struct rmi_driver_data *data = dev_get_drvdata(dev);

	struct rmi_function *fn = data->f34_container;

	struct f34_data *f34;



	if (fn) {

		f34 = dev_get_drvdata(&fn->dev);



		return scnprintf(buf, PAGE_SIZE, "%s\n", f34->configuration_id);

	}



	return 0;

}



static DEVICE_ATTR(configuration_id, 0444,

		   rmi_driver_configuration_id_show, NULL);



static int rmi_firmware_update(struct rmi_driver_data *data,

			       const struct firmware *fw)

{
@@ -452,6 +498,8 @@ static DEVICE_ATTR(update_fw_status, 0444, 
		   rmi_driver_update_fw_status_show, NULL);



static struct attribute *rmi_firmware_attrs[] = {

	&dev_attr_bootloader_id.attr,

	&dev_attr_configuration_id.attr,

	&dev_attr_update_fw.attr,

	&dev_attr_update_fw_status.attr,

	NULL

CRA Git | Maintained and supported by SUSTech CRA and CCSE