---

yaml --- r: 306595 b: refs/heads/master c: 3460408 h: refs/heads/master i: 306593: 7aeedee 306591: 00d83fe v: v3
git-mirror · Apr 24, 2012 · 4231042 · 4231042
1 parent 56487ab
commit 4231042
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f57fe78ee48f7aa1f859e7e9c4d6987276a72ecc
+refs/heads/master: 34604086bea11f1f4d7ff124c84dab9b89956837
diff --git a/trunk/Documentation/devicetree/bindings/input/touchscreen/lpc32xx-tsc.txt b/trunk/Documentation/devicetree/bindings/input/touchscreen/lpc32xx-tsc.txt
@@ -1,15 +1,15 @@
 * NXP LPC32xx SoC Touchscreen Controller (TSC)
 
 Required properties:
-- compatible: must be "nxp,lpc32xx-tsc"
+- compatible: must be "nxp,lpc3220-tsc"
 - reg: physical base address of the controller and length of memory mapped
   region.
 - interrupts: The TSC/ADC interrupt
 
 Example:
 
 	tsc@40048000 {
-		compatible = "nxp,lpc32xx-tsc";
+		compatible = "nxp,lpc3220-tsc";
 		reg = <0x40048000 0x1000>;
 		interrupt-parent = <&mic>;
 		interrupts = <39 0>;

diff --git a/trunk/drivers/input/touchscreen/lpc32xx_ts.c b/trunk/drivers/input/touchscreen/lpc32xx_ts.c
@@ -386,7 +386,7 @@ static const struct dev_pm_ops lpc32xx_ts_pm_ops = {
 
 #ifdef CONFIG_OF
 static struct of_device_id lpc32xx_tsc_of_match[] = {
-	{ .compatible = "nxp,lpc32xx-tsc", },
+	{ .compatible = "nxp,lpc3220-tsc", },
 	{ },
 };
 MODULE_DEVICE_TABLE(of, lpc32xx_tsc_of_match);