From 42310428a56bca4d0ae789cc267d3468547db780 Mon Sep 17 00:00:00 2001 From: Roland Stigge Date: Mon, 23 Apr 2012 22:26:38 -0700 Subject: [PATCH] --- yaml --- r: 306595 b: refs/heads/master c: 34604086bea11f1f4d7ff124c84dab9b89956837 h: refs/heads/master i: 306593: 7aeedee4f02dceed04a4720af1b488c239df12b5 306591: 00d83feef4fd22a7b46246ce25d71c852b70acda v: v3 --- [refs] | 2 +- .../devicetree/bindings/input/touchscreen/lpc32xx-tsc.txt | 4 ++-- trunk/drivers/input/touchscreen/lpc32xx_ts.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 8d4f56acb28b..6ed44ebe253d 100644 --- 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 index d0c68e33de3a..41cbf4b7a670 100644 --- a/trunk/Documentation/devicetree/bindings/input/touchscreen/lpc32xx-tsc.txt +++ b/trunk/Documentation/devicetree/bindings/input/touchscreen/lpc32xx-tsc.txt @@ -1,7 +1,7 @@ * 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 @@ -9,7 +9,7 @@ Required properties: 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 index e8fccbc452db..4c2b8ed3bf16 100644 --- 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);