xorg.conf: update keyboard config with evdev

with xserver 1.10, the evdev driver is used by default, so update the
keyboard config entry in xorg.conf accordingly.

Fix [YOCTO #1108]

(From OE-Core rev: 729999cb384978404ecdfa8ea4ae0eb831fb9ece)

Signed-off-by: Yu Ke <ke.yu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

2 files changed, 6 insertions, 4 deletions

diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86-64/xorg.conf b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86-64/xorg.conf
index 4216de7bdf..10a6d9a0bc 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86-64/xorg.conf
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86-64/xorg.conf
@@ -4,10 +4,11 @@ EndSection
 
 Section "InputDevice"
     Identifier    "Generic Keyboard"
-    Driver        "kbd"
+    Driver        "evdev"
     Option        "CoreKeyboard"
+    Option        "Device"      "/dev/input/by-path/platform-i8042-serio-0-event-kbd"
     Option        "XkbRules"    "xorg"
-    Option        "XkbModel"    "pc105"
+    Option        "XkbModel"    "evdev"
     Option        "XkbLayout"    "us"
 EndSection
 
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86/xorg.conf b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86/xorg.conf
index 4216de7bdf..10a6d9a0bc 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86/xorg.conf
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/qemux86/xorg.conf
@@ -4,10 +4,11 @@ EndSection
 
 Section "InputDevice"
     Identifier    "Generic Keyboard"
-    Driver        "kbd"
+    Driver        "evdev"
     Option        "CoreKeyboard"
+    Option        "Device"      "/dev/input/by-path/platform-i8042-serio-0-event-kbd"
     Option        "XkbRules"    "xorg"
-    Option        "XkbModel"    "pc105"
+    Option        "XkbModel"    "evdev"
     Option        "XkbLayout"    "us"
 EndSection