|
@@ -1,4 +1,4 @@
|
|
-From 4ad6656739cd57b52360b9909af2ab762968a632 Mon Sep 17 00:00:00 2001
|
|
|
|
|
|
+From 41b560b65cfa204af0e8d5b6682805dc10b26461 Mon Sep 17 00:00:00 2001
|
|
From: Dorian Stoll <dorian.stoll@tmsp.io>
|
|
From: Dorian Stoll <dorian.stoll@tmsp.io>
|
|
Date: Thu, 30 Jul 2020 13:21:53 +0200
|
|
Date: Thu, 30 Jul 2020 13:21:53 +0200
|
|
Subject: [PATCH 3/6] ipts
|
|
Subject: [PATCH 3/6] ipts
|
|
@@ -37,7 +37,7 @@ Subject: [PATCH 3/6] ipts
|
|
create mode 100644 drivers/misc/ipts/uapi.h
|
|
create mode 100644 drivers/misc/ipts/uapi.h
|
|
|
|
|
|
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
|
|
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
|
|
-index e1b1ba5e2b925..be901ffc66fee 100644
|
|
|
|
|
|
+index e1b1ba5e2b92..be901ffc66fe 100644
|
|
--- a/drivers/misc/Kconfig
|
|
--- a/drivers/misc/Kconfig
|
|
+++ b/drivers/misc/Kconfig
|
|
+++ b/drivers/misc/Kconfig
|
|
@@ -472,4 +472,5 @@ source "drivers/misc/ocxl/Kconfig"
|
|
@@ -472,4 +472,5 @@ source "drivers/misc/ocxl/Kconfig"
|
|
@@ -47,7 +47,7 @@ index e1b1ba5e2b925..be901ffc66fee 100644
|
|
+source "drivers/misc/ipts/Kconfig"
|
|
+source "drivers/misc/ipts/Kconfig"
|
|
endmenu
|
|
endmenu
|
|
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
|
|
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
|
|
-index c7bd01ac62917..f97938d777e13 100644
|
|
|
|
|
|
+index c7bd01ac6291..f97938d777e1 100644
|
|
--- a/drivers/misc/Makefile
|
|
--- a/drivers/misc/Makefile
|
|
+++ b/drivers/misc/Makefile
|
|
+++ b/drivers/misc/Makefile
|
|
@@ -57,3 +57,4 @@ obj-$(CONFIG_PVPANIC) += pvpanic.o
|
|
@@ -57,3 +57,4 @@ obj-$(CONFIG_PVPANIC) += pvpanic.o
|
|
@@ -57,7 +57,7 @@ index c7bd01ac62917..f97938d777e13 100644
|
|
+obj-$(CONFIG_MISC_IPTS) += ipts/
|
|
+obj-$(CONFIG_MISC_IPTS) += ipts/
|
|
diff --git a/drivers/misc/ipts/Kconfig b/drivers/misc/ipts/Kconfig
|
|
diff --git a/drivers/misc/ipts/Kconfig b/drivers/misc/ipts/Kconfig
|
|
new file mode 100644
|
|
new file mode 100644
|
|
-index 0000000000000..7dce12245a4f1
|
|
|
|
|
|
+index 000000000000..7dce12245a4f
|
|
--- /dev/null
|
|
--- /dev/null
|
|
+++ b/drivers/misc/ipts/Kconfig
|
|
+++ b/drivers/misc/ipts/Kconfig
|
|
@@ -0,0 +1,13 @@
|
|
@@ -0,0 +1,13 @@
|
|
@@ -76,7 +76,7 @@ index 0000000000000..7dce12245a4f1
|
|
+ module will be called ipts.
|
|
+ module will be called ipts.
|
|
diff --git a/drivers/misc/ipts/Makefile b/drivers/misc/ipts/Makefile
|
|
diff --git a/drivers/misc/ipts/Makefile b/drivers/misc/ipts/Makefile
|
|
new file mode 100644
|
|
new file mode 100644
|
|
-index 0000000000000..a7232badd8b89
|
|
|
|
|
|
+index 000000000000..a7232badd8b8
|
|
--- /dev/null
|
|
--- /dev/null
|
|
+++ b/drivers/misc/ipts/Makefile
|
|
+++ b/drivers/misc/ipts/Makefile
|
|
@@ -0,0 +1,11 @@
|
|
@@ -0,0 +1,11 @@
|
|
@@ -93,7 +93,7 @@ index 0000000000000..a7232badd8b89
|
|
+ipts-objs += uapi.o
|
|
+ipts-objs += uapi.o
|
|
diff --git a/drivers/misc/ipts/context.h b/drivers/misc/ipts/context.h
|
|
diff --git a/drivers/misc/ipts/context.h b/drivers/misc/ipts/context.h
|
|
new file mode 100644
|
|
new file mode 100644
|
|
-index 0000000000000..d24fd6ac026b9
|
|
|
|
|
|
+index 000000000000..d24fd6ac026b
|
|
--- /dev/null
|
|
--- /dev/null
|
|
+++ b/drivers/misc/ipts/context.h
|
|
+++ b/drivers/misc/ipts/context.h
|
|
@@ -0,0 +1,125 @@
|
|
@@ -0,0 +1,125 @@
|
|
@@ -224,7 +224,7 @@ index 0000000000000..d24fd6ac026b9
|
|
+#endif /* _IPTS_CONTEXT_H_ */
|
|
+#endif /* _IPTS_CONTEXT_H_ */
|
|
diff --git a/drivers/misc/ipts/control.c b/drivers/misc/ipts/control.c
|
|
diff --git a/drivers/misc/ipts/control.c b/drivers/misc/ipts/control.c
|
|
new file mode 100644
|
|
new file mode 100644
|
|
-index 0000000000000..857bcf4987525
|
|
|
|
|
|
+index 000000000000..857bcf498752
|
|
--- /dev/null
|
|
--- /dev/null
|
|
+++ b/drivers/misc/ipts/control.c
|
|
+++ b/drivers/misc/ipts/control.c
|
|
@@ -0,0 +1,63 @@
|
|
@@ -0,0 +1,63 @@
|
|
@@ -293,7 +293,7 @@ index 0000000000000..857bcf4987525
|
|
+}
|
|
+}
|
|
diff --git a/drivers/misc/ipts/control.h b/drivers/misc/ipts/control.h
|
|
diff --git a/drivers/misc/ipts/control.h b/drivers/misc/ipts/control.h
|
|
new file mode 100644
|
|
new file mode 100644
|
|
-index 0000000000000..718cde10dd2cd
|
|
|
|
|
|
+index 000000000000..718cde10dd2c
|
|
--- /dev/null
|
|
--- /dev/null
|
|
+++ b/drivers/misc/ipts/control.h
|
|
+++ b/drivers/misc/ipts/control.h
|
|
@@ -0,0 +1,17 @@
|
|
@@ -0,0 +1,17 @@
|
|
@@ -316,7 +316,7 @@ index 0000000000000..718cde10dd2cd
|
|
+#endif /* _IPTS_CONTROL_H_ */
|
|
+#endif /* _IPTS_CONTROL_H_ */
|
|
diff --git a/drivers/misc/ipts/init.c b/drivers/misc/ipts/init.c
|
|
diff --git a/drivers/misc/ipts/init.c b/drivers/misc/ipts/init.c
|
|
new file mode 100644
|
|
new file mode 100644
|
|
-index 0000000000000..c2f237feed11e
|
|
|
|
|
|
+index 000000000000..c2f237feed11
|
|
--- /dev/null
|
|
--- /dev/null
|
|
+++ b/drivers/misc/ipts/init.c
|
|
+++ b/drivers/misc/ipts/init.c
|
|
@@ -0,0 +1,87 @@
|
|
@@ -0,0 +1,87 @@
|
|
@@ -409,7 +409,7 @@ index 0000000000000..c2f237feed11e
|
|
+MODULE_LICENSE("GPL");
|
|
+MODULE_LICENSE("GPL");
|
|
diff --git a/drivers/misc/ipts/protocol.h b/drivers/misc/ipts/protocol.h
|
|
diff --git a/drivers/misc/ipts/protocol.h b/drivers/misc/ipts/protocol.h
|
|
new file mode 100644
|
|
new file mode 100644
|
|
-index 0000000000000..c8b412899ec4d
|
|
|
|
|
|
+index 000000000000..c8b412899ec4
|
|
--- /dev/null
|
|
--- /dev/null
|
|
+++ b/drivers/misc/ipts/protocol.h
|
|
+++ b/drivers/misc/ipts/protocol.h
|
|
@@ -0,0 +1,236 @@
|
|
@@ -0,0 +1,236 @@
|
|
@@ -651,7 +651,7 @@ index 0000000000000..c8b412899ec4d
|
|
+#endif /* _IPTS_PROTOCOL_H_ */
|
|
+#endif /* _IPTS_PROTOCOL_H_ */
|
|
diff --git a/drivers/misc/ipts/receiver.c b/drivers/misc/ipts/receiver.c
|
|
diff --git a/drivers/misc/ipts/receiver.c b/drivers/misc/ipts/receiver.c
|
|
new file mode 100644
|
|
new file mode 100644
|
|
-index 0000000000000..bf78b64249a5b
|
|
|
|
|
|
+index 000000000000..bf78b64249a5
|
|
--- /dev/null
|
|
--- /dev/null
|
|
+++ b/drivers/misc/ipts/receiver.c
|
|
+++ b/drivers/misc/ipts/receiver.c
|
|
@@ -0,0 +1,202 @@
|
|
@@ -0,0 +1,202 @@
|
|
@@ -859,7 +859,7 @@ index 0000000000000..bf78b64249a5b
|
|
+}
|
|
+}
|
|
diff --git a/drivers/misc/ipts/receiver.h b/drivers/misc/ipts/receiver.h
|
|
diff --git a/drivers/misc/ipts/receiver.h b/drivers/misc/ipts/receiver.h
|
|
new file mode 100644
|
|
new file mode 100644
|
|
-index 0000000000000..d7939ddbaae95
|
|
|
|
|
|
+index 000000000000..d7939ddbaae9
|
|
--- /dev/null
|
|
--- /dev/null
|
|
+++ b/drivers/misc/ipts/receiver.h
|
|
+++ b/drivers/misc/ipts/receiver.h
|
|
@@ -0,0 +1,10 @@
|
|
@@ -0,0 +1,10 @@
|
|
@@ -875,7 +875,7 @@ index 0000000000000..d7939ddbaae95
|
|
+#endif /* _IPTS_RECEIVER_H_ */
|
|
+#endif /* _IPTS_RECEIVER_H_ */
|
|
diff --git a/drivers/misc/ipts/resources.c b/drivers/misc/ipts/resources.c
|
|
diff --git a/drivers/misc/ipts/resources.c b/drivers/misc/ipts/resources.c
|
|
new file mode 100644
|
|
new file mode 100644
|
|
-index 0000000000000..9f2b60bb7a70e
|
|
|
|
|
|
+index 000000000000..9f2b60bb7a70
|
|
--- /dev/null
|
|
--- /dev/null
|
|
+++ b/drivers/misc/ipts/resources.c
|
|
+++ b/drivers/misc/ipts/resources.c
|
|
@@ -0,0 +1,133 @@
|
|
@@ -0,0 +1,133 @@
|
|
@@ -1014,7 +1014,7 @@ index 0000000000000..9f2b60bb7a70e
|
|
+}
|
|
+}
|
|
diff --git a/drivers/misc/ipts/resources.h b/drivers/misc/ipts/resources.h
|
|
diff --git a/drivers/misc/ipts/resources.h b/drivers/misc/ipts/resources.h
|
|
new file mode 100644
|
|
new file mode 100644
|
|
-index 0000000000000..cf9807b0dbe62
|
|
|
|
|
|
+index 000000000000..cf9807b0dbe6
|
|
--- /dev/null
|
|
--- /dev/null
|
|
+++ b/drivers/misc/ipts/resources.h
|
|
+++ b/drivers/misc/ipts/resources.h
|
|
@@ -0,0 +1,11 @@
|
|
@@ -0,0 +1,11 @@
|
|
@@ -1031,7 +1031,7 @@ index 0000000000000..cf9807b0dbe62
|
|
+#endif /* _IPTS_RESOURCES_H_ */
|
|
+#endif /* _IPTS_RESOURCES_H_ */
|
|
diff --git a/drivers/misc/ipts/uapi.c b/drivers/misc/ipts/uapi.c
|
|
diff --git a/drivers/misc/ipts/uapi.c b/drivers/misc/ipts/uapi.c
|
|
new file mode 100644
|
|
new file mode 100644
|
|
-index 0000000000000..f6f7b2cabd836
|
|
|
|
|
|
+index 000000000000..f6f7b2cabd83
|
|
--- /dev/null
|
|
--- /dev/null
|
|
+++ b/drivers/misc/ipts/uapi.c
|
|
+++ b/drivers/misc/ipts/uapi.c
|
|
@@ -0,0 +1,297 @@
|
|
@@ -0,0 +1,297 @@
|
|
@@ -1334,7 +1334,7 @@ index 0000000000000..f6f7b2cabd836
|
|
+}
|
|
+}
|
|
diff --git a/drivers/misc/ipts/uapi.h b/drivers/misc/ipts/uapi.h
|
|
diff --git a/drivers/misc/ipts/uapi.h b/drivers/misc/ipts/uapi.h
|
|
new file mode 100644
|
|
new file mode 100644
|
|
-index 0000000000000..7d7eabc74b17d
|
|
|
|
|
|
+index 000000000000..7d7eabc74b17
|
|
--- /dev/null
|
|
--- /dev/null
|
|
+++ b/drivers/misc/ipts/uapi.h
|
|
+++ b/drivers/misc/ipts/uapi.h
|
|
@@ -0,0 +1,11 @@
|
|
@@ -0,0 +1,11 @@
|
|
@@ -1350,7 +1350,7 @@ index 0000000000000..7d7eabc74b17d
|
|
+
|
|
+
|
|
+#endif /* _IPTS_UAPI_H_ */
|
|
+#endif /* _IPTS_UAPI_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 7becfc768bbcc..0824ef27b08bb 100644
|
|
|
|
|
|
+index 7becfc768bbc..0824ef27b08b 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 @@
|
|
@@ -1378,7 +1378,7 @@ index 7becfc768bbcc..0824ef27b08bb 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 2a3f2fd5df507..319158fd43930 100644
|
|
|
|
|
|
+index 2a3f2fd5df50..319158fd4393 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[] = {
|