Fix V8 device information issue

Commit Message

Masaki Ota March 10, 2017, 6:41 a.m. UTC

From: Masaki Ota <[e-mail]>
-Fix the issue that V8(E7=73 03 28) devices are not assined correct device information from OTP.
-Specified correct OTP bit for the V8 device setting of Button pad, DualPoint and Touchpad size.

Signed-off-by: Masaki Ota <[e-mail]>
---
 drivers/input/mouse/alps.c | 74 ++++++++++++++++++++++++++++++++++++----------
 drivers/input/mouse/alps.h |  6 ++++
 2 files changed, 64 insertions(+), 16 deletions(-)

Comments

Pali Rohár March 10, 2017, 6:46 p.m. UTC | #1

Hi! I have just two notes:

On Friday 10 March 2017 07:41:47 Masaki Ota wrote:
...
> +		x_phys = x_pitch * (num_x_electrode - 1); /* In 0.1 mm units */
> +		y_phys = y_pitch * (num_y_electrode - 1); /* In 0.1 mm units */
...
> +		priv->x_res = priv->x_max * 10 / x_phys; /* units / mm */
> +		priv->y_res = priv->y_max * 10 / y_phys; /* units / mm */
> +
> +	} else {
...
> +		x_phys = x_pitch * (num_x_electrode - 1); /* In 0.1 mm units */
> +		y_phys = y_pitch * (num_y_electrode - 1); /* In 0.1 mm units */
> +
> +		priv->x_res = priv->x_max * 10 / x_phys; /* units / mm */
> +		priv->y_res = priv->y_max * 10 / y_phys; /* units / mm */

Looks like above 4 lines are same in both if { } and else { } blocks.
So it can be moved outside of if blocks.

> +	}
>  	return 0;
>  }
>  
> @@ -2490,7 +2515,10 @@ static int alps_update_btn_info_ss4_v2(unsigned char otp[][4],
>  {
>  	unsigned char is_btnless;
>  
> -	is_btnless = (otp[1][1] >> 3) & 0x01;
> +	if (priv->dev_id[2] == 0x28)

This check "dev_id[2] == 0x28" is used on more places. What about
introducing some flag or some boolean macro? Check "dev_id[2] == 0x28"
is magical does not say anything what it is doing...

Patch

diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
index e761955..462871c 100644
--- a/drivers/input/mouse/alps.c
+++ b/drivers/input/mouse/alps.c
@@ -2467,21 +2467,46 @@  static int alps_update_device_area_ss4_v2(unsigned char otp[][4],
 	int num_y_electrode;
 	int x_pitch, y_pitch, x_phys, y_phys;
 
-	num_x_electrode = SS4_NUMSENSOR_XOFFSET + (otp[1][0] & 0x0F);
-	num_y_electrode = SS4_NUMSENSOR_YOFFSET + ((otp[1][0] >> 4) & 0x0F);
+	if (priv->dev_id[2] == 0x28) {
+		num_x_electrode =
+			SS4PLUS_NUMSENSOR_XOFFSET + (otp[0][2] & 0x0F);
+		num_y_electrode =
+			SS4PLUS_NUMSENSOR_YOFFSET + ((otp[0][2] >> 4) & 0x0F);
 
-	priv->x_max = (num_x_electrode - 1) * SS4_COUNT_PER_ELECTRODE;
-	priv->y_max = (num_y_electrode - 1) * SS4_COUNT_PER_ELECTRODE;
+		priv->x_max =
+			(num_x_electrode - 1) * SS4PLUS_COUNT_PER_ELECTRODE;
+		priv->y_max =
+			(num_y_electrode - 1) * SS4PLUS_COUNT_PER_ELECTRODE;
 
-	x_pitch = ((otp[1][2] >> 2) & 0x07) + SS4_MIN_PITCH_MM;
-	y_pitch = ((otp[1][2] >> 5) & 0x07) + SS4_MIN_PITCH_MM;
+		x_pitch = (otp[0][1] & 0x0F) + SS4PLUS_MIN_PITCH_MM;
+		y_pitch = ((otp[0][1] >> 4) & 0x0F) + SS4PLUS_MIN_PITCH_MM;
 
-	x_phys = x_pitch * (num_x_electrode - 1); /* In 0.1 mm units */
-	y_phys = y_pitch * (num_y_electrode - 1); /* In 0.1 mm units */
+		x_phys = x_pitch * (num_x_electrode - 1); /* In 0.1 mm units */
+		y_phys = y_pitch * (num_y_electrode - 1); /* In 0.1 mm units */
 
-	priv->x_res = priv->x_max * 10 / x_phys; /* units / mm */
-	priv->y_res = priv->y_max * 10 / y_phys; /* units / mm */
+		priv->x_res = priv->x_max * 10 / x_phys; /* units / mm */
+		priv->y_res = priv->y_max * 10 / y_phys; /* units / mm */
+
+	} else {
+		num_x_electrode =
+			SS4_NUMSENSOR_XOFFSET + (otp[1][0] & 0x0F);
+		num_y_electrode =
+			SS4_NUMSENSOR_YOFFSET + ((otp[1][0] >> 4) & 0x0F);
+
+		priv->x_max =
+			(num_x_electrode - 1) * SS4_COUNT_PER_ELECTRODE;
+		priv->y_max =
+			(num_y_electrode - 1) * SS4_COUNT_PER_ELECTRODE;
+
+		x_pitch = ((otp[1][2] >> 2) & 0x07) + SS4_MIN_PITCH_MM;
+		y_pitch = ((otp[1][2] >> 5) & 0x07) + SS4_MIN_PITCH_MM;
 
+		x_phys = x_pitch * (num_x_electrode - 1); /* In 0.1 mm units */
+		y_phys = y_pitch * (num_y_electrode - 1); /* In 0.1 mm units */
+
+		priv->x_res = priv->x_max * 10 / x_phys; /* units / mm */
+		priv->y_res = priv->y_max * 10 / y_phys; /* units / mm */
+	}
 	return 0;
 }
 
@@ -2490,7 +2515,10 @@  static int alps_update_btn_info_ss4_v2(unsigned char otp[][4],
 {
 	unsigned char is_btnless;
 
-	is_btnless = (otp[1][1] >> 3) & 0x01;
+	if (priv->dev_id[2] == 0x28)
+		is_btnless = (otp[1][0] >> 1) & 0x01;
+	else
+		is_btnless = (otp[1][1] >> 3) & 0x01;
 
 	if (is_btnless)
 		priv->flags |= ALPS_BUTTONPAD;
@@ -2498,6 +2526,21 @@  static int alps_update_btn_info_ss4_v2(unsigned char otp[][4],
 	return 0;
 }
 
+static int alps_update_dual_info_ss4_v2(unsigned char otp[][4],
+				       struct alps_data *priv)
+{
+	unsigned char is_dual = 0;
+
+	if (priv->dev_id[2] == 0x28)
+		is_dual = (otp[0][0] >> 4) & 0x01;
+
+	if (is_dual)
+		priv->flags |= ALPS_DUALPOINT |
+					ALPS_DUALPOINT_WITH_PRESSURE;
+
+	return 0;
+}
+
 static int alps_set_defaults_ss4_v2(struct psmouse *psmouse,
 				    struct alps_data *priv)
 {
@@ -2513,6 +2556,8 @@  static int alps_set_defaults_ss4_v2(struct psmouse *psmouse,
 
 	alps_update_btn_info_ss4_v2(otp, priv);
 
+	alps_update_dual_info_ss4_v2(otp, priv);
+
 	return 0;
 }
 
@@ -2758,10 +2803,6 @@  static int alps_set_protocol(struct psmouse *psmouse,
 		if (alps_set_defaults_ss4_v2(psmouse, priv))
 			return -EIO;
 
-		if (priv->fw_ver[1] == 0x1)
-			priv->flags |= ALPS_DUALPOINT |
-					ALPS_DUALPOINT_WITH_PRESSURE;
-
 		break;
 	}
 
@@ -2850,7 +2891,8 @@  static int alps_identify(struct psmouse *psmouse, struct alps_data *priv)
 	}
 
 	if (priv) {
-		/* Save the Firmware version */
+		/* Save Device ID and Firmware version */
+		memcpy(priv->dev_id, e7, 3);
 		memcpy(priv->fw_ver, ec, 3);
 		error = alps_set_protocol(psmouse, priv, protocol);
 		if (error)
diff --git a/drivers/input/mouse/alps.h b/drivers/input/mouse/alps.h
index dea3163..f085c96 100644
--- a/drivers/input/mouse/alps.h
+++ b/drivers/input/mouse/alps.h
@@ -55,6 +55,11 @@  enum SS4_PACKET_ID {
 
 #define SS4_MASK_NORMAL_BUTTONS		0x07
 
+#define SS4PLUS_COUNT_PER_ELECTRODE	128
+#define SS4PLUS_NUMSENSOR_XOFFSET	16
+#define SS4PLUS_NUMSENSOR_YOFFSET	5
+#define SS4PLUS_MIN_PITCH_MM		37
+
 #define SS4_IS_IDLE_V2(_b)	(((_b[0]) == 0x18) &&		\
 				 ((_b[1]) == 0x10) &&		\
 				 ((_b[2]) == 0x00) &&		\
@@ -279,6 +284,7 @@  struct alps_data {
 	int addr_command;
 	u16 proto_version;
 	u8 byte0, mask0;
+	u8 dev_id[3];
 	u8 fw_ver[3];
 	int flags;
 	int x_max;