aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorFelipe Balbi <balbi@ti.com>2013-11-10 23:56:43 -0800
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2013-11-11 00:01:45 -0800
commitc9aeb249bf72edcf1ca28fe301fb3cbb53cb23d8 (patch)
tree18cc82506adda0bb411a6266676a0e90e8bb5b4d /drivers/input
parentInput: cyttsp4 - replace IS_ERR and PTR_ERR with PTR_ERR_OR_ZERO (diff)
downloadlinux-dev-c9aeb249bf72edcf1ca28fe301fb3cbb53cb23d8.tar.xz
linux-dev-c9aeb249bf72edcf1ca28fe301fb3cbb53cb23d8.zip
Input: ti_am335x_tsc - fix spelling mistake in TSC/ADC DT binding
There was a spelling mistake on TSC/ADC binding where "coordinate" was spelled as "coordiante". We can't simply fix the error due to DT being an ABI, the approach taken was to first use correct spelling and if that fails, fall back to miss-spelled version. It's unfortunate that has creeped into the tree. Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/touchscreen/ti_am335x_tsc.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/ti_am335x_tsc.c b/drivers/input/touchscreen/ti_am335x_tsc.c
index df9b24f7e2cb..ad7564296ddf 100644
--- a/drivers/input/touchscreen/ti_am335x_tsc.c
+++ b/drivers/input/touchscreen/ti_am335x_tsc.c
@@ -348,9 +348,16 @@ static int titsc_parse_dt(struct platform_device *pdev,
if (err < 0)
return err;
- err = of_property_read_u32(node, "ti,coordiante-readouts",
+ /*
+ * Try with the new binding first. If it fails, try again with
+ * bogus, miss-spelled version.
+ */
+ err = of_property_read_u32(node, "ti,coordinate-readouts",
&ts_dev->coordinate_readouts);
if (err < 0)
+ err = of_property_read_u32(node, "ti,coordiante-readouts",
+ &ts_dev->coordinate_readouts);
+ if (err < 0)
return err;
return of_property_read_u32_array(node, "ti,wire-config",