|
|
@ -1,7 +1,7 @@
|
|
|
|
From 41aff18e80184e63b3274f4270bccd1d771e1b01 Mon Sep 17 00:00:00 2001
|
|
|
|
From c93b8d108a9af691cf7309f16bac0d8ce87b86f4 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Dorian Stoll <dorian.stoll@tmsp.io>
|
|
|
|
From: Dorian Stoll <dorian.stoll@tmsp.io>
|
|
|
|
Date: Mon, 27 Jan 2020 21:16:20 +0100
|
|
|
|
Date: Mon, 27 Jan 2020 21:16:20 +0100
|
|
|
|
Subject: [PATCH 6/6] ipts
|
|
|
|
Subject: [PATCH 5/5] ipts
|
|
|
|
|
|
|
|
|
|
|
|
---
|
|
|
|
---
|
|
|
|
drivers/input/touchscreen/Kconfig | 2 +
|
|
|
|
drivers/input/touchscreen/Kconfig | 2 +
|
|
|
@ -76,7 +76,7 @@ Subject: [PATCH 6/6] ipts
|
|
|
|
create mode 100644 drivers/input/touchscreen/ipts/stylus.h
|
|
|
|
create mode 100644 drivers/input/touchscreen/ipts/stylus.h
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
|
|
|
|
diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
|
|
|
|
index c071f7c407b6..028ff55d779d 100644
|
|
|
|
index c071f7c407b61..028ff55d779d0 100644
|
|
|
|
--- a/drivers/input/touchscreen/Kconfig
|
|
|
|
--- a/drivers/input/touchscreen/Kconfig
|
|
|
|
+++ b/drivers/input/touchscreen/Kconfig
|
|
|
|
+++ b/drivers/input/touchscreen/Kconfig
|
|
|
|
@@ -1310,4 +1310,6 @@ config TOUCHSCREEN_IQS5XX
|
|
|
|
@@ -1310,4 +1310,6 @@ config TOUCHSCREEN_IQS5XX
|
|
|
@ -87,7 +87,7 @@ index c071f7c407b6..028ff55d779d 100644
|
|
|
|
+
|
|
|
|
+
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile
|
|
|
|
diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile
|
|
|
|
index 94c6162409b3..864f0e092ab6 100644
|
|
|
|
index 94c6162409b37..864f0e092ab67 100644
|
|
|
|
--- a/drivers/input/touchscreen/Makefile
|
|
|
|
--- a/drivers/input/touchscreen/Makefile
|
|
|
|
+++ b/drivers/input/touchscreen/Makefile
|
|
|
|
+++ b/drivers/input/touchscreen/Makefile
|
|
|
|
@@ -45,6 +45,7 @@ obj-$(CONFIG_TOUCHSCREEN_EXC3000) += exc3000.o
|
|
|
|
@@ -45,6 +45,7 @@ obj-$(CONFIG_TOUCHSCREEN_EXC3000) += exc3000.o
|
|
|
@ -100,7 +100,7 @@ index 94c6162409b3..864f0e092ab6 100644
|
|
|
|
obj-$(CONFIG_TOUCHSCREEN_INEXIO) += inexio.o
|
|
|
|
obj-$(CONFIG_TOUCHSCREEN_INEXIO) += inexio.o
|
|
|
|
diff --git a/drivers/input/touchscreen/ipts/Kconfig b/drivers/input/touchscreen/ipts/Kconfig
|
|
|
|
diff --git a/drivers/input/touchscreen/ipts/Kconfig b/drivers/input/touchscreen/ipts/Kconfig
|
|
|
|
new file mode 100644
|
|
|
|
new file mode 100644
|
|
|
|
index 000000000000..d3c530dafa94
|
|
|
|
index 0000000000000..d3c530dafa948
|
|
|
|
--- /dev/null
|
|
|
|
--- /dev/null
|
|
|
|
+++ b/drivers/input/touchscreen/ipts/Kconfig
|
|
|
|
+++ b/drivers/input/touchscreen/ipts/Kconfig
|
|
|
|
@@ -0,0 +1,16 @@
|
|
|
|
@@ -0,0 +1,16 @@
|
|
|
@ -122,7 +122,7 @@ index 000000000000..d3c530dafa94
|
|
|
|
+ module will be called ipts.
|
|
|
|
+ module will be called ipts.
|
|
|
|
diff --git a/drivers/input/touchscreen/ipts/Makefile b/drivers/input/touchscreen/ipts/Makefile
|
|
|
|
diff --git a/drivers/input/touchscreen/ipts/Makefile b/drivers/input/touchscreen/ipts/Makefile
|
|
|
|
new file mode 100644
|
|
|
|
new file mode 100644
|
|
|
|
index 000000000000..0f7c904e7317
|
|
|
|
index 0000000000000..0f7c904e73171
|
|
|
|
--- /dev/null
|
|
|
|
--- /dev/null
|
|
|
|
+++ b/drivers/input/touchscreen/ipts/Makefile
|
|
|
|
+++ b/drivers/input/touchscreen/ipts/Makefile
|
|
|
|
@@ -0,0 +1,17 @@
|
|
|
|
@@ -0,0 +1,17 @@
|
|
|
@ -145,7 +145,7 @@ index 000000000000..0f7c904e7317
|
|
|
|
+ipts-objs += stylus.o
|
|
|
|
+ipts-objs += stylus.o
|
|
|
|
diff --git a/drivers/input/touchscreen/ipts/context.h b/drivers/input/touchscreen/ipts/context.h
|
|
|
|
diff --git a/drivers/input/touchscreen/ipts/context.h b/drivers/input/touchscreen/ipts/context.h
|
|
|
|
new file mode 100644
|
|
|
|
new file mode 100644
|
|
|
|
index 000000000000..ab26552579a5
|
|
|
|
index 0000000000000..ab26552579a5c
|
|
|
|
--- /dev/null
|
|
|
|
--- /dev/null
|
|
|
|
+++ b/drivers/input/touchscreen/ipts/context.h
|
|
|
|
+++ b/drivers/input/touchscreen/ipts/context.h
|
|
|
|
@@ -0,0 +1,60 @@
|
|
|
|
@@ -0,0 +1,60 @@
|
|
|
@ -211,7 +211,7 @@ index 000000000000..ab26552579a5
|
|
|
|
+#endif /* _IPTS_CONTEXT_H_ */
|
|
|
|
+#endif /* _IPTS_CONTEXT_H_ */
|
|
|
|
diff --git a/drivers/input/touchscreen/ipts/control.c b/drivers/input/touchscreen/ipts/control.c
|
|
|
|
diff --git a/drivers/input/touchscreen/ipts/control.c b/drivers/input/touchscreen/ipts/control.c
|
|
|
|
new file mode 100644
|
|
|
|
new file mode 100644
|
|
|
|
index 000000000000..9179eca66558
|
|
|
|
index 0000000000000..9179eca665585
|
|
|
|
--- /dev/null
|
|
|
|
--- /dev/null
|
|
|
|
+++ b/drivers/input/touchscreen/ipts/control.c
|
|
|
|
+++ b/drivers/input/touchscreen/ipts/control.c
|
|
|
|
@@ -0,0 +1,94 @@
|
|
|
|
@@ -0,0 +1,94 @@
|
|
|
@ -311,7 +311,7 @@ index 000000000000..9179eca66558
|
|
|
|
+}
|
|
|
|
+}
|
|
|
|
diff --git a/drivers/input/touchscreen/ipts/control.h b/drivers/input/touchscreen/ipts/control.h
|
|
|
|
diff --git a/drivers/input/touchscreen/ipts/control.h b/drivers/input/touchscreen/ipts/control.h
|
|
|
|
new file mode 100644
|
|
|
|
new file mode 100644
|
|
|
|
index 000000000000..e57609c85d62
|
|
|
|
index 0000000000000..e57609c85d62a
|
|
|
|
--- /dev/null
|
|
|
|
--- /dev/null
|
|
|
|
+++ b/drivers/input/touchscreen/ipts/control.h
|
|
|
|
+++ b/drivers/input/touchscreen/ipts/control.h
|
|
|
|
@@ -0,0 +1,18 @@
|
|
|
|
@@ -0,0 +1,18 @@
|
|
|
@ -335,7 +335,7 @@ index 000000000000..e57609c85d62
|
|
|
|
+#endif /* _IPTS_CONTROL_H_ */
|
|
|
|
+#endif /* _IPTS_CONTROL_H_ */
|
|
|
|
diff --git a/drivers/input/touchscreen/ipts/data.c b/drivers/input/touchscreen/ipts/data.c
|
|
|
|
diff --git a/drivers/input/touchscreen/ipts/data.c b/drivers/input/touchscreen/ipts/data.c
|
|
|
|
new file mode 100644
|
|
|
|
new file mode 100644
|
|
|
|
index 000000000000..568bf04f7ea6
|
|
|
|
index 0000000000000..568bf04f7ea6e
|
|
|
|
--- /dev/null
|
|
|
|
--- /dev/null
|
|
|
|
+++ b/drivers/input/touchscreen/ipts/data.c
|
|
|
|
+++ b/drivers/input/touchscreen/ipts/data.c
|
|
|
|
@@ -0,0 +1,107 @@
|
|
|
|
@@ -0,0 +1,107 @@
|
|
|
@ -448,7 +448,7 @@ index 000000000000..568bf04f7ea6
|
|
|
|
+}
|
|
|
|
+}
|
|
|
|
diff --git a/drivers/input/touchscreen/ipts/data.h b/drivers/input/touchscreen/ipts/data.h
|
|
|
|
diff --git a/drivers/input/touchscreen/ipts/data.h b/drivers/input/touchscreen/ipts/data.h
|
|
|
|
new file mode 100644
|
|
|
|
new file mode 100644
|
|
|
|
index 000000000000..fa72c1be0945
|
|
|
|
index 0000000000000..fa72c1be09451
|
|
|
|
--- /dev/null
|
|
|
|
--- /dev/null
|
|
|
|
+++ b/drivers/input/touchscreen/ipts/data.h
|
|
|
|
+++ b/drivers/input/touchscreen/ipts/data.h
|
|
|
|
@@ -0,0 +1,12 @@
|
|
|
|
@@ -0,0 +1,12 @@
|
|
|
@ -466,7 +466,7 @@ index 000000000000..fa72c1be0945
|
|
|
|
+#endif /* _IPTS_DATA_H_ */
|
|
|
|
+#endif /* _IPTS_DATA_H_ */
|
|
|
|
diff --git a/drivers/input/touchscreen/ipts/hid.c b/drivers/input/touchscreen/ipts/hid.c
|
|
|
|
diff --git a/drivers/input/touchscreen/ipts/hid.c b/drivers/input/touchscreen/ipts/hid.c
|
|
|
|
new file mode 100644
|
|
|
|
new file mode 100644
|
|
|
|
index 000000000000..2642990b8c42
|
|
|
|
index 0000000000000..2642990b8c420
|
|
|
|
--- /dev/null
|
|
|
|
--- /dev/null
|
|
|
|
+++ b/drivers/input/touchscreen/ipts/hid.c
|
|
|
|
+++ b/drivers/input/touchscreen/ipts/hid.c
|
|
|
|
@@ -0,0 +1,38 @@
|
|
|
|
@@ -0,0 +1,38 @@
|
|
|
@ -510,7 +510,7 @@ index 000000000000..2642990b8c42
|
|
|
|
+}
|
|
|
|
+}
|
|
|
|
diff --git a/drivers/input/touchscreen/ipts/hid.h b/drivers/input/touchscreen/ipts/hid.h
|
|
|
|
diff --git a/drivers/input/touchscreen/ipts/hid.h b/drivers/input/touchscreen/ipts/hid.h
|
|
|
|
new file mode 100644
|
|
|
|
new file mode 100644
|
|
|
|
index 000000000000..e6cf38fce454
|
|
|
|
index 0000000000000..e6cf38fce4541
|
|
|
|
--- /dev/null
|
|
|
|
--- /dev/null
|
|
|
|
+++ b/drivers/input/touchscreen/ipts/hid.h
|
|
|
|
+++ b/drivers/input/touchscreen/ipts/hid.h
|
|
|
|
@@ -0,0 +1,13 @@
|
|
|
|
@@ -0,0 +1,13 @@
|
|
|
@ -529,7 +529,7 @@ index 000000000000..e6cf38fce454
|
|
|
|
+#endif /* _IPTS_HID_H_ */
|
|
|
|
+#endif /* _IPTS_HID_H_ */
|
|
|
|
diff --git a/drivers/input/touchscreen/ipts/init.c b/drivers/input/touchscreen/ipts/init.c
|
|
|
|
diff --git a/drivers/input/touchscreen/ipts/init.c b/drivers/input/touchscreen/ipts/init.c
|
|
|
|
new file mode 100644
|
|
|
|
new file mode 100644
|
|
|
|
index 000000000000..fb70d55542af
|
|
|
|
index 0000000000000..fb70d55542af7
|
|
|
|
--- /dev/null
|
|
|
|
--- /dev/null
|
|
|
|
+++ b/drivers/input/touchscreen/ipts/init.c
|
|
|
|
+++ b/drivers/input/touchscreen/ipts/init.c
|
|
|
|
@@ -0,0 +1,93 @@
|
|
|
|
@@ -0,0 +1,93 @@
|
|
|
@ -628,7 +628,7 @@ index 000000000000..fb70d55542af
|
|
|
|
+MODULE_LICENSE("GPL");
|
|
|
|
+MODULE_LICENSE("GPL");
|
|
|
|
diff --git a/drivers/input/touchscreen/ipts/math.c b/drivers/input/touchscreen/ipts/math.c
|
|
|
|
diff --git a/drivers/input/touchscreen/ipts/math.c b/drivers/input/touchscreen/ipts/math.c
|
|
|
|
new file mode 100644
|
|
|
|
new file mode 100644
|
|
|
|
index 000000000000..df956e5447e0
|
|
|
|
index 0000000000000..df956e5447e03
|
|
|
|
--- /dev/null
|
|
|
|
--- /dev/null
|
|
|
|
+++ b/drivers/input/touchscreen/ipts/math.c
|
|
|
|
+++ b/drivers/input/touchscreen/ipts/math.c
|
|
|
|
@@ -0,0 +1,103 @@
|
|
|
|
@@ -0,0 +1,103 @@
|
|
|
@ -737,7 +737,7 @@ index 000000000000..df956e5447e0
|
|
|
|
+}
|
|
|
|
+}
|
|
|
|
diff --git a/drivers/input/touchscreen/ipts/math.h b/drivers/input/touchscreen/ipts/math.h
|
|
|
|
diff --git a/drivers/input/touchscreen/ipts/math.h b/drivers/input/touchscreen/ipts/math.h
|
|
|
|
new file mode 100644
|
|
|
|
new file mode 100644
|
|
|
|
index 000000000000..8e831074ab60
|
|
|
|
index 0000000000000..8e831074ab60b
|
|
|
|
--- /dev/null
|
|
|
|
--- /dev/null
|
|
|
|
+++ b/drivers/input/touchscreen/ipts/math.h
|
|
|
|
+++ b/drivers/input/touchscreen/ipts/math.h
|
|
|
|
@@ -0,0 +1,21 @@
|
|
|
|
@@ -0,0 +1,21 @@
|
|
|
@ -764,7 +764,7 @@ index 000000000000..8e831074ab60
|
|
|
|
+#endif /* _IPTS_MATH_H_ */
|
|
|
|
+#endif /* _IPTS_MATH_H_ */
|
|
|
|
diff --git a/drivers/input/touchscreen/ipts/params.c b/drivers/input/touchscreen/ipts/params.c
|
|
|
|
diff --git a/drivers/input/touchscreen/ipts/params.c b/drivers/input/touchscreen/ipts/params.c
|
|
|
|
new file mode 100644
|
|
|
|
new file mode 100644
|
|
|
|
index 000000000000..6aa3f5cf1d76
|
|
|
|
index 0000000000000..6aa3f5cf1d762
|
|
|
|
--- /dev/null
|
|
|
|
--- /dev/null
|
|
|
|
+++ b/drivers/input/touchscreen/ipts/params.c
|
|
|
|
+++ b/drivers/input/touchscreen/ipts/params.c
|
|
|
|
@@ -0,0 +1,27 @@
|
|
|
|
@@ -0,0 +1,27 @@
|
|
|
@ -797,7 +797,7 @@ index 000000000000..6aa3f5cf1d76
|
|
|
|
+);
|
|
|
|
+);
|
|
|
|
diff --git a/drivers/input/touchscreen/ipts/params.h b/drivers/input/touchscreen/ipts/params.h
|
|
|
|
diff --git a/drivers/input/touchscreen/ipts/params.h b/drivers/input/touchscreen/ipts/params.h
|
|
|
|
new file mode 100644
|
|
|
|
new file mode 100644
|
|
|
|
index 000000000000..1f992a3bc21b
|
|
|
|
index 0000000000000..1f992a3bc21b9
|
|
|
|
--- /dev/null
|
|
|
|
--- /dev/null
|
|
|
|
+++ b/drivers/input/touchscreen/ipts/params.h
|
|
|
|
+++ b/drivers/input/touchscreen/ipts/params.h
|
|
|
|
@@ -0,0 +1,15 @@
|
|
|
|
@@ -0,0 +1,15 @@
|
|
|
@ -818,7 +818,7 @@ index 000000000000..1f992a3bc21b
|
|
|
|
+#endif /* _IPTS_PARAMS_H_ */
|
|
|
|
+#endif /* _IPTS_PARAMS_H_ */
|
|
|
|
diff --git a/drivers/input/touchscreen/ipts/payload.c b/drivers/input/touchscreen/ipts/payload.c
|
|
|
|
diff --git a/drivers/input/touchscreen/ipts/payload.c b/drivers/input/touchscreen/ipts/payload.c
|
|
|
|
new file mode 100644
|
|
|
|
new file mode 100644
|
|
|
|
index 000000000000..3572ddc0f2fb
|
|
|
|
index 0000000000000..3572ddc0f2fb0
|
|
|
|
--- /dev/null
|
|
|
|
--- /dev/null
|
|
|
|
+++ b/drivers/input/touchscreen/ipts/payload.c
|
|
|
|
+++ b/drivers/input/touchscreen/ipts/payload.c
|
|
|
|
@@ -0,0 +1,52 @@
|
|
|
|
@@ -0,0 +1,52 @@
|
|
|
@ -876,7 +876,7 @@ index 000000000000..3572ddc0f2fb
|
|
|
|
+}
|
|
|
|
+}
|
|
|
|
diff --git a/drivers/input/touchscreen/ipts/payload.h b/drivers/input/touchscreen/ipts/payload.h
|
|
|
|
diff --git a/drivers/input/touchscreen/ipts/payload.h b/drivers/input/touchscreen/ipts/payload.h
|
|
|
|
new file mode 100644
|
|
|
|
new file mode 100644
|
|
|
|
index 000000000000..6603714bb6fd
|
|
|
|
index 0000000000000..6603714bb6fd0
|
|
|
|
--- /dev/null
|
|
|
|
--- /dev/null
|
|
|
|
+++ b/drivers/input/touchscreen/ipts/payload.h
|
|
|
|
+++ b/drivers/input/touchscreen/ipts/payload.h
|
|
|
|
@@ -0,0 +1,14 @@
|
|
|
|
@@ -0,0 +1,14 @@
|
|
|
@ -896,7 +896,7 @@ index 000000000000..6603714bb6fd
|
|
|
|
+#endif /* _IPTS_PAYLOAD_H_ */
|
|
|
|
+#endif /* _IPTS_PAYLOAD_H_ */
|
|
|
|
diff --git a/drivers/input/touchscreen/ipts/protocol/commands.h b/drivers/input/touchscreen/ipts/protocol/commands.h
|
|
|
|
diff --git a/drivers/input/touchscreen/ipts/protocol/commands.h b/drivers/input/touchscreen/ipts/protocol/commands.h
|
|
|
|
new file mode 100644
|
|
|
|
new file mode 100644
|
|
|
|
index 000000000000..2533dfb13584
|
|
|
|
index 0000000000000..2533dfb13584a
|
|
|
|
--- /dev/null
|
|
|
|
--- /dev/null
|
|
|
|
+++ b/drivers/input/touchscreen/ipts/protocol/commands.h
|
|
|
|
+++ b/drivers/input/touchscreen/ipts/protocol/commands.h
|
|
|
|
@@ -0,0 +1,61 @@
|
|
|
|
@@ -0,0 +1,61 @@
|
|
|
@ -963,7 +963,7 @@ index 000000000000..2533dfb13584
|
|
|
|
+#endif /* _IPTS_PROTOCOL_COMMANDS_H_ */
|
|
|
|
+#endif /* _IPTS_PROTOCOL_COMMANDS_H_ */
|
|
|
|
diff --git a/drivers/input/touchscreen/ipts/protocol/data.h b/drivers/input/touchscreen/ipts/protocol/data.h
|
|
|
|
diff --git a/drivers/input/touchscreen/ipts/protocol/data.h b/drivers/input/touchscreen/ipts/protocol/data.h
|
|
|
|
new file mode 100644
|
|
|
|
new file mode 100644
|
|
|
|
index 000000000000..148e0545b2e4
|
|
|
|
index 0000000000000..148e0545b2e4e
|
|
|
|
--- /dev/null
|
|
|
|
--- /dev/null
|
|
|
|
+++ b/drivers/input/touchscreen/ipts/protocol/data.h
|
|
|
|
+++ b/drivers/input/touchscreen/ipts/protocol/data.h
|
|
|
|
@@ -0,0 +1,30 @@
|
|
|
|
@@ -0,0 +1,30 @@
|
|
|
@ -999,7 +999,7 @@ index 000000000000..148e0545b2e4
|
|
|
|
+#endif /* _IPTS_PROTOCOL_DATA_H_ */
|
|
|
|
+#endif /* _IPTS_PROTOCOL_DATA_H_ */
|
|
|
|
diff --git a/drivers/input/touchscreen/ipts/protocol/events.h b/drivers/input/touchscreen/ipts/protocol/events.h
|
|
|
|
diff --git a/drivers/input/touchscreen/ipts/protocol/events.h b/drivers/input/touchscreen/ipts/protocol/events.h
|
|
|
|
new file mode 100644
|
|
|
|
new file mode 100644
|
|
|
|
index 000000000000..f8b771f90bd2
|
|
|
|
index 0000000000000..f8b771f90bd2b
|
|
|
|
--- /dev/null
|
|
|
|
--- /dev/null
|
|
|
|
+++ b/drivers/input/touchscreen/ipts/protocol/events.h
|
|
|
|
+++ b/drivers/input/touchscreen/ipts/protocol/events.h
|
|
|
|
@@ -0,0 +1,29 @@
|
|
|
|
@@ -0,0 +1,29 @@
|
|
|
@ -1034,7 +1034,7 @@ index 000000000000..f8b771f90bd2
|
|
|
|
+#endif /* _IPTS_PROTOCOL_EVENTS_H_ */
|
|
|
|
+#endif /* _IPTS_PROTOCOL_EVENTS_H_ */
|
|
|
|
diff --git a/drivers/input/touchscreen/ipts/protocol/feedback.h b/drivers/input/touchscreen/ipts/protocol/feedback.h
|
|
|
|
diff --git a/drivers/input/touchscreen/ipts/protocol/feedback.h b/drivers/input/touchscreen/ipts/protocol/feedback.h
|
|
|
|
new file mode 100644
|
|
|
|
new file mode 100644
|
|
|
|
index 000000000000..8b3d8b689ee8
|
|
|
|
index 0000000000000..8b3d8b689ee83
|
|
|
|
--- /dev/null
|
|
|
|
--- /dev/null
|
|
|
|
+++ b/drivers/input/touchscreen/ipts/protocol/feedback.h
|
|
|
|
+++ b/drivers/input/touchscreen/ipts/protocol/feedback.h
|
|
|
|
@@ -0,0 +1,30 @@
|
|
|
|
@@ -0,0 +1,30 @@
|
|
|
@ -1070,7 +1070,7 @@ index 000000000000..8b3d8b689ee8
|
|
|
|
+#endif /* _IPTS_PROTOCOL_FEEDBACK_H_ */
|
|
|
|
+#endif /* _IPTS_PROTOCOL_FEEDBACK_H_ */
|
|
|
|
diff --git a/drivers/input/touchscreen/ipts/protocol/payload.h b/drivers/input/touchscreen/ipts/protocol/payload.h
|
|
|
|
diff --git a/drivers/input/touchscreen/ipts/protocol/payload.h b/drivers/input/touchscreen/ipts/protocol/payload.h
|
|
|
|
new file mode 100644
|
|
|
|
new file mode 100644
|
|
|
|
index 000000000000..f46da4ea81f2
|
|
|
|
index 0000000000000..f46da4ea81f25
|
|
|
|
--- /dev/null
|
|
|
|
--- /dev/null
|
|
|
|
+++ b/drivers/input/touchscreen/ipts/protocol/payload.h
|
|
|
|
+++ b/drivers/input/touchscreen/ipts/protocol/payload.h
|
|
|
|
@@ -0,0 +1,47 @@
|
|
|
|
@@ -0,0 +1,47 @@
|
|
|
@ -1123,7 +1123,7 @@ index 000000000000..f46da4ea81f2
|
|
|
|
+#endif /* _IPTS_PROTOCOL_PAYLOAD_H_ */
|
|
|
|
+#endif /* _IPTS_PROTOCOL_PAYLOAD_H_ */
|
|
|
|
diff --git a/drivers/input/touchscreen/ipts/protocol/responses.h b/drivers/input/touchscreen/ipts/protocol/responses.h
|
|
|
|
diff --git a/drivers/input/touchscreen/ipts/protocol/responses.h b/drivers/input/touchscreen/ipts/protocol/responses.h
|
|
|
|
new file mode 100644
|
|
|
|
new file mode 100644
|
|
|
|
index 000000000000..27153d82a5d6
|
|
|
|
index 0000000000000..27153d82a5d67
|
|
|
|
--- /dev/null
|
|
|
|
--- /dev/null
|
|
|
|
+++ b/drivers/input/touchscreen/ipts/protocol/responses.h
|
|
|
|
+++ b/drivers/input/touchscreen/ipts/protocol/responses.h
|
|
|
|
@@ -0,0 +1,62 @@
|
|
|
|
@@ -0,0 +1,62 @@
|
|
|
@ -1191,7 +1191,7 @@ index 000000000000..27153d82a5d6
|
|
|
|
+#endif /* _IPTS_PROTOCOL_RESPONSES_H_ */
|
|
|
|
+#endif /* _IPTS_PROTOCOL_RESPONSES_H_ */
|
|
|
|
diff --git a/drivers/input/touchscreen/ipts/protocol/singletouch.h b/drivers/input/touchscreen/ipts/protocol/singletouch.h
|
|
|
|
diff --git a/drivers/input/touchscreen/ipts/protocol/singletouch.h b/drivers/input/touchscreen/ipts/protocol/singletouch.h
|
|
|
|
new file mode 100644
|
|
|
|
new file mode 100644
|
|
|
|
index 000000000000..bf9912ee2af4
|
|
|
|
index 0000000000000..bf9912ee2af4c
|
|
|
|
--- /dev/null
|
|
|
|
--- /dev/null
|
|
|
|
+++ b/drivers/input/touchscreen/ipts/protocol/singletouch.h
|
|
|
|
+++ b/drivers/input/touchscreen/ipts/protocol/singletouch.h
|
|
|
|
@@ -0,0 +1,17 @@
|
|
|
|
@@ -0,0 +1,17 @@
|
|
|
@ -1214,7 +1214,7 @@ index 000000000000..bf9912ee2af4
|
|
|
|
+#endif /* _IPTS_PROTOCOL_SINGLETOUCH_H_ */
|
|
|
|
+#endif /* _IPTS_PROTOCOL_SINGLETOUCH_H_ */
|
|
|
|
diff --git a/drivers/input/touchscreen/ipts/protocol/stylus.h b/drivers/input/touchscreen/ipts/protocol/stylus.h
|
|
|
|
diff --git a/drivers/input/touchscreen/ipts/protocol/stylus.h b/drivers/input/touchscreen/ipts/protocol/stylus.h
|
|
|
|
new file mode 100644
|
|
|
|
new file mode 100644
|
|
|
|
index 000000000000..950850b365df
|
|
|
|
index 0000000000000..950850b365dfb
|
|
|
|
--- /dev/null
|
|
|
|
--- /dev/null
|
|
|
|
+++ b/drivers/input/touchscreen/ipts/protocol/stylus.h
|
|
|
|
+++ b/drivers/input/touchscreen/ipts/protocol/stylus.h
|
|
|
|
@@ -0,0 +1,52 @@
|
|
|
|
@@ -0,0 +1,52 @@
|
|
|
@ -1272,7 +1272,7 @@ index 000000000000..950850b365df
|
|
|
|
+#endif /* _IPTS_PAYLOAD_STYLUS_H_ */
|
|
|
|
+#endif /* _IPTS_PAYLOAD_STYLUS_H_ */
|
|
|
|
diff --git a/drivers/input/touchscreen/ipts/receiver.c b/drivers/input/touchscreen/ipts/receiver.c
|
|
|
|
diff --git a/drivers/input/touchscreen/ipts/receiver.c b/drivers/input/touchscreen/ipts/receiver.c
|
|
|
|
new file mode 100644
|
|
|
|
new file mode 100644
|
|
|
|
index 000000000000..ab283994c3e5
|
|
|
|
index 0000000000000..ab283994c3e5f
|
|
|
|
--- /dev/null
|
|
|
|
--- /dev/null
|
|
|
|
+++ b/drivers/input/touchscreen/ipts/receiver.c
|
|
|
|
+++ b/drivers/input/touchscreen/ipts/receiver.c
|
|
|
|
@@ -0,0 +1,265 @@
|
|
|
|
@@ -0,0 +1,265 @@
|
|
|
@ -1543,7 +1543,7 @@ index 000000000000..ab283994c3e5
|
|
|
|
+}
|
|
|
|
+}
|
|
|
|
diff --git a/drivers/input/touchscreen/ipts/receiver.h b/drivers/input/touchscreen/ipts/receiver.h
|
|
|
|
diff --git a/drivers/input/touchscreen/ipts/receiver.h b/drivers/input/touchscreen/ipts/receiver.h
|
|
|
|
new file mode 100644
|
|
|
|
new file mode 100644
|
|
|
|
index 000000000000..4d413a0abd4c
|
|
|
|
index 0000000000000..4d413a0abd4c5
|
|
|
|
--- /dev/null
|
|
|
|
--- /dev/null
|
|
|
|
+++ b/drivers/input/touchscreen/ipts/receiver.h
|
|
|
|
+++ b/drivers/input/touchscreen/ipts/receiver.h
|
|
|
|
@@ -0,0 +1,8 @@
|
|
|
|
@@ -0,0 +1,8 @@
|
|
|
@ -1557,7 +1557,7 @@ index 000000000000..4d413a0abd4c
|
|
|
|
+#endif /* _IPTS_RECEIVER_H_ */
|
|
|
|
+#endif /* _IPTS_RECEIVER_H_ */
|
|
|
|
diff --git a/drivers/input/touchscreen/ipts/resources.c b/drivers/input/touchscreen/ipts/resources.c
|
|
|
|
diff --git a/drivers/input/touchscreen/ipts/resources.c b/drivers/input/touchscreen/ipts/resources.c
|
|
|
|
new file mode 100644
|
|
|
|
new file mode 100644
|
|
|
|
index 000000000000..704db9fdd3fd
|
|
|
|
index 0000000000000..704db9fdd3fd4
|
|
|
|
--- /dev/null
|
|
|
|
--- /dev/null
|
|
|
|
+++ b/drivers/input/touchscreen/ipts/resources.c
|
|
|
|
+++ b/drivers/input/touchscreen/ipts/resources.c
|
|
|
|
@@ -0,0 +1,131 @@
|
|
|
|
@@ -0,0 +1,131 @@
|
|
|
@ -1694,7 +1694,7 @@ index 000000000000..704db9fdd3fd
|
|
|
|
+}
|
|
|
|
+}
|
|
|
|
diff --git a/drivers/input/touchscreen/ipts/resources.h b/drivers/input/touchscreen/ipts/resources.h
|
|
|
|
diff --git a/drivers/input/touchscreen/ipts/resources.h b/drivers/input/touchscreen/ipts/resources.h
|
|
|
|
new file mode 100644
|
|
|
|
new file mode 100644
|
|
|
|
index 000000000000..cf9807b0dbe6
|
|
|
|
index 0000000000000..cf9807b0dbe62
|
|
|
|
--- /dev/null
|
|
|
|
--- /dev/null
|
|
|
|
+++ b/drivers/input/touchscreen/ipts/resources.h
|
|
|
|
+++ b/drivers/input/touchscreen/ipts/resources.h
|
|
|
|
@@ -0,0 +1,11 @@
|
|
|
|
@@ -0,0 +1,11 @@
|
|
|
@ -1711,7 +1711,7 @@ index 000000000000..cf9807b0dbe6
|
|
|
|
+#endif /* _IPTS_RESOURCES_H_ */
|
|
|
|
+#endif /* _IPTS_RESOURCES_H_ */
|
|
|
|
diff --git a/drivers/input/touchscreen/ipts/singletouch.c b/drivers/input/touchscreen/ipts/singletouch.c
|
|
|
|
diff --git a/drivers/input/touchscreen/ipts/singletouch.c b/drivers/input/touchscreen/ipts/singletouch.c
|
|
|
|
new file mode 100644
|
|
|
|
new file mode 100644
|
|
|
|
index 000000000000..ed70444f649c
|
|
|
|
index 0000000000000..ed70444f649c4
|
|
|
|
--- /dev/null
|
|
|
|
--- /dev/null
|
|
|
|
+++ b/drivers/input/touchscreen/ipts/singletouch.c
|
|
|
|
+++ b/drivers/input/touchscreen/ipts/singletouch.c
|
|
|
|
@@ -0,0 +1,64 @@
|
|
|
|
@@ -0,0 +1,64 @@
|
|
|
@ -1781,7 +1781,7 @@ index 000000000000..ed70444f649c
|
|
|
|
+}
|
|
|
|
+}
|
|
|
|
diff --git a/drivers/input/touchscreen/ipts/singletouch.h b/drivers/input/touchscreen/ipts/singletouch.h
|
|
|
|
diff --git a/drivers/input/touchscreen/ipts/singletouch.h b/drivers/input/touchscreen/ipts/singletouch.h
|
|
|
|
new file mode 100644
|
|
|
|
new file mode 100644
|
|
|
|
index 000000000000..53207497a462
|
|
|
|
index 0000000000000..53207497a4628
|
|
|
|
--- /dev/null
|
|
|
|
--- /dev/null
|
|
|
|
+++ b/drivers/input/touchscreen/ipts/singletouch.h
|
|
|
|
+++ b/drivers/input/touchscreen/ipts/singletouch.h
|
|
|
|
@@ -0,0 +1,14 @@
|
|
|
|
@@ -0,0 +1,14 @@
|
|
|
@ -1801,7 +1801,7 @@ index 000000000000..53207497a462
|
|
|
|
+#endif /* _IPTS_SINGLETOUCH_H_ */
|
|
|
|
+#endif /* _IPTS_SINGLETOUCH_H_ */
|
|
|
|
diff --git a/drivers/input/touchscreen/ipts/stylus.c b/drivers/input/touchscreen/ipts/stylus.c
|
|
|
|
diff --git a/drivers/input/touchscreen/ipts/stylus.c b/drivers/input/touchscreen/ipts/stylus.c
|
|
|
|
new file mode 100644
|
|
|
|
new file mode 100644
|
|
|
|
index 000000000000..987fa756fec3
|
|
|
|
index 0000000000000..987fa756fec33
|
|
|
|
--- /dev/null
|
|
|
|
--- /dev/null
|
|
|
|
+++ b/drivers/input/touchscreen/ipts/stylus.c
|
|
|
|
+++ b/drivers/input/touchscreen/ipts/stylus.c
|
|
|
|
@@ -0,0 +1,179 @@
|
|
|
|
@@ -0,0 +1,179 @@
|
|
|
@ -1986,7 +1986,7 @@ index 000000000000..987fa756fec3
|
|
|
|
+}
|
|
|
|
+}
|
|
|
|
diff --git a/drivers/input/touchscreen/ipts/stylus.h b/drivers/input/touchscreen/ipts/stylus.h
|
|
|
|
diff --git a/drivers/input/touchscreen/ipts/stylus.h b/drivers/input/touchscreen/ipts/stylus.h
|
|
|
|
new file mode 100644
|
|
|
|
new file mode 100644
|
|
|
|
index 000000000000..5b93add1eac2
|
|
|
|
index 0000000000000..5b93add1eac2d
|
|
|
|
--- /dev/null
|
|
|
|
--- /dev/null
|
|
|
|
+++ b/drivers/input/touchscreen/ipts/stylus.h
|
|
|
|
+++ b/drivers/input/touchscreen/ipts/stylus.h
|
|
|
|
@@ -0,0 +1,14 @@
|
|
|
|
@@ -0,0 +1,14 @@
|
|
|
@ -2005,7 +2005,7 @@ index 000000000000..5b93add1eac2
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+#endif /* _IPTS_STYLUS_H_ */
|
|
|
|
+#endif /* _IPTS_STYLUS_H_ */
|
|
|
|
diff --git a/drivers/misc/mei/hw-me-regs.h b/drivers/misc/mei/hw-me-regs.h
|
|
|
|
diff --git a/drivers/misc/mei/hw-me-regs.h b/drivers/misc/mei/hw-me-regs.h
|
|
|
|
index 9392934e3a06..90e7d3020fa5 100644
|
|
|
|
index 7becfc768bbcc..3d0f9bfb7c494 100644
|
|
|
|
--- a/drivers/misc/mei/hw-me-regs.h
|
|
|
|
--- a/drivers/misc/mei/hw-me-regs.h
|
|
|
|
+++ b/drivers/misc/mei/hw-me-regs.h
|
|
|
|
+++ b/drivers/misc/mei/hw-me-regs.h
|
|
|
|
@@ -59,6 +59,7 @@
|
|
|
|
@@ -59,6 +59,7 @@
|
|
|
@ -2025,7 +2025,7 @@ index 9392934e3a06..90e7d3020fa5 100644
|
|
|
|
#define MEI_DEV_ID_JSP_N 0x4DE0 /* Jasper Lake Point N */
|
|
|
|
#define MEI_DEV_ID_JSP_N 0x4DE0 /* Jasper Lake Point N */
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/drivers/misc/mei/pci-me.c b/drivers/misc/mei/pci-me.c
|
|
|
|
diff --git a/drivers/misc/mei/pci-me.c b/drivers/misc/mei/pci-me.c
|
|
|
|
index a1ed375fed37..5e621e90d8d4 100644
|
|
|
|
index 81e759674c1b5..4f7ba1cdb3c84 100644
|
|
|
|
--- a/drivers/misc/mei/pci-me.c
|
|
|
|
--- a/drivers/misc/mei/pci-me.c
|
|
|
|
+++ b/drivers/misc/mei/pci-me.c
|
|
|
|
+++ b/drivers/misc/mei/pci-me.c
|
|
|
|
@@ -68,6 +68,7 @@ static const struct pci_device_id mei_me_pci_tbl[] = {
|
|
|
|
@@ -68,6 +68,7 @@ static const struct pci_device_id mei_me_pci_tbl[] = {
|
|
|
@ -2033,9 +2033,9 @@ index a1ed375fed37..5e621e90d8d4 100644
|
|
|
|
{MEI_PCI_DEVICE(MEI_DEV_ID_SPT, MEI_ME_PCH8_CFG)},
|
|
|
|
{MEI_PCI_DEVICE(MEI_DEV_ID_SPT, MEI_ME_PCH8_CFG)},
|
|
|
|
{MEI_PCI_DEVICE(MEI_DEV_ID_SPT_2, MEI_ME_PCH8_CFG)},
|
|
|
|
{MEI_PCI_DEVICE(MEI_DEV_ID_SPT_2, MEI_ME_PCH8_CFG)},
|
|
|
|
+ {MEI_PCI_DEVICE(MEI_DEV_ID_SPT_4, MEI_ME_PCH8_CFG)},
|
|
|
|
+ {MEI_PCI_DEVICE(MEI_DEV_ID_SPT_4, MEI_ME_PCH8_CFG)},
|
|
|
|
{MEI_PCI_DEVICE(MEI_DEV_ID_SPT_H, MEI_ME_PCH8_SPS_CFG)},
|
|
|
|
{MEI_PCI_DEVICE(MEI_DEV_ID_SPT_H, MEI_ME_PCH8_SPS_4_CFG)},
|
|
|
|
{MEI_PCI_DEVICE(MEI_DEV_ID_SPT_H_2, MEI_ME_PCH8_SPS_CFG)},
|
|
|
|
{MEI_PCI_DEVICE(MEI_DEV_ID_SPT_H_2, MEI_ME_PCH8_SPS_4_CFG)},
|
|
|
|
{MEI_PCI_DEVICE(MEI_DEV_ID_LBG, MEI_ME_PCH12_SPS_CFG)},
|
|
|
|
{MEI_PCI_DEVICE(MEI_DEV_ID_LBG, MEI_ME_PCH12_SPS_4_CFG)},
|
|
|
|
@@ -94,6 +95,7 @@ static const struct pci_device_id mei_me_pci_tbl[] = {
|
|
|
|
@@ -94,6 +95,7 @@ static const struct pci_device_id mei_me_pci_tbl[] = {
|
|
|
|
{MEI_PCI_DEVICE(MEI_DEV_ID_CMP_H_3, MEI_ME_PCH8_CFG)},
|
|
|
|
{MEI_PCI_DEVICE(MEI_DEV_ID_CMP_H_3, MEI_ME_PCH8_CFG)},
|
|
|
|
|
|
|
|
|
|
|
@ -2043,9 +2043,9 @@ index a1ed375fed37..5e621e90d8d4 100644
|
|
|
|
+ {MEI_PCI_DEVICE(MEI_DEV_ID_ICP_LP_4, MEI_ME_PCH12_CFG)},
|
|
|
|
+ {MEI_PCI_DEVICE(MEI_DEV_ID_ICP_LP_4, MEI_ME_PCH12_CFG)},
|
|
|
|
|
|
|
|
|
|
|
|
{MEI_PCI_DEVICE(MEI_DEV_ID_TGP_LP, MEI_ME_PCH15_CFG)},
|
|
|
|
{MEI_PCI_DEVICE(MEI_DEV_ID_TGP_LP, MEI_ME_PCH15_CFG)},
|
|
|
|
|
|
|
|
{MEI_PCI_DEVICE(MEI_DEV_ID_TGP_H, MEI_ME_PCH15_SPS_CFG)},
|
|
|
|
diff --git a/include/uapi/linux/input.h b/include/uapi/linux/input.h
|
|
|
|
diff --git a/include/uapi/linux/input.h b/include/uapi/linux/input.h
|
|
|
|
index 9a61c28ed3ae..47fc20975245 100644
|
|
|
|
index 9a61c28ed3ae4..47fc20975245d 100644
|
|
|
|
--- a/include/uapi/linux/input.h
|
|
|
|
--- a/include/uapi/linux/input.h
|
|
|
|
+++ b/include/uapi/linux/input.h
|
|
|
|
+++ b/include/uapi/linux/input.h
|
|
|
|
@@ -271,6 +271,7 @@ struct input_mask {
|
|
|
|
@@ -271,6 +271,7 @@ struct input_mask {
|
|
|
@ -2057,5 +2057,5 @@ index 9a61c28ed3ae..47fc20975245 100644
|
|
|
|
/*
|
|
|
|
/*
|
|
|
|
* MT_TOOL types
|
|
|
|
* MT_TOOL types
|
|
|
|
--
|
|
|
|
--
|
|
|
|
2.26.2
|
|
|
|
2.27.0
|
|
|
|
|
|
|
|
|