diff mbox series

[v3,1/2] Input: synaptics-rmi4 - support bootloader v8 in f34v7

Message ID 20200930225046.173190-2-Jason@zx2c4.com (mailing list archive)
State Accepted
Commit a6977d758fed511a9977639465689785ac398b01
Headers show
Series Support trackpoint and touchpad in Thinkpad P1 gen 2 / X1E gen 2 | expand

Commit Message

Jason A. Donenfeld Sept. 30, 2020, 10:50 p.m. UTC 
With the recent addition of the F3A support, we can now accept
bootloader v8, which will help support recent Thinkpads.

Acked-by: Lyude Paul <lyude@redhat.com>
Cc: Vincent Huang <vincent.huang@tw.synaptics.com>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---
 drivers/input/rmi4/rmi_f34v7.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

Comments

Dmitry Torokhov Oct. 5, 2020, 2:50 a.m. UTC | #1 
On Thu, Oct 01, 2020 at 12:50:45AM +0200, Jason A. Donenfeld wrote:
> With the recent addition of the F3A support, we can now accept
> bootloader v8, which will help support recent Thinkpads.
> 
> Acked-by: Lyude Paul <lyude@redhat.com>
> Cc: Vincent Huang <vincent.huang@tw.synaptics.com>
> Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

Applied, thank you.
diff mbox series

Patch

diff --git a/drivers/input/rmi4/rmi_f34v7.c b/drivers/input/rmi4/rmi_f34v7.c
index 74f7c6f214ff..8cfaa2f19ed5 100644
--- a/drivers/input/rmi4/rmi_f34v7.c
+++ b/drivers/input/rmi4/rmi_f34v7.c
@@ -1364,9 +1364,12 @@  int rmi_f34v7_probe(struct f34_data *f34)
 		f34->bl_version = 6;
 	} else if (f34->bootloader_id[1] == 7) {
 		f34->bl_version = 7;
+	} else if (f34->bootloader_id[1] == 8) {
+		f34->bl_version = 8;
 	} else {
-		dev_err(&f34->fn->dev, "%s: Unrecognized bootloader version\n",
-				__func__);
+		dev_err(&f34->fn->dev, "%s: Unrecognized bootloader version: %d (%c) %d (%c)\n",
+				__func__, f34->bootloader_id[0], f34->bootloader_id[0],
+				f34->bootloader_id[1], f34->bootloader_id[1]);
 		return -EINVAL;
 	}