From: Miquel Raynal <miquel.raynal@bootlin.com>
To: Jonathan Cameron <jic23@kernel.org>,
Lee Jones <lee.jones@linaro.org>,
linux-iio@vger.kernel.org, linux-omap@vger.kernel.org,
Thomas Petazzoni <thomas.petazzoni@bootlin.com>,
Ryan Barnett <ryan.barnett@collins.com>,
linux-kernel@vger.kernel.org
Cc: Miquel Raynal <miquel.raynal@bootlin.com>,
Jonathan Cameron <Jonathan.Cameron@huawei.com>
Subject: [PATCH v6 36/48] mfd: ti_am335x_tscadc: Add ADC1/magnetic reader support
Date: Fri, 15 Oct 2021 10:14:54 +0200 [thread overview]
Message-ID: <20211015081506.933180-37-miquel.raynal@bootlin.com> (raw)
In-Reply-To: <20211015081506.933180-1-miquel.raynal@bootlin.com>
Introduce a new compatible that has another set of driver data,
targeting am437x SoCs with a magnetic reader instead of the
touchscreen and a more featureful set of registers.
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
---
drivers/mfd/ti_am335x_tscadc.c | 37 ++++++++++++++++++++++------
include/linux/mfd/ti_am335x_tscadc.h | 6 +++++
2 files changed, 36 insertions(+), 7 deletions(-)
diff --git a/drivers/mfd/ti_am335x_tscadc.c b/drivers/mfd/ti_am335x_tscadc.c
index af22fd735933..7b6d18144e27 100644
--- a/drivers/mfd/ti_am335x_tscadc.c
+++ b/drivers/mfd/ti_am335x_tscadc.c
@@ -121,11 +121,11 @@ static int ti_tscadc_probe(struct platform_device *pdev)
struct mfd_cell *cell;
struct property *prop;
const __be32 *cur;
- bool use_tsc = false;
+ bool use_tsc = false, use_mag = false;
u32 val;
int err;
int tscmag_wires = 0, adc_channels = 0, cell_idx = 0, total_channels;
- int readouts = 0;
+ int readouts = 0, mag_tracks = 0;
/* Allocate memory for device */
tscadc = devm_kzalloc(&pdev->dev, sizeof(*tscadc), GFP_KERNEL);
@@ -148,6 +148,16 @@ static int ti_tscadc_probe(struct platform_device *pdev)
of_node_put(node);
if (tscmag_wires)
use_tsc = true;
+ } else {
+ /*
+ * When adding support for the magnetic stripe reader, here is
+ * the place to look for the number of tracks used from device
+ * tree. Let's default to 0 for now.
+ */
+ mag_tracks = 0;
+ tscmag_wires = mag_tracks * 2;
+ if (tscmag_wires)
+ use_mag = true;
}
node = of_get_child_by_name(pdev->dev.of_node, "adc");
@@ -209,8 +219,9 @@ static int ti_tscadc_probe(struct platform_device *pdev)
* The TSC_ADC_Subsystem has 2 clock domains: OCP_CLK and ADC_CLK.
* ADCs produce a 12-bit sample every 15 ADC_CLK cycles.
* am33xx ADCs expect to capture 200ksps.
- * We need the ADC clocks to run at 3MHz.
- * This frequency is valid since TSC_ADC_SS controller design
+ * am47xx ADCs expect to capture 867ksps.
+ * We need ADC clocks respectively running at 3MHz and 13MHz.
+ * These frequencies are valid since TSC_ADC_SS controller design
* assumes the OCP clock is at least 6x faster than the ADC clock.
*/
clk = devm_clk_get(&pdev->dev, NULL);
@@ -238,6 +249,9 @@ static int ti_tscadc_probe(struct platform_device *pdev)
else
tscadc->ctrl |= CNTRLREG_TSC_4WIRE;
}
+ } else {
+ tscadc->ctrl |= CNTRLREG_MAG_PREAMP_PWRDOWN |
+ CNTRLREG_MAG_PREAMP_BYPASS;
}
regmap_write(tscadc->regmap, REG_CTRL, tscadc->ctrl);
@@ -246,8 +260,8 @@ static int ti_tscadc_probe(struct platform_device *pdev)
/* Enable the TSC module enable bit */
regmap_write(tscadc->regmap, REG_CTRL, tscadc->ctrl | CNTRLREG_SSENB);
- /* TSC Cell */
- if (tscmag_wires > 0) {
+ /* TSC or MAG Cell */
+ if (use_tsc || use_mag) {
cell = &tscadc->cells[cell_idx++];
cell->name = tscadc->data->secondary_feature_name;
cell->of_compatible = tscadc->data->secondary_feature_compatible;
@@ -340,8 +354,17 @@ static const struct ti_tscadc_data tscdata = {
.target_clk_rate = TSC_ADC_CLK,
};
+static const struct ti_tscadc_data magdata = {
+ .adc_feature_name = "TI-am43xx-adc",
+ .adc_feature_compatible = "ti,am4372-adc",
+ .secondary_feature_name = "TI-am43xx-mag",
+ .secondary_feature_compatible = "ti,am4372-mag",
+ .target_clk_rate = MAG_ADC_CLK,
+};
+
static const struct of_device_id ti_tscadc_dt_ids[] = {
{ .compatible = "ti,am3359-tscadc", .data = &tscdata },
+ { .compatible = "ti,am4372-magadc", .data = &magdata },
{ }
};
MODULE_DEVICE_TABLE(of, ti_tscadc_dt_ids);
@@ -359,6 +382,6 @@ static struct platform_driver ti_tscadc_driver = {
module_platform_driver(ti_tscadc_driver);
-MODULE_DESCRIPTION("TI touchscreen / ADC MFD controller driver");
+MODULE_DESCRIPTION("TI touchscreen/magnetic stripe reader/ADC MFD controller driver");
MODULE_AUTHOR("Rachna Patil <rachna@ti.com>");
MODULE_LICENSE("GPL");
diff --git a/include/linux/mfd/ti_am335x_tscadc.h b/include/linux/mfd/ti_am335x_tscadc.h
index ee160b2036c1..5225e3fc194d 100644
--- a/include/linux/mfd/ti_am335x_tscadc.h
+++ b/include/linux/mfd/ti_am335x_tscadc.h
@@ -106,6 +106,11 @@
#define CNTRLREG_TSC_8WIRE CNTRLREG_TSC_AFE_CTRL(3)
#define CNTRLREG_TSC_ENB BIT(7)
+/*Control registers bitfields for MAGADC IP */
+#define CNTRLREG_MAGADCENB BIT(0)
+#define CNTRLREG_MAG_PREAMP_PWRDOWN BIT(5)
+#define CNTRLREG_MAG_PREAMP_BYPASS BIT(6)
+
/* FIFO READ Register */
#define FIFOREAD_DATA_MASK GENMASK(11, 0)
#define FIFOREAD_CHNLID_MASK GENMASK(19, 16)
@@ -119,6 +124,7 @@
#define CHARGE_STEP 0x11
#define TSC_ADC_CLK (3 * HZ_PER_MHZ)
+#define MAG_ADC_CLK (13 * HZ_PER_MHZ)
#define TOTAL_STEPS 16
#define TOTAL_CHANNELS 8
#define FIFO1_THRESHOLD 19
--
2.27.0
next prev parent reply other threads:[~2021-10-15 8:17 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-15 8:14 [PATCH v6 00/48] TI AM437X ADC1 Miquel Raynal
2021-10-15 8:14 ` [PATCH v6 01/48] clk: ti: am43xx: Add clkctrl data for am43xx ADC1 Miquel Raynal
2021-10-15 8:14 ` [PATCH v6 02/48] dt-bindings: mfd: ti,am3359-tscadc: Add a yaml description for this MFD Miquel Raynal
2021-10-15 8:14 ` [PATCH v6 03/48] dt-bindings: touchscreen: ti,am3359-tsc: New yaml description Miquel Raynal
2021-10-15 8:14 ` [PATCH v6 04/48] dt-bindings: iio: adc: ti,am3359-adc: " Miquel Raynal
2021-10-15 8:14 ` [PATCH v6 05/48] dt-bindings: touchscreen: ti,am3359-tsc: Remove deprecated text file Miquel Raynal
2021-10-15 8:14 ` [PATCH v6 06/48] dt-bindings: mfd: ti,am3359-tscadc: Describe am4372 MFD compatible Miquel Raynal
2021-10-15 8:14 ` [PATCH v6 07/48] dt-bindings: iio: adc: ti,am3359-adc: Describe am4372 ADC compatible Miquel Raynal
2021-10-15 8:14 ` [PATCH v6 08/48] mfd: ti_am335x_tscadc: Ensure a balanced number of node get/put Miquel Raynal
2021-10-15 8:14 ` [PATCH v6 09/48] mfd: ti_am335x_tscadc: Replace license text with SPDX tag Miquel Raynal
2021-10-15 8:14 ` [PATCH v6 10/48] mfd: ti_am335x_tscadc: Fix style Miquel Raynal
2021-10-15 8:14 ` [PATCH v6 11/48] mfd: ti_am335x_tscadc: Drop extra spacing when declaring stack variables Miquel Raynal
2021-10-15 8:14 ` [PATCH v6 12/48] mfd: ti_am335x_tscadc: Get rid of useless gotos Miquel Raynal
2021-10-15 8:14 ` [PATCH v6 13/48] mfd: ti_am335x_tscadc: Reword the comment explaining the dividers Miquel Raynal
2021-10-15 8:14 ` [PATCH v6 14/48] mfd: ti_am335x_tscadc: Don't search the tree for our clock Miquel Raynal
2022-03-04 22:38 ` H. Nikolaus Schaller
2022-03-07 11:10 ` Miquel Raynal
2022-03-07 11:15 ` H. Nikolaus Schaller
2021-10-15 8:14 ` [PATCH v6 15/48] mfd: ti_am335x_tscadc: Simplify divisor calculation Miquel Raynal
2021-10-15 8:14 ` [PATCH v6 16/48] mfd: ti_am335x_tscadc: Move the driver structure allocation earlier Miquel Raynal
2021-10-15 8:14 ` [PATCH v6 17/48] mfd: ti_am335x_tscadc: Use driver data Miquel Raynal
2021-10-15 8:14 ` [PATCH v6 18/48] mfd: ti_am335x_tscadc: Mimic the probe from resume() Miquel Raynal
2021-10-15 8:14 ` [PATCH v6 19/48] mfd: ti_am335x_tscadc: Drop useless variables from the driver structure Miquel Raynal
2021-10-15 8:14 ` [PATCH v6 20/48] mfd: ti_am335x_tscadc: Always provide an idle configuration Miquel Raynal
2021-10-15 8:14 ` [PATCH v6 21/48] mfd: ti_am335x_tscadc: Reorder the initialization steps Miquel Raynal
2021-10-15 8:14 ` [PATCH v6 22/48] mfd: ti_am335x_tscadc: Gather the ctrl register logic in one place Miquel Raynal
2021-10-15 8:14 ` [PATCH v6 23/48] mfd: ti_am335x_tscadc: Replace the header license text with SPDX tag Miquel Raynal
2021-10-15 8:14 ` [PATCH v6 24/48] mfd: ti_am335x_tscadc: Fix header spacing Miquel Raynal
2021-10-15 8:14 ` [PATCH v6 25/48] mfd: ti_am335x_tscadc: Use the new HZ_PER_MHZ macro Miquel Raynal
2021-10-15 8:14 ` [PATCH v6 26/48] mfd: ti_am335x_tscadc: Drop unused definitions from the header Miquel Raynal
2021-10-15 14:00 ` Jonathan Cameron
2021-10-15 8:14 ` [PATCH v6 27/48] mfd: ti_am335x_tscadc: Use BIT(), GENMASK() and FIELD_PREP() when relevant Miquel Raynal
2021-10-15 8:14 ` [PATCH v6 28/48] mfd: ti_am335x_tscadc: Clarify the maximum values for DT entries Miquel Raynal
2021-10-15 8:14 ` [PATCH v6 29/48] mfd: ti_am335x_tscadc: Drop useless definitions from the header Miquel Raynal
2021-10-15 8:14 ` [PATCH v6 30/48] mfd: ti_am335x_tscadc: Rename the subsystem enable macro Miquel Raynal
2021-10-15 8:14 ` [PATCH v6 31/48] mfd: ti_am335x_tscadc: Add TSC prefix in certain macros Miquel Raynal
2021-10-15 8:14 ` [PATCH v6 32/48] mfd: ti_am335x_tscadc: Rename a variable Miquel Raynal
2021-10-15 8:14 ` [PATCH v6 33/48] mfd: ti_am335x_tscadc: Fix an error message Miquel Raynal
2021-10-15 8:14 ` [PATCH v6 34/48] mfd: ti_am335x_tscadc: Add a boolean to clarify the presence of a touchscreen Miquel Raynal
2021-10-15 8:14 ` [PATCH v6 35/48] mfd: ti_am335x_tscadc: Introduce a helper to deal with the type of hardware Miquel Raynal
2021-10-15 8:14 ` Miquel Raynal [this message]
2021-10-15 8:14 ` [PATCH v6 37/48] mfd: ti_am335x_tscadc: Support the correctly spelled DT property Miquel Raynal
2021-10-15 8:14 ` [PATCH v6 38/48] iio: adc: ti_am335x_adc: Wait the idle state to avoid stalls Miquel Raynal
2021-10-15 8:14 ` [PATCH v6 39/48] iio: adc: ti_am335x_adc: Replace license text with SPDX tag Miquel Raynal
2021-10-15 8:14 ` [PATCH v6 40/48] iio: adc: ti_am335x_adc: Fix style Miquel Raynal
2021-10-15 8:14 ` [PATCH v6 41/48] iio: adc: ti_am335x_adc: Get rid of useless gotos Miquel Raynal
2021-10-15 8:15 ` [PATCH v6 42/48] iio: adc: ti_am335x_adc: Gather the checks on the delays Miquel Raynal
2021-10-15 8:15 ` [PATCH v6 43/48] iio: adc: ti_am335x_adc: Add a unit to the timeout delay Miquel Raynal
2021-10-15 8:15 ` [PATCH v6 44/48] iio: adc: ti_am335x_adc: Add the scale information Miquel Raynal
2021-10-15 8:15 ` [PATCH v6 45/48] iio: adc: ti_am335x_adc: Add the am437x compatible Miquel Raynal
2021-10-15 8:15 ` [PATCH v6 46/48] ARM: dts: am437x-cm-t43: Use a correctly spelled DT property Miquel Raynal
2021-10-15 8:15 ` [PATCH v6 47/48] ARM: dts: am43xx: Describe the magnetic reader/ADC1 hardware module Miquel Raynal
2021-10-15 8:15 ` [PATCH v6 48/48] ARM: dts: am437x-gp-evm: enable ADC1 Miquel Raynal
2021-10-20 15:36 ` [PATCH v6 00/48] TI AM437X ADC1 Miquel Raynal
2021-10-20 15:57 ` Lee Jones
2021-10-21 7:45 ` Miquel Raynal
2021-10-21 12:02 ` [GIT PULL] Immutable branch between MFD, IIO, Input (Touchscreen) and Clk due for the v5.16 merge window Lee Jones
2021-10-21 12:13 ` Miquel Raynal
2021-10-21 12:31 ` Lee Jones
2021-10-21 12:41 ` 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=20211015081506.933180-37-miquel.raynal@bootlin.com \
--to=miquel.raynal@bootlin.com \
--cc=Jonathan.Cameron@huawei.com \
--cc=jic23@kernel.org \
--cc=lee.jones@linaro.org \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=ryan.barnett@collins.com \
--cc=thomas.petazzoni@bootlin.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).