diff options
author | Roland Stigge <stigge@antcom.de> | 2012-04-24 01:26:38 -0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-04-24 02:35:59 -0400 |
commit | 34604086bea11f1f4d7ff124c84dab9b89956837 (patch) | |
tree | 0b969cd5b62678db31409bf3c6a6d517796a9b59 | |
parent | f57fe78ee48f7aa1f859e7e9c4d6987276a72ecc (diff) |
Input: lpc32xx_ts - fix device tree compatible string
During the device tree integration of the various LPC32xx drivers,
we agreed on using non-wildcard "compatible" strings. This change
switches lpc32xx_ts touchscreen driver to use "nxp,lpc3220-tsc".
Signed-off-by: Roland Stigge <stigge@antcom.de>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
-rw-r--r-- | Documentation/devicetree/bindings/input/touchscreen/lpc32xx-tsc.txt | 4 | ||||
-rw-r--r-- | drivers/input/touchscreen/lpc32xx_ts.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/devicetree/bindings/input/touchscreen/lpc32xx-tsc.txt b/Documentation/devicetree/bindings/input/touchscreen/lpc32xx-tsc.txt index d0c68e33de3a..41cbf4b7a670 100644 --- a/Documentation/devicetree/bindings/input/touchscreen/lpc32xx-tsc.txt +++ b/Documentation/devicetree/bindings/input/touchscreen/lpc32xx-tsc.txt | |||
@@ -1,7 +1,7 @@ | |||
1 | * NXP LPC32xx SoC Touchscreen Controller (TSC) | 1 | * NXP LPC32xx SoC Touchscreen Controller (TSC) |
2 | 2 | ||
3 | Required properties: | 3 | Required properties: |
4 | - compatible: must be "nxp,lpc32xx-tsc" | 4 | - compatible: must be "nxp,lpc3220-tsc" |
5 | - reg: physical base address of the controller and length of memory mapped | 5 | - reg: physical base address of the controller and length of memory mapped |
6 | region. | 6 | region. |
7 | - interrupts: The TSC/ADC interrupt | 7 | - interrupts: The TSC/ADC interrupt |
@@ -9,7 +9,7 @@ Required properties: | |||
9 | Example: | 9 | Example: |
10 | 10 | ||
11 | tsc@40048000 { | 11 | tsc@40048000 { |
12 | compatible = "nxp,lpc32xx-tsc"; | 12 | compatible = "nxp,lpc3220-tsc"; |
13 | reg = <0x40048000 0x1000>; | 13 | reg = <0x40048000 0x1000>; |
14 | interrupt-parent = <&mic>; | 14 | interrupt-parent = <&mic>; |
15 | interrupts = <39 0>; | 15 | interrupts = <39 0>; |
diff --git a/drivers/input/touchscreen/lpc32xx_ts.c b/drivers/input/touchscreen/lpc32xx_ts.c index e8fccbc452db..4c2b8ed3bf16 100644 --- a/drivers/input/touchscreen/lpc32xx_ts.c +++ b/drivers/input/touchscreen/lpc32xx_ts.c | |||
@@ -386,7 +386,7 @@ static const struct dev_pm_ops lpc32xx_ts_pm_ops = { | |||
386 | 386 | ||
387 | #ifdef CONFIG_OF | 387 | #ifdef CONFIG_OF |
388 | static struct of_device_id lpc32xx_tsc_of_match[] = { | 388 | static struct of_device_id lpc32xx_tsc_of_match[] = { |
389 | { .compatible = "nxp,lpc32xx-tsc", }, | 389 | { .compatible = "nxp,lpc3220-tsc", }, |
390 | { }, | 390 | { }, |
391 | }; | 391 | }; |
392 | MODULE_DEVICE_TABLE(of, lpc32xx_tsc_of_match); | 392 | MODULE_DEVICE_TABLE(of, lpc32xx_tsc_of_match); |