[oe-commits] Denis 'GNUtoo' Carikli : xserver-xorg-conf: add support for newer kernel for the nokia900

[git version control]

Module: openembedded.git
Branch: master
Commit: c012be8a84840a7411e86d0ae214a2760af9b33d
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=c012be8a84840a7411e86d0ae214a2760af9b33d

Author: Denis 'GNUtoo' Carikli <GNUtoo at no-log.org>
Date:   Tue Mar 29 12:29:11 2011 +0200

xserver-xorg-conf: add support for newer kernel for the nokia900

Note that there are whitespaces issues in the nokia900's xorg.conf
Also note that it may not be the final xorg.conf since the kernel
  defconfig may change to add new input devices(sensors etc...)

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo at no-log.org>

---

 .../xserver-xorg-conf/nokia900/xorg.conf           |   19 +++++++++++++++++--
 recipes/xorg-xserver/xserver-xorg-conf_0.1.bb      |    2 +-
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/recipes/xorg-xserver/xserver-xorg-conf/nokia900/xorg.conf b/recipes/xorg-xserver/xserver-xorg-conf/nokia900/xorg.conf
index c1c89a2..d9d742f 100644
--- a/recipes/xorg-xserver/xserver-xorg-conf/nokia900/xorg.conf
+++ b/recipes/xorg-xserver/xserver-xorg-conf/nokia900/xorg.conf
@@ -20,9 +20,22 @@ Section "Device"
 EndSection
 
 Section "InputDevice"
+	Identifier	"gpio-keys"
+        Driver          "evdev"
+        Option          "Device"        "/dev/input/event0"
+EndSection
+
+Section "InputDevice"
+        Identifier	"twl4030_pwrbutton"
+        Driver          "evdev"
+        Option          "Device"        "/dev/input/event3"
+EndSection
+
+
+Section "InputDevice"
 	Identifier      "Keyboard"
 	Driver          "evdev"
-	Option		"Device"	"/dev/input/event0"
+	Option		"Device"	"/dev/input/event1"
 	Option		"XkbModel"	"nokiarx51"
 	Option		"XkbLayout"	"us"
 	Option          "CoreKeyboard"
@@ -31,7 +44,7 @@ EndSection
 Section "InputDevice"
 	Identifier      "Touchscreen"
 	Driver          "evdev"
-	Option          "Device"        "/dev/input/event1"
+	Option          "Device"        "/dev/input/event2"
 EndSection
 
 Section "Screen"
@@ -44,4 +57,6 @@ Section "ServerLayout"
 	Screen		"Default Screen"
 	InputDevice     "Touchscreen"
 	InputDevice     "Keyboard"
+	InputDevice     "gpio-keys"
+	InputDevice     "twl4030_pwrbutton"
 EndSection
diff --git a/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb b/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb
index 1856ea6..5de24be 100644
--- a/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb
+++ b/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Machine specific xorg.conf files"
-PR = "r45"
+PR = "r46"
 
 SRC_URI = "file://xorg.conf"