---

yaml --- r: 354188 b: refs/heads/master c: 06ddd35 h: refs/heads/master v: v3
git-mirror · Jan 26, 2013 · e8c7aa1 · e8c7aa1
1 parent 4dc0e16
commit e8c7aa1
Show file tree

Hide file tree

Showing 3 changed files with 452 additions and 22 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2b4ff03895e4451719400e9ac50980b9d14af37d
+refs/heads/master: 06ddd353f5c8678238d519dcecf9d557e5e1f7a6
diff --git a/trunk/Documentation/devicetree/bindings/staging/iio/adc/mxs-lradc.txt b/trunk/Documentation/devicetree/bindings/staging/iio/adc/mxs-lradc.txt
@@ -5,6 +5,12 @@ Required properties:
 - reg: Address and length of the register set for the device
 - interrupts: Should contain the LRADC interrupts
 
+Optional properties:
+- fsl,lradc-touchscreen-wires: Number of wires used to connect the touchscreen
+                               to LRADC. Valid value is either 4 or 5. If this
+                               property is not present, then the touchscreen is
+                               disabled.
+
 Examples:
 
 	lradc@80050000 {