[meego-commits] 6370: Changes to Trunk/kernel
Peter Zhu
peter.j.zhu at intel.com
Mon Aug 9 06:30:02 UTC 2010
Hi,
I have made the following changes to kernel in project Trunk. Please review and accept ASAP.
Thank You,
Peter Zhu
[This message was auto-generated]
---
Request #6370:
submit: Trunk:Testing/kernel(r96) -> Trunk/kernel
Message:
Move to Trunk
State: new 2010-08-08T18:21:45 peter
Comment: None
changes files:
--------------
--- kernel.changes
+++ kernel.changes
@@ -0,0 +1,4 @@
+* Thu Aug 05 2010 Priya Vijayan <priya.vijayan at intel.com> - 2.6.35
+- Re-add multitouch input driver for event devices until QT is ready to use xinput
+- Enable stantum and cando drivers to use mtdev
+
new:
----
linux-2.6.34-enable-hid-dg-contact-count-stantum-and-cando-touch-drivers.patch
spec files:
-----------
--- kernel-ivi.spec
+++ kernel-ivi.spec
@@ -378,14 +378,14 @@
# Multitouch input driver for event devices
-# linux-2.6.34-multi-touch-input-driver-for-event-devices.patch
+Patch710: linux-2.6.34-multi-touch-input-driver-for-event-devices.patch
# Enable stantum and cando drivers to use mtdev driver
-#linux-2.6.34-enable-hid-dg-contact-count-stantum-and-cando-touch-drivers.patch
+Patch711: linux-2.6.34-enable-hid-dg-contact-count-stantum-and-cando-touch-drivers.patch
# turn on "print fatal signals" by default, so that we can debug /sbin/init
# crashes
-Patch710: linux-2.6.35-fatal-signals.patch
+Patch712: linux-2.6.35-fatal-signals.patch
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -751,14 +751,16 @@
# Multitouch input driver for event devices
# linux-2.6.34-multi-touch-input-driver-for-event-devices.patch
+%patch710 -p1
# Enable stantum and cando drivers to use mtdev driver
-#linux-2.6.34-enable-hid-dg-contact-count-stantum-and-cando-touch-drivers.patch
+# linux-2.6.34-enable-hid-dg-contact-count-stantum-and-cando-touch-drivers.patch
+%patch711 -p1
# turn on "print fatal signals" by default, so that we can debug /sbin/init
# crashes
# linux-2.6.35-fatal-signals.patch
-%patch710 -p1
+%patch712 -p1
# Drop some necessary files from the source dir into the buildroot
cp $RPM_SOURCE_DIR/config-* .
--- kernel-mrst.spec
+++ kernel-mrst.spec
@@ -118,7 +118,7 @@
License: GPLv2
URL: http://www.kernel.org/
Version: %{rpmversion}
-Release: 8
+Release: 5
%kernel_reqprovconf
@@ -379,14 +379,14 @@
# Multitouch input driver for event devices
-# linux-2.6.34-multi-touch-input-driver-for-event-devices.patch
+Patch710: linux-2.6.34-multi-touch-input-driver-for-event-devices.patch
# Enable stantum and cando drivers to use mtdev driver
-#linux-2.6.34-enable-hid-dg-contact-count-stantum-and-cando-touch-drivers.patch
+Patch711: linux-2.6.34-enable-hid-dg-contact-count-stantum-and-cando-touch-drivers.patch
# turn on "print fatal signals" by default, so that we can debug /sbin/init
# crashes
-Patch710: linux-2.6.35-fatal-signals.patch
+Patch712: linux-2.6.35-fatal-signals.patch
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -752,14 +752,16 @@
# Multitouch input driver for event devices
# linux-2.6.34-multi-touch-input-driver-for-event-devices.patch
+%patch710 -p1
# Enable stantum and cando drivers to use mtdev driver
-#linux-2.6.34-enable-hid-dg-contact-count-stantum-and-cando-touch-drivers.patch
+# linux-2.6.34-enable-hid-dg-contact-count-stantum-and-cando-touch-drivers.patch
+%patch711 -p1
# turn on "print fatal signals" by default, so that we can debug /sbin/init
# crashes
# linux-2.6.35-fatal-signals.patch
-%patch710 -p1
+%patch712 -p1
# Drop some necessary files from the source dir into the buildroot
cp $RPM_SOURCE_DIR/config-* .
--- kernel-n900.spec
+++ kernel-n900.spec
@@ -378,14 +378,14 @@
# Multitouch input driver for event devices
-# linux-2.6.34-multi-touch-input-driver-for-event-devices.patch
+Patch710: linux-2.6.34-multi-touch-input-driver-for-event-devices.patch
# Enable stantum and cando drivers to use mtdev driver
-#linux-2.6.34-enable-hid-dg-contact-count-stantum-and-cando-touch-drivers.patch
+Patch711: linux-2.6.34-enable-hid-dg-contact-count-stantum-and-cando-touch-drivers.patch
# turn on "print fatal signals" by default, so that we can debug /sbin/init
# crashes
-Patch710: linux-2.6.35-fatal-signals.patch
+Patch712: linux-2.6.35-fatal-signals.patch
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -751,14 +751,16 @@
# Multitouch input driver for event devices
# linux-2.6.34-multi-touch-input-driver-for-event-devices.patch
+%patch710 -p1
# Enable stantum and cando drivers to use mtdev driver
-#linux-2.6.34-enable-hid-dg-contact-count-stantum-and-cando-touch-drivers.patch
+# linux-2.6.34-enable-hid-dg-contact-count-stantum-and-cando-touch-drivers.patch
+%patch711 -p1
# turn on "print fatal signals" by default, so that we can debug /sbin/init
# crashes
# linux-2.6.35-fatal-signals.patch
-%patch710 -p1
+%patch712 -p1
# Drop some necessary files from the source dir into the buildroot
cp $RPM_SOURCE_DIR/config-* .
--- kernel-netbook.spec
+++ kernel-netbook.spec
@@ -378,14 +378,14 @@
# Multitouch input driver for event devices
-# linux-2.6.34-multi-touch-input-driver-for-event-devices.patch
+Patch710: linux-2.6.34-multi-touch-input-driver-for-event-devices.patch
# Enable stantum and cando drivers to use mtdev driver
-#linux-2.6.34-enable-hid-dg-contact-count-stantum-and-cando-touch-drivers.patch
+Patch711: linux-2.6.34-enable-hid-dg-contact-count-stantum-and-cando-touch-drivers.patch
# turn on "print fatal signals" by default, so that we can debug /sbin/init
# crashes
-Patch710: linux-2.6.35-fatal-signals.patch
+Patch712: linux-2.6.35-fatal-signals.patch
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -751,14 +751,16 @@
# Multitouch input driver for event devices
# linux-2.6.34-multi-touch-input-driver-for-event-devices.patch
+%patch710 -p1
# Enable stantum and cando drivers to use mtdev driver
-#linux-2.6.34-enable-hid-dg-contact-count-stantum-and-cando-touch-drivers.patch
+# linux-2.6.34-enable-hid-dg-contact-count-stantum-and-cando-touch-drivers.patch
+%patch711 -p1
# turn on "print fatal signals" by default, so that we can debug /sbin/init
# crashes
# linux-2.6.35-fatal-signals.patch
-%patch710 -p1
+%patch712 -p1
# Drop some necessary files from the source dir into the buildroot
cp $RPM_SOURCE_DIR/config-* .
--- kernel.spec
+++ kernel.spec
@@ -390,14 +390,14 @@
# Multitouch input driver for event devices
-# linux-2.6.34-multi-touch-input-driver-for-event-devices.patch
+Patch710: linux-2.6.34-multi-touch-input-driver-for-event-devices.patch
# Enable stantum and cando drivers to use mtdev driver
-#linux-2.6.34-enable-hid-dg-contact-count-stantum-and-cando-touch-drivers.patch
+Patch711: linux-2.6.34-enable-hid-dg-contact-count-stantum-and-cando-touch-drivers.patch
# turn on "print fatal signals" by default, so that we can debug /sbin/init
# crashes
-Patch710: linux-2.6.35-fatal-signals.patch
+Patch712: linux-2.6.35-fatal-signals.patch
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -793,14 +793,16 @@
# Multitouch input driver for event devices
# linux-2.6.34-multi-touch-input-driver-for-event-devices.patch
+%patch710 -p1
# Enable stantum and cando drivers to use mtdev driver
-#linux-2.6.34-enable-hid-dg-contact-count-stantum-and-cando-touch-drivers.patch
+# linux-2.6.34-enable-hid-dg-contact-count-stantum-and-cando-touch-drivers.patch
+%patch711 -p1
# turn on "print fatal signals" by default, so that we can debug /sbin/init
# crashes
# linux-2.6.35-fatal-signals.patch
-%patch710 -p1
+%patch712 -p1
# Drop some necessary files from the source dir into the buildroot
cp $RPM_SOURCE_DIR/config-* .
other changes:
--------------
++++++ config-generic
--- config-generic
+++ config-generic
@@ -1350,7 +1350,7 @@
CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
CONFIG_INPUT_JOYDEV=m
CONFIG_INPUT_EVDEV=y
-CONFIG_INPUT_MTDEV=y
+# CONFIG_INPUT_MTDEV is not set
# CONFIG_INPUT_EVBUG is not set
#
++++++ config-netbook
--- config-netbook
+++ config-netbook
@@ -77,3 +77,4 @@
CONFIG_DRM_MRST_CDK=m
CONFIG_DRM_MRST=m
# CONFIG_DRM_MDFLD is not set
+CONFIG_INPUT_MTDEV=y
++++++ linux-2.6.34-enable-hid-dg-contact-count-stantum-and-cando-touch-drivers.patch (new)
--- linux-2.6.34-enable-hid-dg-contact-count-stantum-and-cando-touch-drivers.patch
+++ linux-2.6.34-enable-hid-dg-contact-count-stantum-and-cando-touch-drivers.patch
+From 3589c3e0ec88c19c330b88f7d37c8092987866e6 Mon Sep 17 00:00:00 2001
+From: Priya Vijayan <priya.vijayan at intel.com>
+Date: Fri, 30 Apr 2010 11:11:10 -0700
+Subject: [PATCH] Enable hid-dg-contactcount in stantum and cando touch drivers
+
+Enable hid-dg-contact count in stantum and cando touch drivers to be able to use with mtdev driver
+
+Patch-mainline: 2.6.34
+
+Signed-off-by: Priya Vijayan <priya.vijayan at intel.com>
+---
+ drivers/hid/hid-cando.c | 8 ++++++++
+ drivers/hid/hid-stantum.c | 11 ++++++++++-
+ 2 files changed, 18 insertions(+), 1 deletions(-)
+
+diff --git a/drivers/hid/hid-cando.c b/drivers/hid/hid-cando.c
+index ed8c093..42b9980 100644
+--- a/drivers/hid/hid-cando.c
++++ b/drivers/hid/hid-cando.c
+@@ -64,6 +64,10 @@ static int cando_input_mapping(struct hid_device *hdev, struct hid_input *hi,
+ case HID_DG_TIPSWITCH:
+ case HID_DG_CONTACTMAX:
+ return -1;
++ case HID_DG_CONTACTCOUNT:
++ hid_map_usage(hi, usage, bit, max,
++ EV_ABS, ABS_MT_CONTACT_COUNT);
++ return 1;
+ case HID_DG_INRANGE:
+ /* touchscreen emulation */
+ hid_map_usage(hi, usage, bit, max, EV_KEY, BTN_TOUCH);
+@@ -169,6 +173,10 @@ static int cando_event(struct hid_device *hid, struct hid_field *field,
+ struct input_dev *input = field->hidinput->input;
+
+ switch (usage->hid) {
++ case HID_DG_CONTACTCOUNT:
++ input_event(input,EV_ABS,ABS_MT_CONTACT_COUNT,value);
++ //input_mt_sync(input);
++ break;
+ case HID_DG_INRANGE:
+ td->valid = value;
+ break;
+diff --git a/drivers/hid/hid-stantum.c b/drivers/hid/hid-stantum.c
+index bb4430f..ac3df05 100644
+--- a/drivers/hid/hid-stantum.c
++++ b/drivers/hid/hid-stantum.c
+@@ -64,10 +64,15 @@ static int stantum_input_mapping(struct hid_device *hdev, struct hid_input *hi,
+ case HID_DG_CONFIDENCE:
+ case HID_DG_INPUTMODE:
+ case HID_DG_DEVICEINDEX:
+- case HID_DG_CONTACTCOUNT:
++ //case HID_DG_CONTACTCOUNT:
+ case HID_DG_CONTACTMAX:
+ return -1;
+
++ case HID_DG_CONTACTCOUNT:
++ hid_map_usage(hi, usage, bit, max,
++ EV_ABS, ABS_MT_CONTACT_COUNT);
++ return 1;
++
+ case HID_DG_TIPSWITCH:
+ /* touchscreen emulation */
+ hid_map_usage(hi, usage, bit, max, EV_KEY, BTN_TOUCH);
+@@ -171,6 +176,10 @@ static int stantum_event(struct hid_device *hid, struct hid_field *field,
+ struct input_dev *input = field->hidinput->input;
+
+ switch (usage->hid) {
++ case HID_DG_CONTACTCOUNT:
++ input_event(input,EV_ABS,ABS_MT_CONTACT_COUNT,value);
++ //input_mt_sync(input);
++ break;
+ case HID_DG_INRANGE:
+ /* this is the last field in a finger */
+ stantum_filter_event(sd, input);
+--
+1.6.2.2
+
++++++ series
--- series
+++ series
@@ -223,10 +223,10 @@
# Multitouch input driver for event devices
-# linux-2.6.34-multi-touch-input-driver-for-event-devices.patch
+linux-2.6.34-multi-touch-input-driver-for-event-devices.patch
# Enable stantum and cando drivers to use mtdev driver
-#linux-2.6.34-enable-hid-dg-contact-count-stantum-and-cando-touch-drivers.patch
+linux-2.6.34-enable-hid-dg-contact-count-stantum-and-cando-touch-drivers.patch
# turn on "print fatal signals" by default, so that we can debug /sbin/init
# crashes
More information about the MeeGo-commits
mailing list