From 34604086bea11f1f4d7ff124c84dab9b89956837 Mon Sep 17 00:00:00 2001 From: Roland Stigge Date: Mon, 23 Apr 2012 22:26:38 -0700 Subject: [PATCH] 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 Signed-off-by: Dmitry Torokhov --- .../devicetree/bindings/input/touchscreen/lpc32xx-tsc.txt | 4 ++-- 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 @@ * 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/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 = { #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); -- 2.20.1