diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2015-06-26 16:09:48 +1000 |
|---|---|---|
| committer | Anthony G. Basile <blueness@gentoo.org> | 2015-07-20 07:28:05 -0400 |
| commit | a5cb5f0b4cc2a00be836b77d421fe5c3529c03de (patch) | |
| tree | 8efbb46234eae47c7dc1c46023f6cc6cfc3273de | |
| parent | b5ac92fb857cff9cdf6f3ddc79df63eb30824529 (diff) | |
Revert "hwdb: add a touchpad hwdb"
The main purpose of this hwdb was to tag touchpads that have the physical
trackstick buttons wired to the touchpad (Lenovo Carbon X1 3rd, Lenovo *50
series). This hwdb is not required on kernels 4.0 and above, the kernel now
re-routes button presses through the trackstick's device node. Userspace does
not need to do anything.
See kernel commit cdd9dc195916ef5644cfac079094c3c1d1616e4c.
This reverts commit 001a247324b44c0e0b8fdba41a6fc66e7465b8b6.
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
| -rw-r--r-- | hwdb/70-touchpad.hwdb | 43 | ||||
| -rw-r--r-- | hwdb/Makefile.am | 2 | ||||
| -rw-r--r-- | rules/70-touchpad.rules | 12 | ||||
| -rw-r--r-- | rules/Makefile.am | 1 |
4 files changed, 1 insertions, 57 deletions
diff --git a/hwdb/70-touchpad.hwdb b/hwdb/70-touchpad.hwdb deleted file mode 100644 index 8a324466b3..0000000000 --- a/hwdb/70-touchpad.hwdb +++ /dev/null @@ -1,43 +0,0 @@ -# This file is part of systemd. -# -# The lookup keys are composed in: -# 70-touchpad.rules -# -# Note: The format of the "touchpad:" prefix match key is a -# contract between the rules file and the hardware data, it might -# change in later revisions to support more or better matches, it -# is not necessarily expected to be a stable ABI. -# -# Match string format: -# touchpad:pnpid:<pnpid>: -# -# To add local entries, create a new file -# /etc/udev/hwdb.d/71-touchpad-local.hwdb -# and add your rules there. To load the new rules execute (as root): -# udevadm hwdb --update -# udevadm trigger /dev/input/eventXX -# where /dev/input/eventXX is the touchpad in question. If in -# doubt, simply use /dev/input/event* to reload all input rules. -# -# If your changes are generally applicable, open a bug report on -# http://bugs.freedesktop.org/enter_bug.cgi?product=systemd -# and include your new rules, a description of the device, and the -# output of -# udevadm info /dev/input/eventXX -# (or /dev/input/event*). -# -# Allowed properties are: -# TOUCHPAD_HAS_TRACKPOINT_BUTTONS=1 -# -# If the TOUCHPAD_HAS_TRACKPOINT_BUTTONS property is set, this -# device has # the trackpoint buttons wired up to the touchpad as -# BTN_0, BTN_1 and BTN_2. This affects the Lenovo X1 Carbon 3rd -# and the *50 series (T450, T550, etc.) - -# Lenovo X1 Carbon 3rd -touchpad:pnpid:*LEN0048*: -# Lenovo W541 -touchpad:pnpid:*LEN004a*: -# Lenovo T450s -touchpad:pnpid:*LEN200f*: - TOUCHPAD_HAS_TRACKPOINT_BUTTONS=1 diff --git a/hwdb/Makefile.am b/hwdb/Makefile.am index c8388f96ed..cc0b4fa4ac 100644 --- a/hwdb/Makefile.am +++ b/hwdb/Makefile.am @@ -13,4 +13,4 @@ dist_udevhwdb_DATA = \ 60-evdev.hwdb \ 60-keyboard.hwdb \ 70-mouse.hwdb \ - 70-touchpad.hwdb + 70-pointingstick.hwdb diff --git a/rules/70-touchpad.rules b/rules/70-touchpad.rules deleted file mode 100644 index 88e6fd2f25..0000000000 --- a/rules/70-touchpad.rules +++ /dev/null @@ -1,12 +0,0 @@ -# do not edit this file, it will be overwritten on update - -ACTION=="remove", GOTO="touchpad_end" -KERNEL!="event*", GOTO="touchpad_end" -ENV{ID_INPUT_TOUCHPAD}=="", GOTO="touchpad_end" - -# touchpad:pnpid:<pnpid>:* -KERNELS=="serio1", \ - IMPORT{builtin}="hwdb 'touchpad:pnpid:$attr{firmware_id}:'", \ - GOTO="touchpad_end" - -LABEL="touchpad_end" diff --git a/rules/Makefile.am b/rules/Makefile.am index 6be3ae488b..f266e50a28 100644 --- a/rules/Makefile.am +++ b/rules/Makefile.am @@ -14,7 +14,6 @@ dist_udevrules_DATA = \ 61-accelerometer.rules \ 64-btrfs.rules \ 70-mouse.rules \ - 70-touchpad.rules \ 75-net-description.rules \ 75-probe_mtd.rules \ 78-sound-card.rules \ |