All of lore.kernel.org
 help / color / mirror / Atom feed
From: Miquel Raynal <miquel.raynal@bootlin.com>
To: Jonathan Cameron <jic23@kernel.org>,
	Lars-Peter Clausen <lars@metafoo.de>,
	Peter Meerwald-Stadler <pmeerw@pmeerw.net>,
	Rob Herring <robh+dt@kernel.org>,
	Lee Jones <lee.jones@linaro.org>,
	bcousson@baylibre.com, Tony Lindgren <tony@atomide.com>,
	Tero Kristo <t-kristo@ti.com>,
	Michael Turquette <mturquette@baylibre.com>,
	Stephen Boyd <sboyd@kernel.org>
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>,
	"Ryan J . Barnett" <ryan.barnett@collins.com>,
	linux-iio@vger.kernel.org, devicetree@vger.kernel.org,
	linux-input@vger.kernel.org, linux-omap@vger.kernel.org,
	linux-clk@vger.kernel.org,
	Miquel Raynal <miquel.raynal@bootlin.com>,
	Jason Reeder <jreeder@ti.com>
Subject: [PATCH 16/40] mfd: ti_am335x_tscadc: Use driver data
Date: Wed, 25 Aug 2021 17:24:54 +0200	[thread overview]
Message-ID: <20210825152518.379386-17-miquel.raynal@bootlin.com> (raw)
In-Reply-To: <20210825152518.379386-1-miquel.raynal@bootlin.com>

So far every sub-cell parameter in this driver was hardcoded: cell name,
cell compatible, specific clock name and desired clock frequency.

As we are about to introduce support for ADC1/magnetic reader, we need a
bit of flexibility. Let's add a driver data structure which will contain
these information.

Co-developed-by: Jason Reeder <jreeder@ti.com>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Signed-off-by: Jason Reeder <jreeder@ti.com>
---
 drivers/mfd/ti_am335x_tscadc.c       | 20 +++++++++++++++-----
 include/linux/mfd/ti_am335x_tscadc.h |  9 +++++++++
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/drivers/mfd/ti_am335x_tscadc.c b/drivers/mfd/ti_am335x_tscadc.c
index 3231ccbbad02..0cea44b4bd1a 100644
--- a/drivers/mfd/ti_am335x_tscadc.c
+++ b/drivers/mfd/ti_am335x_tscadc.c
@@ -136,6 +136,8 @@ static	int ti_tscadc_probe(struct platform_device *pdev)
 		return -EINVAL;
 	}
 
+	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,coordiante-readouts", &readouts);
@@ -209,7 +211,7 @@ static	int ti_tscadc_probe(struct platform_device *pdev)
 		goto err_disable_clk;
 	}
 
-	tscadc->clk_div = (clk_get_rate(clk) / ADC_CLK) - 1;
+	tscadc->clk_div = (clk_get_rate(clk) / tscadc->data->target_clk_rate) - 1;
 	regmap_write(tscadc->regmap, REG_CLKDIV, tscadc->clk_div);
 
 	/* Set the control register bits */
@@ -238,8 +240,8 @@ static	int ti_tscadc_probe(struct platform_device *pdev)
 	if (tsc_wires > 0) {
 		tscadc->tsc_cell = tscadc->used_cells;
 		cell = &tscadc->cells[tscadc->used_cells++];
-		cell->name = "TI-am335x-tsc";
-		cell->of_compatible = "ti,am3359-tsc";
+		cell->name = tscadc->data->name_tscmag;
+		cell->of_compatible = tscadc->data->compat_tscmag;
 		cell->platform_data = &tscadc;
 		cell->pdata_size = sizeof(tscadc);
 	}
