Răsfoiți Sursa

BUILD 621, SW_IO1 - SW_IO4 for input events added

Reinhard Russinger 7 ani în urmă
părinte
comite
38b10e9af8

+ 1 - 0
Make-bb-kernel_Qt5.7.sh

@@ -25,6 +25,7 @@ git clone git://git.buildroot.net/buildroot ./buildroot57
 cd buildroot57
 git checkout 63a20d5dfebe83e2b2bd683dc78ebdf787dff100 -b gfawrk
 patch -p1 < ../GfA/patches/0001-GfA-wrk-changes-and-setup.patch
+patch -p1 < ../GfA/patches/0003-add-SW_IO1-to-SW_IO4-to-headers-and-evtest.patch
 #
 chmod a+x *.sh
 cp ../GfA/configs/* ./configs

+ 1 - 1
board/GfA/Display001/BUILD

@@ -1 +1 @@
-619
+621

+ 28 - 0
board/GfA/Display001/linux_4.4.94_rt19/linux-027-input_events_add_IN1-IN4.patch

@@ -0,0 +1,28 @@
+diff -Naurp a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
+--- a/include/linux/mod_devicetable.h	2018-02-19 11:38:07.000000000 +0100
++++ b/include/linux/mod_devicetable.h	2018-05-04 21:39:09.862508306 +0200
+@@ -291,7 +291,7 @@ struct pcmcia_device_id {
+ #define INPUT_DEVICE_ID_LED_MAX		0x0f
+ #define INPUT_DEVICE_ID_SND_MAX		0x07
+ #define INPUT_DEVICE_ID_FF_MAX		0x7f
+-#define INPUT_DEVICE_ID_SW_MAX		0x0f
++#define INPUT_DEVICE_ID_SW_MAX		0x13
+ 
+ #define INPUT_DEVICE_ID_MATCH_BUS	1
+ #define INPUT_DEVICE_ID_MATCH_VENDOR	2
+diff a/include/uapi/linux/input-event-codes.h b/include/uapi/linux/input-event-codes.h
+--- a/include/uapi/linux/input-event-codes.h	2018-02-19 11:38:08.000000000 +0100
++++ b/include/uapi/linux/input-event-codes.h	2018-05-04 21:36:45.066395759 +0200
+@@ -749,7 +749,11 @@
+ #define SW_ROTATE_LOCK		0x0c  /* set = rotate locked/disabled */
+ #define SW_LINEIN_INSERT	0x0d  /* set = inserted */
+ #define SW_MUTE_DEVICE		0x0e  /* set = device disabled */
+-#define SW_MAX			0x0f
++#define SW_IO1			0x0f
++#define SW_IO2			0x10
++#define SW_IO3			0x11
++#define SW_IO4			0x12
++#define SW_MAX			0x13
+ #define SW_CNT			(SW_MAX+1)
+ 
+ /*

+ 76 - 0
patches/0003-add-SW_IO1-to-SW_IO4-to-headers-and-evtest.patch

@@ -0,0 +1,76 @@
+From 0eae7cb833670b5f198bf76cfbc978e4e5dbafc6 Mon Sep 17 00:00:00 2001
+From: Reinhard Russinger <reinhard@russinger.at>
+Date: Tue, 5 Jun 2018 12:47:19 +0200
+Subject: [PATCH] add SW_IO1 to SW_IO4 to headers and evtest
+
+---
+ package/evtest/SW_IO1-SW_IO4.patch                 | 21 ++++++++++++++++
+ .../linux-027-input_events_add_IN1-IN4.patch       | 28 ++++++++++++++++++++++
+ 2 files changed, 49 insertions(+)
+ create mode 100644 package/evtest/SW_IO1-SW_IO4.patch
+ create mode 100644 package/linux-headers/linux-027-input_events_add_IN1-IN4.patch
+
+diff --git a/package/evtest/SW_IO1-SW_IO4.patch b/package/evtest/SW_IO1-SW_IO4.patch
+new file mode 100644
+index 0000000..903228c
+--- /dev/null
++++ b/package/evtest/SW_IO1-SW_IO4.patch
+@@ -0,0 +1,21 @@
++--- ../QT57_GfA/buildroot57/output/build/evtest-1.33/evtest.c	2015-07-23 01:51:31.000000000 +0200
+++++ ./evtest.c	2018-05-04 21:29:25.006054153 +0200
++@@ -741,6 +741,18 @@ static const char * const switches[SW_MA
++ #ifdef SW_MUTE_DEVICE
++ 	NAME_ELEMENT(SW_MUTE_DEVICE),
++ #endif
+++#ifdef SW_IO1
+++	NAME_ELEMENT(SW_IO1),
+++#endif
+++#ifdef SW_IO2
+++	NAME_ELEMENT(SW_IO2),
+++#endif
+++#ifdef SW_IO3
+++	NAME_ELEMENT(SW_IO3),
+++#endif
+++#ifdef SW_IO4
+++	NAME_ELEMENT(SW_IO4),
+++#endif
++ };
++ 
++ static const char * const force[FF_MAX + 1] = {
+diff --git a/package/linux-headers/linux-027-input_events_add_IN1-IN4.patch b/package/linux-headers/linux-027-input_events_add_IN1-IN4.patch
+new file mode 100644
+index 0000000..849a847
+--- /dev/null
++++ b/package/linux-headers/linux-027-input_events_add_IN1-IN4.patch
+@@ -0,0 +1,28 @@
++diff -Naurp a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
++--- a/include/linux/mod_devicetable.h	2018-02-19 11:38:07.000000000 +0100
+++++ b/include/linux/mod_devicetable.h	2018-05-04 21:39:09.862508306 +0200
++@@ -291,7 +291,7 @@ struct pcmcia_device_id {
++ #define INPUT_DEVICE_ID_LED_MAX		0x0f
++ #define INPUT_DEVICE_ID_SND_MAX		0x07
++ #define INPUT_DEVICE_ID_FF_MAX		0x7f
++-#define INPUT_DEVICE_ID_SW_MAX		0x0f
+++#define INPUT_DEVICE_ID_SW_MAX		0x13
++ 
++ #define INPUT_DEVICE_ID_MATCH_BUS	1
++ #define INPUT_DEVICE_ID_MATCH_VENDOR	2
++diff a/include/uapi/linux/input-event-codes.h b/include/uapi/linux/input-event-codes.h
++--- a/include/uapi/linux/input-event-codes.h	2018-02-19 11:38:08.000000000 +0100
+++++ b/include/uapi/linux/input-event-codes.h	2018-05-04 21:36:45.066395759 +0200
++@@ -749,7 +749,11 @@
++ #define SW_ROTATE_LOCK		0x0c  /* set = rotate locked/disabled */
++ #define SW_LINEIN_INSERT	0x0d  /* set = inserted */
++ #define SW_MUTE_DEVICE		0x0e  /* set = device disabled */
++-#define SW_MAX			0x0f
+++#define SW_IO1			0x0f
+++#define SW_IO2			0x10
+++#define SW_IO3			0x11
+++#define SW_IO4			0x12
+++#define SW_MAX			0x13
++ #define SW_CNT			(SW_MAX+1)
++ 
++ /*
+-- 
+2.7.4
+