On Wed, 25 Aug 2021 17:25:01 +0200
Miquel Raynal <miquel.raynal@xxxxxxxxxxx> wrote:
> We need to retrieve the number of wires used by the "secondary" device
> (the touchscreen or the magnetic reader). Let's rename tsc_wires to
> become tscmag_wires to clarify the fact that this variable can be used
> in both situations.
>
> Signed-off-by: Miquel Raynal <miquel.raynal@xxxxxxxxxxx>
Seems sensible.
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@xxxxxxxxxx>
> ---
> drivers/mfd/ti_am335x_tscadc.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/mfd/ti_am335x_tscadc.c b/drivers/mfd/ti_am335x_tscadc.c
> index 02477ce827d0..047426a74a2e 100644
> --- a/drivers/mfd/ti_am335x_tscadc.c
> +++ b/drivers/mfd/ti_am335x_tscadc.c
> @@ -121,7 +121,7 @@ static int ti_tscadc_probe(struct platform_device *pdev)
> const __be32 *cur;
> struct clk *clk;
> u32 val;
> - int tsc_wires = 0, adc_channels = 0, readouts = 0, cell_idx = 0;
> + int tscmag_wires = 0, adc_channels = 0, readouts = 0, cell_idx = 0;
> int total_channels, err;
>
> /* Allocate memory for device */
> @@ -139,7 +139,7 @@ static int ti_tscadc_probe(struct platform_device *pdev)
> tscadc->data = of_device_get_match_data(&pdev->dev);
>
> node = of_get_child_by_name(pdev->dev.of_node, "tsc");
> - of_property_read_u32(node, "ti,wires", &tsc_wires);
> + of_property_read_u32(node, "ti,wires", &tscmag_wires);
> of_property_read_u32(node, "ti,coordiante-readouts", &readouts);
>
> node = of_get_child_by_name(pdev->dev.of_node, "adc");
> @@ -152,7 +152,7 @@ static int ti_tscadc_probe(struct platform_device *pdev)
> }
> }
>
> - total_channels = tsc_wires + adc_channels;
> + total_channels = tscmag_wires + adc_channels;
> if (total_channels > 8) {
> dev_err(&pdev->dev, "Number of i/p channels more than 8\n");
> return -EINVAL;
> @@ -218,9 +218,9 @@ static int ti_tscadc_probe(struct platform_device *pdev)
> tscadc->ctrl = CNTRLREG_TSC_STEPCONFIGWRT | CNTRLREG_STEPID;
> regmap_write(tscadc->regmap, REG_CTRL, tscadc->ctrl);
>
> - if (tsc_wires > 0) {
> + if (tscmag_wires > 0) {
> tscadc->ctrl |= CNTRLREG_TSC_ENB;
> - if (tsc_wires == 5)
> + if (tscmag_wires == 5)
> tscadc->ctrl |= CNTRLREG_TSC_5WIRE;
> else
> tscadc->ctrl |= CNTRLREG_TSC_4WIRE;
> @@ -232,7 +232,7 @@ static int ti_tscadc_probe(struct platform_device *pdev)
> regmap_write(tscadc->regmap, REG_CTRL, tscadc->ctrl | CNTRLREG_SSENB);
>
> /* TSC Cell */
> - if (tsc_wires > 0) {
> + if (tscmag_wires > 0) {
> cell = &tscadc->cells[cell_idx++];
> cell->name = tscadc->data->name_tscmag;
> cell->of_compatible = tscadc->data->compat_tscmag;
