summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am5
-rw-r--r--hwdb/70-touchpad.hwdb43
-rw-r--r--rules/42-usb-hid-pm.rules36
-rw-r--r--rules/70-touchpad.rules12
4 files changed, 1 insertions, 95 deletions
diff --git a/Makefile.am b/Makefile.am
index d6e0b4ce39..810a147268 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3486,7 +3486,6 @@ dist_network_DATA = \
network/80-container-ve.network
dist_udevrules_DATA += \
- rules/42-usb-hid-pm.rules \
rules/50-udev-default.rules \
rules/60-block.rules \
rules/60-drm.rules \
@@ -3498,7 +3497,6 @@ dist_udevrules_DATA += \
rules/60-serial.rules \
rules/64-btrfs.rules \
rules/70-mouse.rules \
- rules/70-touchpad.rules \
rules/75-net-description.rules \
rules/78-sound-card.rules \
rules/80-net-setup-link.rules
@@ -3667,8 +3665,7 @@ dist_udevhwdb_DATA = \
hwdb/60-evdev.hwdb \
hwdb/60-keyboard.hwdb \
hwdb/70-mouse.hwdb \
- hwdb/70-pointingstick.hwdb \
- hwdb/70-touchpad.hwdb
+ hwdb/70-pointingstick.hwdb
SYSINIT_TARGET_WANTS += \
systemd-hwdb-update.service
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/rules/42-usb-hid-pm.rules b/rules/42-usb-hid-pm.rules
deleted file mode 100644
index 3721219098..0000000000
--- a/rules/42-usb-hid-pm.rules
+++ /dev/null
@@ -1,36 +0,0 @@
-# do not edit this file, it will be overwritten on update
-#
-# Enable autosuspend for qemu emulated usb hid devices
-
-# Note that there are buggy qemu versions (0.13 & older) which
-# advertise remote wakeup support but don't actually implement
-# it correctly. This is the reason why we need a match for the
-# serial number here. Old, broken versions have serial "1".
-# It has been changed to "42" after fixing the bug to indicate
-# remote wakeup is working.
-ACTION=="add", SUBSYSTEM=="usb", ATTR{product}=="QEMU USB Mouse", ATTR{serial}!="1", TEST=="power/control", ATTR{power/control}="auto"
-ACTION=="add", SUBSYSTEM=="usb", ATTR{product}=="QEMU USB Tablet", ATTR{serial}!="1", TEST=="power/control", ATTR{power/control}="auto"
-ACTION=="add", SUBSYSTEM=="usb", ATTR{product}=="QEMU USB Keyboard", ATTR{serial}!="1", TEST=="power/control", ATTR{power/control}="auto"
-
-# Dell DRAC 4
-ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="413c", ATTR{idProduct}=="2500", TEST=="power/control", ATTR{power/control}="auto"
-
-# Dell DRAC 5
-ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="413c", ATTR{idProduct}=="0000", TEST=="power/control", ATTR{power/control}="auto"
-
-# IBM remote access
-ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="04b3", ATTR{idProduct}=="4001", TEST=="power/control", ATTR{power/control}="auto"
-ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="04b3", ATTR{idProduct}=="4002", TEST=="power/control", ATTR{power/control}="auto"
-ACTION=="add", SUBSYSTEM=="usb", ATTRS{idVendor}=="04b3", ATTR{idProduct}=="4012", TEST=="power/control", ATTR{power/control}="auto"
-
-# Raritan Computer, Inc KVM.
-ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="14dd", ATTR{idProduct}=="0002", TEST=="power/control", ATTR{power/control}="auto"
-
-# USB HID devices that are internal to the machine should also be safe to autosuspend
-
-ACTION=="add", SUBSYSTEM=="usb", SUBSYSTEMS=="usb", ATTR{../removable}=="removable", GOTO="usb_hid_pm_end"
-ACTION=="add", SUBSYSTEM=="usb", SUBSYSTEMS=="usb", ATTR{../removable}=="unknown", GOTO="usb_hid_pm_end"
-
-ACTION=="add", SUBSYSTEM=="usb", ATTR{bInterfaceClass}=="03", ATTR{../removable}=="fixed", TEST=="../power/control", ATTR{../power/control}="auto"
-
-LABEL="usb_hid_pm_end"
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"