* [PATCH] input synaptics-rmi4: move rmi_f01 query register parsing to its own function
@ 2014-01-08 1:02 Christopher Heiny
2014-01-09 8:18 ` Dmitry Torokhov
0 siblings, 1 reply; 2+ messages in thread
From: Christopher Heiny @ 2014-01-08 1:02 UTC (permalink / raw)
To: Dmitry Torokhov
Cc: Linux Input, Christopher Heiny, Andrew Duggan, Vincent Huang,
Vivian Ly, Daniel Rosenberg, Jean Delvare, Joerie de Gram,
Linus Walleij, Benjamin Tissoires
In the near future, query register parsing is going to get a lot more
complicated. It's also going to be needed by the reflash code. Now is the
time to move this from the F01 initialization into its own function,
while the code is still fairly simple.
Signed-off-by: Christopher Heiny <cheiny@synaptics.com>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: Benjamin Tissoires <benjamin.tissoires@redhat.com>
---
drivers/input/rmi4/rmi_f01.c | 71 +++++++++++++++++++++++++++-----------------
1 file changed, 43 insertions(+), 28 deletions(-)
diff --git a/drivers/input/rmi4/rmi_f01.c b/drivers/input/rmi4/rmi_f01.c
index d547633..1cb11ea 100644
--- a/drivers/input/rmi4/rmi_f01.c
+++ b/drivers/input/rmi4/rmi_f01.c
@@ -167,6 +167,46 @@ static int rmi_f01_alloc_memory(struct rmi_function *fn,
return 0;
}
+static int rmi_f01_read_properties(struct rmi_device *rmi_dev,
+ u16 query_base_addr,
+ struct f01_basic_properties *props)
+{
+ u8 basic_query[RMI_F01_BASIC_QUERY_LEN];
+ int error;
+
+ error = rmi_read_block(rmi_dev, query_base_addr,
+ basic_query, sizeof(basic_query));
+ if (error < 0) {
+ dev_err(&rmi_dev->dev, "Failed to read device query registers.\n");
+ return error;
+ }
+
+ /* Now parse what we got */
+ props->manufacturer_id = basic_query[0];
+
+ props->has_lts = basic_query[1] & RMI_F01_QRY1_HAS_LTS;
+ props->has_adjustable_doze =
+ basic_query[1] & RMI_F01_QRY1_HAS_ADJ_DOZE;
+ props->has_adjustable_doze_holdoff =
+ basic_query[1] & RMI_F01_QRY1_HAS_ADJ_DOZE_HOFF;
+
+ snprintf(props->dom, sizeof(props->dom),
+ "20%02x%02x%02x",
+ basic_query[5] & RMI_F01_QRY5_YEAR_MASK,
+ basic_query[6] & RMI_F01_QRY6_MONTH_MASK,
+ basic_query[7] & RMI_F01_QRY7_DAY_MASK);
+
+ memcpy(props->product_id, &basic_query[11],
+ RMI_PRODUCT_ID_LENGTH);
+ props->product_id[RMI_PRODUCT_ID_LENGTH] = '\0';
+
+ props->productinfo =
+ ((basic_query[2] & RMI_F01_QRY2_PRODINFO_MASK) << 7) |
+ (basic_query[3] & RMI_F01_QRY2_PRODINFO_MASK);
+
+ return 0;
+}
+
static int rmi_f01_initialize(struct rmi_function *fn)
{
u8 temp;
@@ -176,7 +216,6 @@ static int rmi_f01_initialize(struct rmi_function *fn)
struct rmi_driver_data *driver_data = dev_get_drvdata(&rmi_dev->dev);
struct f01_data *data = fn->data;
struct rmi_device_platform_data *pdata = to_rmi_platform_data(rmi_dev);
- u8 basic_query[RMI_F01_BASIC_QUERY_LEN];
mutex_init(&data->control_mutex);
@@ -248,36 +287,12 @@ static int rmi_f01_initialize(struct rmi_function *fn)
return error;
}
- error = rmi_read_block(rmi_dev, fn->fd.query_base_addr,
- basic_query, sizeof(basic_query));
+ error = rmi_f01_read_properties(rmi_dev, fn->fd.query_base_addr,
+ &data->properties);
if (error < 0) {
- dev_err(&fn->dev, "Failed to read device query registers.\n");
+ dev_err(&fn->dev, "Failed to read F01 properties.\n");
return error;
}
-
- /* Now parse what we got */
- data->properties.manufacturer_id = basic_query[0];
-
- data->properties.has_lts = basic_query[1] & RMI_F01_QRY1_HAS_LTS;
- data->properties.has_adjustable_doze =
- basic_query[1] & RMI_F01_QRY1_HAS_ADJ_DOZE;
- data->properties.has_adjustable_doze_holdoff =
- basic_query[1] & RMI_F01_QRY1_HAS_ADJ_DOZE_HOFF;
-
- snprintf(data->properties.dom, sizeof(data->properties.dom),
- "20%02x%02x%02x",
- basic_query[5] & RMI_F01_QRY5_YEAR_MASK,
- basic_query[6] & RMI_F01_QRY6_MONTH_MASK,
- basic_query[7] & RMI_F01_QRY7_DAY_MASK);
-
- memcpy(data->properties.product_id, &basic_query[11],
- RMI_PRODUCT_ID_LENGTH);
- data->properties.product_id[RMI_PRODUCT_ID_LENGTH] = '\0';
-
- data->properties.productinfo =
- ((basic_query[2] & RMI_F01_QRY2_PRODINFO_MASK) << 7) |
- (basic_query[3] & RMI_F01_QRY2_PRODINFO_MASK);
-
dev_info(&fn->dev, "found RMI device, manufacturer: %s, product: %s\n",
data->properties.manufacturer_id == 1 ?
"Synaptics" : "unknown",
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] input synaptics-rmi4: move rmi_f01 query register parsing to its own function
2014-01-08 1:02 [PATCH] input synaptics-rmi4: move rmi_f01 query register parsing to its own function Christopher Heiny
@ 2014-01-09 8:18 ` Dmitry Torokhov
0 siblings, 0 replies; 2+ messages in thread
From: Dmitry Torokhov @ 2014-01-09 8:18 UTC (permalink / raw)
To: Christopher Heiny
Cc: Linux Input, Andrew Duggan, Vincent Huang, Vivian Ly,
Daniel Rosenberg, Jean Delvare, Joerie de Gram, Linus Walleij,
Benjamin Tissoires
On Tue, Jan 07, 2014 at 05:02:10PM -0800, Christopher Heiny wrote:
> In the near future, query register parsing is going to get a lot more
> complicated. It's also going to be needed by the reflash code. Now is the
> time to move this from the F01 initialization into its own function,
> while the code is still fairly simple.
>
> Signed-off-by: Christopher Heiny <cheiny@synaptics.com>
> Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> Cc: Benjamin Tissoires <benjamin.tissoires@redhat.com>
>
Applied, thank you.
> ---
>
> drivers/input/rmi4/rmi_f01.c | 71 +++++++++++++++++++++++++++-----------------
> 1 file changed, 43 insertions(+), 28 deletions(-)
>
> diff --git a/drivers/input/rmi4/rmi_f01.c b/drivers/input/rmi4/rmi_f01.c
> index d547633..1cb11ea 100644
> --- a/drivers/input/rmi4/rmi_f01.c
> +++ b/drivers/input/rmi4/rmi_f01.c
> @@ -167,6 +167,46 @@ static int rmi_f01_alloc_memory(struct rmi_function *fn,
> return 0;
> }
>
> +static int rmi_f01_read_properties(struct rmi_device *rmi_dev,
> + u16 query_base_addr,
> + struct f01_basic_properties *props)
> +{
> + u8 basic_query[RMI_F01_BASIC_QUERY_LEN];
> + int error;
> +
> + error = rmi_read_block(rmi_dev, query_base_addr,
> + basic_query, sizeof(basic_query));
> + if (error < 0) {
> + dev_err(&rmi_dev->dev, "Failed to read device query registers.\n");
> + return error;
> + }
> +
> + /* Now parse what we got */
> + props->manufacturer_id = basic_query[0];
> +
> + props->has_lts = basic_query[1] & RMI_F01_QRY1_HAS_LTS;
> + props->has_adjustable_doze =
> + basic_query[1] & RMI_F01_QRY1_HAS_ADJ_DOZE;
> + props->has_adjustable_doze_holdoff =
> + basic_query[1] & RMI_F01_QRY1_HAS_ADJ_DOZE_HOFF;
> +
> + snprintf(props->dom, sizeof(props->dom),
> + "20%02x%02x%02x",
> + basic_query[5] & RMI_F01_QRY5_YEAR_MASK,
> + basic_query[6] & RMI_F01_QRY6_MONTH_MASK,
> + basic_query[7] & RMI_F01_QRY7_DAY_MASK);
> +
> + memcpy(props->product_id, &basic_query[11],
> + RMI_PRODUCT_ID_LENGTH);
> + props->product_id[RMI_PRODUCT_ID_LENGTH] = '\0';
> +
> + props->productinfo =
> + ((basic_query[2] & RMI_F01_QRY2_PRODINFO_MASK) << 7) |
> + (basic_query[3] & RMI_F01_QRY2_PRODINFO_MASK);
> +
> + return 0;
> +}
> +
> static int rmi_f01_initialize(struct rmi_function *fn)
> {
> u8 temp;
> @@ -176,7 +216,6 @@ static int rmi_f01_initialize(struct rmi_function *fn)
> struct rmi_driver_data *driver_data = dev_get_drvdata(&rmi_dev->dev);
> struct f01_data *data = fn->data;
> struct rmi_device_platform_data *pdata = to_rmi_platform_data(rmi_dev);
> - u8 basic_query[RMI_F01_BASIC_QUERY_LEN];
>
> mutex_init(&data->control_mutex);
>
> @@ -248,36 +287,12 @@ static int rmi_f01_initialize(struct rmi_function *fn)
> return error;
> }
>
> - error = rmi_read_block(rmi_dev, fn->fd.query_base_addr,
> - basic_query, sizeof(basic_query));
> + error = rmi_f01_read_properties(rmi_dev, fn->fd.query_base_addr,
> + &data->properties);
> if (error < 0) {
> - dev_err(&fn->dev, "Failed to read device query registers.\n");
> + dev_err(&fn->dev, "Failed to read F01 properties.\n");
> return error;
> }
> -
> - /* Now parse what we got */
> - data->properties.manufacturer_id = basic_query[0];
> -
> - data->properties.has_lts = basic_query[1] & RMI_F01_QRY1_HAS_LTS;
> - data->properties.has_adjustable_doze =
> - basic_query[1] & RMI_F01_QRY1_HAS_ADJ_DOZE;
> - data->properties.has_adjustable_doze_holdoff =
> - basic_query[1] & RMI_F01_QRY1_HAS_ADJ_DOZE_HOFF;
> -
> - snprintf(data->properties.dom, sizeof(data->properties.dom),
> - "20%02x%02x%02x",
> - basic_query[5] & RMI_F01_QRY5_YEAR_MASK,
> - basic_query[6] & RMI_F01_QRY6_MONTH_MASK,
> - basic_query[7] & RMI_F01_QRY7_DAY_MASK);
> -
> - memcpy(data->properties.product_id, &basic_query[11],
> - RMI_PRODUCT_ID_LENGTH);
> - data->properties.product_id[RMI_PRODUCT_ID_LENGTH] = '\0';
> -
> - data->properties.productinfo =
> - ((basic_query[2] & RMI_F01_QRY2_PRODINFO_MASK) << 7) |
> - (basic_query[3] & RMI_F01_QRY2_PRODINFO_MASK);
> -
> dev_info(&fn->dev, "found RMI device, manufacturer: %s, product: %s\n",
> data->properties.manufacturer_id == 1 ?
> "Synaptics" : "unknown",
--
Dmitry
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-01-09 8:18 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-01-08 1:02 [PATCH] input synaptics-rmi4: move rmi_f01 query register parsing to its own function Christopher Heiny
2014-01-09 8:18 ` Dmitry Torokhov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).