| Message ID | 20210902215144.507243-36-miquel.raynal@bootlin.com |
|---|---|
| State | Accepted |
| Commit | 90fc6ff48be44ece2cb9b0012074bd0e642f48bc |
| Headers | show |
| Series | TI AM437X ADC1 | expand |
On Thu, 2 Sep 2021 23:51:33 +0200 Miquel Raynal <miquel.raynal@bootlin.com> wrote: > There was in the past a typo in the coordinate readouts property. The > bindings have been updated, the touchscreen driver as well and now > supports both. However, the MFD driver that is in charge of verifying > the validity of the property only checks the bogus one. Add support for > the correctly spelled DT property. > > Fixes: c9aeb249bf72 ("Input: ti_am335x_tsc - fix spelling mistake in TSC/ADC DT binding") > Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> Looks good now. Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> > --- > drivers/mfd/ti_am335x_tscadc.c | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/drivers/mfd/ti_am335x_tscadc.c b/drivers/mfd/ti_am335x_tscadc.c > index a3347f9fc388..4c2fe9910400 100644 > --- a/drivers/mfd/ti_am335x_tscadc.c > +++ b/drivers/mfd/ti_am335x_tscadc.c > @@ -144,8 +144,14 @@ static int ti_tscadc_probe(struct platform_device *pdev) > if (tscadc->data->has_tsc) { > node = of_get_child_by_name(pdev->dev.of_node, "tsc"); > of_property_read_u32(node, "ti,wires", &tscmag_wires); > - of_property_read_u32(node, "ti,coordiante-readouts", &readouts); > + err = of_property_read_u32(node, "ti,coordinate-readouts", > + &readouts); > + if (err < 0) > + of_property_read_u32(node, "ti,coordiante-readouts", > + &readouts); > + > of_node_put(node); > + > if (tscmag_wires) > use_tsc = true; > } else {
diff --git a/drivers/mfd/ti_am335x_tscadc.c b/drivers/mfd/ti_am335x_tscadc.c index a3347f9fc388..4c2fe9910400 100644 --- a/drivers/mfd/ti_am335x_tscadc.c +++ b/drivers/mfd/ti_am335x_tscadc.c @@ -144,8 +144,14 @@ static int ti_tscadc_probe(struct platform_device *pdev) if (tscadc->data->has_tsc) { node = of_get_child_by_name(pdev->dev.of_node, "tsc"); of_property_read_u32(node, "ti,wires", &tscmag_wires); - of_property_read_u32(node, "ti,coordiante-readouts", &readouts); + err = of_property_read_u32(node, "ti,coordinate-readouts", + &readouts); + if (err < 0) + of_property_read_u32(node, "ti,coordiante-readouts", + &readouts); + of_node_put(node); + if (tscmag_wires) use_tsc = true; } else {
There was in the past a typo in the coordinate readouts property. The bindings have been updated, the touchscreen driver as well and now supports both. However, the MFD driver that is in charge of verifying the validity of the property only checks the bogus one. Add support for the correctly spelled DT property. Fixes: c9aeb249bf72 ("Input: ti_am335x_tsc - fix spelling mistake in TSC/ADC DT binding") Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> --- drivers/mfd/ti_am335x_tscadc.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)