@@ -248,8 +250,8 @@ static	int ti_tscadc_probe(struct platform_device *pdev)
 	if (adc_channels > 0) {
 		tscadc->adc_cell = tscadc->used_cells;
 		cell = &tscadc->cells[tscadc->used_cells++];
-		cell->name = "TI-am335x-adc";
-		cell->of_compatible = "ti,am3359-adc";
+		cell->name = tscadc->data->name_adc;
+		cell->of_compatible = tscadc->data->compat_adc;
 		cell->platform_data = &tscadc;
 		cell->pdata_size = sizeof(tscadc);
 	}
@@ -335,6 +337,14 @@ static int __maybe_unused tscadc_resume(struct device *dev)
 
 static SIMPLE_DEV_PM_OPS(tscadc_pm_ops, tscadc_suspend, tscadc_resume);
 
+static const struct ti_tscadc_data tscdata = {
+	.name_tscmag = "TI-am335x-tsc",
+	.compat_tscmag = "ti,am3359-tsc",
+	.name_adc = "TI-am335x-adc",
+	.compat_adc = "ti,am3359-adc",
+	.target_clk_rate = ADC_CLK,
+};
+
 static const struct of_device_id ti_tscadc_dt_ids[] = {
 	{ .compatible = "ti,am3359-tscadc", },
 	{ }
diff --git a/include/linux/mfd/ti_am335x_tscadc.h b/include/linux/mfd/ti_am335x_tscadc.h
index ffc091b77633..0f581c15d95a 100644
--- a/include/linux/mfd/ti_am335x_tscadc.h
+++ b/include/linux/mfd/ti_am335x_tscadc.h
@@ -162,11 +162,20 @@
 
 #define TSCADC_CELLS		2
 
+struct ti_tscadc_data {
+	char *name_tscmag;
+	char *compat_tscmag;
+	char *name_adc;
+	char *compat_adc;
+	unsigned int target_clk_rate;
+};
+
 struct ti_tscadc_dev {
 	struct device *dev;
 	struct regmap *regmap;
 	void __iomem *tscadc_base;
 	phys_addr_t tscadc_phys_base;
+	const struct ti_tscadc_data *data;
 	int irq;
 	int used_cells;	/* 1-2 */
 	int tsc_wires;
-- 
2.27.0


  parent reply	other threads:[~2021-08-25 15:33 UTC|newest]

Thread overview: 88+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-25 15:24 [PATCH 00/40] TI AM437X ADC1 Miquel Raynal
2021-08-25 15:24 ` [PATCH 01/40] clk: ti: am43xx: Add clkctrl data for am43xx ADC1 Miquel Raynal
2021-08-25 15:24 ` [PATCH 02/40] dt-bindings: mfd: ti,am3359-tscadc: Add a yaml description for this MFD Miquel Raynal
2021-08-30 12:47   ` Jonathan Cameron
2021-09-02 17:35     ` Miquel Raynal
2021-08-31 19:33   ` Rob Herring
2021-08-25 15:24 ` [PATCH 03/40] dt-bindings: touchscreen: ti,am3359-tsc: New yaml description Miquel Raynal
2021-08-30 13:36   ` Jonathan Cameron
2021-09-02 17:45     ` Miquel Raynal
2021-09-05 11:58       ` Jonathan Cameron
2021-08-31 19:37   ` Rob Herring
2021-09-01  7:42     ` Miquel Raynal
2021-08-25 15:24 ` [PATCH 04/40] dt-bindings: iio: adc: ti,am3359-adc: " Miquel Raynal
2021-08-30 12:31   ` Jonathan Cameron
2021-08-25 15:24 ` [PATCH 05/40] dt-bindings: touchscreen: ti,am3359-tsc: Remove deprecated text file Miquel Raynal
2021-08-30 12:39   ` Jonathan Cameron
2021-08-31 19:38   ` Rob Herring
2021-08-25 15:24 ` [PATCH 06/40] dt-bindings: mfd: ti,am3359-tscadc: Describe am4372 MFD compatible Miquel Raynal
2021-08-30 12:34   ` Jonathan Cameron
2021-08-25 15:24 ` [PATCH 07/40] dt-bindings: iio: adc: ti,am3359-adc: Describe am4372 ADC compatible Miquel Raynal
2021-08-30 12:35   ` Jonathan Cameron
2021-08-25 15:24 ` [PATCH 08/40] mfd: ti_am335x_tscadc: Replace license text with SPDX tag Miquel Raynal
2021-08-30 12:38   ` Jonathan Cameron
2021-08-25 15:24 ` [PATCH 09/40] mfd: ti_am335x_tscadc: Fix style Miquel Raynal
2021-08-30 12:49   ` Jonathan Cameron
2021-08-25 15:24 ` [PATCH 10/40] mfd: ti_am335x_tscadc: Drop extra spacing when declaring stack variables Miquel Raynal
2021-08-30 12:52   ` Jonathan Cameron
2021-08-25 15:24 ` [PATCH 11/40] mfd: ti_am335x_tscadc: Get rid of useless gotos Miquel Raynal
2021-08-30 13:39   ` Jonathan Cameron
2021-08-25 15:24 ` [PATCH 12/40] mfd: ti_am335x_tscadc: Move the driver structure allocation earlier Miquel Raynal
2021-08-30 14:25   ` Jonathan Cameron
2021-08-25 15:24 ` [PATCH 13/40] mfd: ti_am335x_tscadc: Reword the comment explaining the dividers Miquel Raynal
2021-08-30 13:43   ` Jonathan Cameron
2021-08-25 15:24 ` [PATCH 14/40] mfd: ti_am335x_tscadc: Don't search the tree for our clock Miquel Raynal
2021-08-25 15:24 ` [PATCH 15/40] mfd: ti_am335x_tscadc: Simplify divisor calculation Miquel Raynal
2021-08-30 13:47   ` Jonathan Cameron
2021-08-25 15:24 ` Miquel Raynal [this message]
2021-08-30 14:46   ` [PATCH 16/40] mfd: ti_am335x_tscadc: Use driver data Jonathan Cameron
2021-08-25 15:24 ` [PATCH 17/40] mfd: ti_am335x_tscadc: Mimic the probe from resume() Miquel Raynal
2021-08-25 15:24 ` [PATCH 18/40] mfd: ti_am335x_tscadc: Drop useless variables from the driver structure Miquel Raynal
2021-08-25 15:24 ` [PATCH 19/40] mfd: ti_am335x_tscadc: Always provide an idle configuration Miquel Raynal
2021-08-30 14:49   ` Jonathan Cameron
2021-08-25 15:24 ` [PATCH 20/40] mfd: ti_am335x_tscadc: Gather the ctrl register logic at one place Miquel Raynal
2021-08-30 13:56   ` Jonathan Cameron
2021-09-02 19:42     ` Miquel Raynal
2021-09-05 11:13       ` Jonathan Cameron
2021-08-25 15:24 ` [PATCH 21/40] mfd: ti_am335x_tscadc: Rename the subsystem enable macro Miquel Raynal
2021-08-30 14:50   ` Jonathan Cameron
2021-08-25 15:25 ` [PATCH 22/40] mfd: ti_am335x_tscadc: Add TSC prefix in certain macros Miquel Raynal
2021-08-30 14:52   ` Jonathan Cameron
2021-08-25 15:25 ` [PATCH 23/40] mfd: ti_am335x_tscadc: Rename a variable Miquel Raynal
2021-08-30 14:53   ` Jonathan Cameron
2021-08-25 15:25 ` [PATCH 24/40] mfd: ti_am335x_tscadc: Fix an error message Miquel Raynal
2021-08-30 13:58   ` Jonathan Cameron
2021-08-25 15:25 ` [PATCH 25/40] mfd: ti_am335x_tscadc: Add a boolean to clarify the presence of a touchscreen Miquel Raynal
2021-08-30 13:59   ` Jonathan Cameron
2021-08-25 15:25 ` [PATCH 26/40] mfd: ti_am335x_tscadc: Introduce has_tsc Miquel Raynal
2021-08-30 14:02   ` Jonathan Cameron
2021-08-25 15:25 ` [PATCH 27/40] mfd: ti_am335x_tscadc: Move control register configuration Miquel Raynal
2021-08-30 14:03   ` Jonathan Cameron
2021-08-25 15:25 ` [PATCH 28/40] mfd: ti_am335x_tscadc: Add ADC1/magnetic reader support Miquel Raynal
2021-08-30 14:10   ` Jonathan Cameron
2021-09-02 18:31     ` Miquel Raynal
2021-09-02 20:03     ` Miquel Raynal
2021-09-01 19:26   ` Grygorii Strashko
2021-09-02  6:47     ` Miquel Raynal
2021-09-02  9:57       ` Grygorii Strashko
2021-08-25 15:25 ` [PATCH 29/40] mfd: ti_am335x_tscadc: Support the correctly spelled DT property Miquel Raynal
2021-08-30 14:11   ` Jonathan Cameron
2021-08-25 15:25 ` [PATCH 30/40] iio: adc: ti_am335x_adc: Replace license text with SPDX tag Miquel Raynal
2021-08-30 14:12   ` Jonathan Cameron
2021-08-25 15:25 ` [PATCH 31/40] iio: adc: ti_am335x_adc: Fix style Miquel Raynal
2021-08-30 14:16   ` Jonathan Cameron
2021-08-25 15:25 ` [PATCH 32/40] iio: adc: ti_am335x_adc: Get rid of useless gotos Miquel Raynal
2021-08-30 14:18   ` Jonathan Cameron
2021-08-25 15:25 ` [PATCH 33/40] iio: adc: ti_am335x_adc: Gather the checks on the delays Miquel Raynal
2021-08-30 14:19   ` Jonathan Cameron
2021-08-25 15:25 ` [PATCH 34/40] iio: adc: ti_am335x_adc: Add a unit to the timeout delay Miquel Raynal
2021-08-30 14:20   ` Jonathan Cameron
2021-08-25 15:25 ` [PATCH 35/40] iio: adc: ti_am335x_adc: Wait the idle state to avoid stalls Miquel Raynal
2021-08-30 14:22   ` Jonathan Cameron
2021-08-25 15:25 ` [PATCH 36/40] iio: adc: ti_am335x_adc: Add the scale information Miquel Raynal
2021-08-30 14:23   ` Jonathan Cameron
2021-08-25 15:25 ` [PATCH 37/40] iio: adc: ti_am335x_adc: Add the am437x compatible Miquel Raynal
2021-08-30 14:24   ` Jonathan Cameron
2021-08-25 15:25 ` [PATCH 38/40] ARM: dts: am437x-cm-t43: Use a correctly spelled DT property Miquel Raynal
2021-08-25 15:25 ` [PATCH 39/40] ARM: dts: am43xx: Describe the magnetic reader/ADC1 hardware module Miquel Raynal
2021-08-25 15:25 ` [PATCH 40/40] ARM: dts: am437x-gp-evm: enable ADC1 Miquel Raynal

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210825152518.379386-17-miquel.raynal@bootlin.com \
    --to=miquel.raynal@bootlin.com \
    --cc=bcousson@baylibre.com \
    --cc=devicetree@vger.kernel.org \
    --cc=jic23@kernel.org \
    --cc=jreeder@ti.com \
    --cc=lars@metafoo.de \
    --cc=lee.jones@linaro.org \
    --cc=linux-clk@vger.kernel.org \
    --cc=linux-iio@vger.kernel.org \
    --cc=linux-input@vger.kernel.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=mturquette@baylibre.com \
    --cc=pmeerw@pmeerw.net \
    --cc=robh+dt@kernel.org \
    --cc=ryan.barnett@collins.com \
    --cc=sboyd@kernel.org \
    --cc=t-kristo@ti.com \
    --cc=thomas.petazzoni@bootlin.com \
    --cc=tony@atomide.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.