sync with Tizen:Main version

diff --git a/60-cando-evdevmultitouch.conf b/60-cando-evdevmultitouch.conf
new file mode 100644 (file)
index 0000000..3d6657f
--- /dev/null
+++ b/60-cando-evdevmultitouch.conf
@@ -0,0 +1,17 @@
+Section "Monitor"
+       Identifier      "Monitor0"
+       Option  "DPMS"  "true"
+       Option  "Rotate"        "left"
+EndSection
+
+Section "InputClass"
+        Identifier              "Cando Multi Touch Panel"
+        MatchVendor            "Cando"
+        MatchDevicePath        "/dev/input/event*"
+        Driver                  "evdevmultitouch"
+        Option                  "Ignore"                "off"
+       Option                  "MultiTouch"            "2"
+       Option                  "Resolution"            "0 4095 0 4095
+       Option                  "SwapAxes"              "true"
+       Option                  "InvertX"               "true"
+EndSection

diff --git a/60-mxt224-evdevmultitouch.conf b/60-mxt224-evdevmultitouch.conf
new file mode 100644 (file)
index 0000000..5872dd0
--- /dev/null
+++ b/60-mxt224-evdevmultitouch.conf
@@ -0,0 +1,9 @@
+Section "InputClass"
+        Identifier              "Atmel maXTouch mXT224"
+        MatchProduct           "mxt224_touchscreen"
+        MatchDevicePath        "/dev/input/event*"
+        Driver                  "evdevmultitouch"
+        Option                  "MultiTouch"   "5"
+        Option                  "Resolution"   "0 600 0 1024"
+        Option                  "Calibration"  "0 1023 0 1023"
+EndSection

diff --git a/65-Atmel-mtev.conf b/65-Atmel-mtev.conf
new file mode 100644 (file)
index 0000000..a60b39a
--- /dev/null
+++ b/65-Atmel-mtev.conf
@@ -0,0 +1,7 @@
+Section "InputClass"
+        Identifier     "Atmel Touchscreen"
+       MatchProduct    "Atmel maXTouch Touchscreen"
+        Driver         "mtev"
+       Option          "SwapAxes" "True"
+       Option          "InvertX"       "True"
+EndSection

diff --git a/packaging/device-config-touch.changes b/packaging/device-config-touch.changes
index dff415b..186b01b 100644 (file)
--- a/packaging/device-config-touch.changes
+++ b/packaging/device-config-touch.changes
@@ -1,6 +1,3 @@
-* Tue Oct  9 21:55:43 UTC 2012 - tracy.graydon@intel.com
-- Merging Tizen:Main version with IVI version to pick up maifest 
-
 * Fri Aug 3 2012 Brad Peters <brad.t.peters@intel.com>
 - Flipping MT input to support a left rotation of display