tegra2: Allow Input Device Hotplug, and use evdev for keyboard and mice.
Instead of using legacy keyboard and mouse drivers, use the xf86-input-evdev for both.
This driver is automatically selected by the default configuration file:
/usr/share/X11/xorg.conf.d/10-evdev.conf
BUG=chromium-os:13705, chromium-os:13706
TEST=builtin keyboard and trackpad, USB keyboard and mouse all work.
Correct settings applied to mice and keyboards.
Correct trackpad settings applied.
Correct keymap applied and login screen, and per user settings after login.
No boot time regression.
Keyboard and trackpad useable at login prompt.
Reviewed-on: http://gerrit.chromium.org/gerrit/1109
Reviewed-by: Daniel Kurtz <djkurtz@chromium.org>
Tested-by: Daniel Kurtz <djkurtz@chromium.org>
Reviewed-by: Jon Kliegman <kliegs@chromium.org>
(cherry picked from commit 6b1c832b0fd9ba585cdc65b89dfe263f68aa8b1c)
Change-Id: Ifeea18f7f4e85e6a58d1f41d8bc6463398fb98bd
Reviewed-on: http://gerrit.chromium.org/gerrit/2083
Tested-by: Micah Catlin <micahc@chromium.org>
Reviewed-by: Micah Catlin <micahc@chromium.org>
diff --git a/overlay-tegra2/chromeos-base/xorg-conf/files/xorg.conf.fbdev b/overlay-tegra2/chromeos-base/xorg-conf/files/xorg.conf.fbdev
index 1c95c2d..ff028ba 100644
--- a/overlay-tegra2/chromeos-base/xorg-conf/files/xorg.conf.fbdev
+++ b/overlay-tegra2/chromeos-base/xorg-conf/files/xorg.conf.fbdev
@@ -7,22 +7,6 @@
Option "standby time" "0"
Option "suspend time" "0"
Option "off time" "0"
- Option "AllowEmptyInput" "False"
- Option "AutoAddDevices" "False"
- Option "AutoEnableDevices" "False"
-EndSection
-
-Section "InputDevice"
- Identifier "Keyboard1"
- Driver "kbd"
- Option "AutoRepeat" "500 5"
-EndSection
-
-Section "InputDevice"
- Identifier "Mouse1"
- Driver "mouse"
- Option "Protocol" "Auto"
- Option "Device" "/dev/input/mice"
EndSection
Section "Monitor"
@@ -86,6 +70,4 @@
Section "ServerLayout"
Identifier "Framebuffer"
Screen "Screen Framebuffer"
- InputDevice "Mouse1" "CorePointer"
- InputDevice "Keyboard1" "CoreKeyboard"
EndSection
diff --git a/overlay-tegra2/chromeos-base/xorg-conf/files/xorg.conf.opengles b/overlay-tegra2/chromeos-base/xorg-conf/files/xorg.conf.opengles
index cfffe65..0ac620f 100644
--- a/overlay-tegra2/chromeos-base/xorg-conf/files/xorg.conf.opengles
+++ b/overlay-tegra2/chromeos-base/xorg-conf/files/xorg.conf.opengles
@@ -8,22 +8,6 @@
Option "standby time" "0"
Option "suspend time" "0"
Option "off time" "0"
- Option "AllowEmptyInput" "False"
- Option "AutoAddDevices" "False"
- Option "AutoEnableDevices" "False"
-EndSection
-
-Section "InputDevice"
- Identifier "Keyboard1"
- Driver "kbd"
- Option "AutoRepeat" "500 5"
-EndSection
-
-Section "InputDevice"
- Identifier "Mouse1"
- Driver "mouse"
- Option "Protocol" "Auto"
- Option "Device" "/dev/input/mice"
EndSection
Section "InputDevice"
@@ -137,16 +121,12 @@
Section "ServerLayout"
Identifier "Internal"
Screen "Screen Internal"
- InputDevice "Mouse1" "CorePointer"
- InputDevice "Keyboard1" "CoreKeyboard"
InputDevice "mxt_touch"
EndSection
Section "ServerLayout"
Identifier "HDMI"
Screen "Screen HDMI"
- InputDevice "Mouse1" "CorePointer"
- InputDevice "Keyboard1" "CoreKeyboard"
InputDevice "mxt_touch"
EndSection
@@ -154,15 +134,11 @@
Identifier "DualView"
Screen "Screen Internal"
Screen "Screen HDMI" RightOf "Screen Internal"
- InputDevice "Mouse1" "CorePointer"
- InputDevice "Keyboard1" "CoreKeyboard"
InputDevice "mxt_touch"
EndSection
Section "ServerLayout"
Identifier "Mirror"
Screen "Screen Mirror"
- InputDevice "Mouse1" "CorePointer"
- InputDevice "Keyboard1" "CoreKeyboard"
InputDevice "mxt_touch"
EndSection
diff --git a/overlay-tegra2/chromeos-base/xorg-conf/files/xorg.conf.touch b/overlay-tegra2/chromeos-base/xorg-conf/files/xorg.conf.touch
index 1a8c58c..1bd6561 100644
--- a/overlay-tegra2/chromeos-base/xorg-conf/files/xorg.conf.touch
+++ b/overlay-tegra2/chromeos-base/xorg-conf/files/xorg.conf.touch
@@ -8,22 +8,6 @@
Option "standby time" "0"
Option "suspend time" "0"
Option "off time" "0"
- Option "AllowEmptyInput" "False"
- Option "AutoAddDevices" "True"
- Option "AutoEnableDevices" "True"
-EndSection
-
-Section "InputDevice"
- Identifier "Keyboard1"
- Driver "kbd"
- Option "AutoRepeat" "500 5"
-EndSection
-
-Section "InputDevice"
- Identifier "Mouse1"
- Driver "mouse"
- Option "Protocol" "Auto"
- Option "Device" "/dev/input/mice"
EndSection
Section "InputClass"
@@ -138,28 +122,20 @@
Section "ServerLayout"
Identifier "Internal"
Screen "Screen Internal"
- InputDevice "Mouse1" "CorePointer"
- InputDevice "Keyboard1" "CoreKeyboard"
EndSection
Section "ServerLayout"
Identifier "HDMI"
Screen "Screen HDMI"
- InputDevice "Mouse1" "CorePointer"
- InputDevice "Keyboard1" "CoreKeyboard"
EndSection
Section "ServerLayout"
Identifier "DualView"
Screen "Screen Internal"
Screen "Screen HDMI" RightOf "Screen Internal"
- InputDevice "Mouse1" "CorePointer"
- InputDevice "Keyboard1" "CoreKeyboard"
EndSection
Section "ServerLayout"
Identifier "Mirror"
Screen "Screen Mirror"
- InputDevice "Mouse1" "CorePointer"
- InputDevice "Keyboard1" "CoreKeyboard"
EndSection
