Signed-off-by: Lukas Märdian <lukasmaerd...@gmail.com>
---
 meta-openmoko/conf/machine/om-gta04.conf           |    1 +
 meta-shr/recipes-core/tasks/task-base.bbappend     |    2 +-
 meta-shr/recipes-core/udev/udev-gta04-rules.bb     |   22 ++++++++++++++++++++
 .../udev/udev-gta04-rules/charger.rules            |    3 +++
 .../recipes-core/udev/udev-gta04-rules/hso.rules   |    2 ++
 .../recipes-core/udev/udev-gta04-rules/input.rules |    6 ++++++
 6 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 meta-shr/recipes-core/udev/udev-gta04-rules.bb
 create mode 100644 meta-shr/recipes-core/udev/udev-gta04-rules/charger.rules
 create mode 100644 meta-shr/recipes-core/udev/udev-gta04-rules/hso.rules
 create mode 100644 meta-shr/recipes-core/udev/udev-gta04-rules/input.rules

diff --git a/meta-openmoko/conf/machine/om-gta04.conf 
b/meta-openmoko/conf/machine/om-gta04.conf
index 0b41ad3..32f4f46 100644
--- a/meta-openmoko/conf/machine/om-gta04.conf
+++ b/meta-openmoko/conf/machine/om-gta04.conf
@@ -57,6 +57,7 @@ READER_UI         = "gtk"
 
 # package machine specific modules
 MACHINE_EXTRA_RRECOMMENDS = "\
+  udev-gta04-rules \
   kernel-module-g-ether \
   kernel-module-bridge \
   kernel-module-hso \
diff --git a/meta-shr/recipes-core/tasks/task-base.bbappend 
b/meta-shr/recipes-core/tasks/task-base.bbappend
index 3968d58..ee134db 100644
--- a/meta-shr/recipes-core/tasks/task-base.bbappend
+++ b/meta-shr/recipes-core/tasks/task-base.bbappend
@@ -2,4 +2,4 @@ RDEPENDS_task-base-phone = ""
 # we don't want
 #    gsmd \
 #    libgsmd-tools"
-PRINC := "${@int(PRINC) + 2}"
+PRINC := "${@int(PRINC) + 3}"
diff --git a/meta-shr/recipes-core/udev/udev-gta04-rules.bb 
b/meta-shr/recipes-core/udev/udev-gta04-rules.bb
new file mode 100644
index 0000000..cd1b320
--- /dev/null
+++ b/meta-shr/recipes-core/udev/udev-gta04-rules.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "Extra GTA04 udev rules"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = 
"file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
+
+inherit allarch
+
+SRC_URI = " \
+    file://charger.rules \
+    file://hso.rules \
+    file://input.rules \
+"
+
+do_install() {
+    install -d ${D}${sysconfdir}/udev/rules.d
+
+    install -m 0644 ${WORKDIR}/charger.rules     
${D}${sysconfdir}/udev/rules.d/charger.rules
+    install -m 0644 ${WORKDIR}/hso.rules         
${D}${sysconfdir}/udev/rules.d/hso.rules
+    install -m 0644 ${WORKDIR}/input.rules       
${D}${sysconfdir}/udev/rules.d/input.rules
+}
+
+FILES_${PN} = "${sysconfdir}/udev"
+RDEPENDS_${PN} = "udev"
diff --git a/meta-shr/recipes-core/udev/udev-gta04-rules/charger.rules 
b/meta-shr/recipes-core/udev/udev-gta04-rules/charger.rules
new file mode 100644
index 0000000..92a7376
--- /dev/null
+++ b/meta-shr/recipes-core/udev/udev-gta04-rules/charger.rules
@@ -0,0 +1,3 @@
+SUBSYSTEM=="power_supply", ACTION=="change", 
DEVPATH=="*power_supply/twl4030_usb" ATTRS{1-0048/twl4030_usb/id}=="floating", 
ATTR{../../max_current}="500000"
+SUBSYSTEM=="power_supply", ACTION=="change", 
DEVPATH=="*power_supply/twl4030_usb" ATTRS{1-0048/twl4030_usb/id}=="102k", 
ATTR{../../max_current}="851000"
+
diff --git a/meta-shr/recipes-core/udev/udev-gta04-rules/hso.rules 
b/meta-shr/recipes-core/udev/udev-gta04-rules/hso.rules
new file mode 100644
index 0000000..dee69d1
--- /dev/null
+++ b/meta-shr/recipes-core/udev/udev-gta04-rules/hso.rules
@@ -0,0 +1,2 @@
+SUBSYSTEM=="tty", KERNEL=="ttyHS*", ATTR{hsotype}=="?*", ATTRS{busnum}=="?*", 
SYMLINK+="ttyHS_$attr{hsotype}", OPTIONS+="string_escape=replace"
+
diff --git a/meta-shr/recipes-core/udev/udev-gta04-rules/input.rules 
b/meta-shr/recipes-core/udev/udev-gta04-rules/input.rules
new file mode 100644
index 0000000..073a4df
--- /dev/null
+++ b/meta-shr/recipes-core/udev/udev-gta04-rules/input.rules
@@ -0,0 +1,6 @@
+SUBSYSTEM=="input", KERNEL=="event[0-9]*", 
ATTRS{modalias}=="input:*-e0,15,*f50,51*", SYMLINK="input/rumble"
+SUBSYSTEM=="input", KERNEL=="event[0-9]*", 
ATTRS{modalias}=="input:*-e0*,3,*a0,1,*18,*", SYMLINK+="input/touchscreen"
+SUBSYSTEM=="input", KERNEL=="event[0-9]*", 
ATTRS{modalias}=="input:*-e0,3,*a0,1,2,*", SYMLINK+="input/accel"
+SUBSYSTEM=="input", KERNEL=="event[0-9]*", 
ATTRS{modalias}=="input:*-e0,1,*k74,*", SYMLINK+="input/power"
+SUBSYSTEM=="input", KERNEL=="event[0-9]*", 
ATTRS{modalias}=="input:*-e0,1,*kA9,*", SYMLINK+="input/aux"
+
-- 
1.7.9.5

_______________________________________________
Shr-devel mailing list
Shr-devel@lists.shr-project.org
http://lists.shr-project.org/mailman/listinfo/shr-devel

Reply via email to