From: Antoniu Miclaus <antoniu.miclaus@analog.com>
To: <jic23@kernel.org>, <robh@kernel.org>, <conor+dt@kernel.org>,
<linux-iio@vger.kernel.org>, <devicetree@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, <linux-pwm@vger.kernel.org>
Cc: Antoniu Miclaus <antoniu.miclaus@analog.com>
Subject: [PATCH 2/2] iio: frequency: adf4371: add ref doubler and div2
Date: Fri, 22 Nov 2024 13:32:14 +0200 [thread overview]
Message-ID: <20241122113226.49346-2-antoniu.miclaus@analog.com> (raw)
In-Reply-To: <20241122113226.49346-1-antoniu.miclaus@analog.com>
Add support for the reference doubler and the reference divide by 2
clock.
Signed-off-by: Antoniu Miclaus <antoniu.miclaus@analog.com>
---
drivers/iio/frequency/adf4371.c | 37 +++++++++++++++++++++++++++++++--
1 file changed, 35 insertions(+), 2 deletions(-)
diff --git a/drivers/iio/frequency/adf4371.c b/drivers/iio/frequency/adf4371.c
index b27088464826..02d42652dfdd 100644
--- a/drivers/iio/frequency/adf4371.c
+++ b/drivers/iio/frequency/adf4371.c
@@ -41,6 +41,12 @@
#define ADF4371_MOD2WORD_MSK GENMASK(5, 0)
#define ADF4371_MOD2WORD(x) FIELD_PREP(ADF4371_MOD2WORD_MSK, x)
+/* ADF4371_REG22 */
+#define ADF4371_REF_DOUB_MASK BIT(5)
+#define ADF4371_REF_DOUB(x) FIELD_PREP(ADF4371_REF_DOUB_MASK, x)
+#define ADF4371_RDIV2_MASK BIT(4)
+#define ADF4371_RDIV2(x) FIELD_PREP(ADF4371_RDIV2_MASK, x)
+
/* ADF4371_REG24 */
#define ADF4371_RF_DIV_SEL_MSK GENMASK(6, 4)
#define ADF4371_RF_DIV_SEL(x) FIELD_PREP(ADF4371_RF_DIV_SEL_MSK, x)
@@ -70,6 +76,9 @@
#define ADF4371_MAX_FREQ_PFD 250000000UL /* Hz */
#define ADF4371_MAX_FREQ_REFIN 600000000UL /* Hz */
+#define ADF4371_MIN_CLKIN_DOUB_FREQ 10000000ULL /* Hz */
+#define ADF4371_MAX_CLKIN_DOUB_FREQ 125000000ULL /* Hz */
+
/* MOD1 is a 24-bit primary modulus with fixed value of 2^25 */
#define ADF4371_MODULUS1 33554432ULL
/* MOD2 is the programmable, 14-bit auxiliary fractional modulus */
@@ -175,6 +184,8 @@ struct adf4371_state {
unsigned int mod2;
unsigned int rf_div_sel;
unsigned int ref_div_factor;
+ bool ref_doubler_en;
+ bool ref_div2_en;
u8 buf[10] __aligned(IIO_DMA_MINALIGN);
};
@@ -497,22 +508,44 @@ static int adf4371_setup(struct adf4371_state *st)
return ret;
}
+ if (device_property_read_bool(&st->spi->dev,
+ "adi,reference-doubler-enable"))
+ st->ref_doubler_en = true;
+
+ if (device_property_read_bool(&st->spi->dev,
+ "adi,reference-div2-enable"))
+ st->ref_div2_en = true;
+
/* Set address in ascending order, so the bulk_write() will work */
ret = regmap_update_bits(st->regmap, ADF4371_REG(0x0),
ADF4371_ADDR_ASC_MSK | ADF4371_ADDR_ASC_R_MSK,
ADF4371_ADDR_ASC(1) | ADF4371_ADDR_ASC_R(1));
if (ret < 0)
return ret;
+
+ if (st->ref_doubler_en &&
+ (st->clkin_freq > ADF4371_MAX_CLKIN_DOUB_FREQ ||
+ st->clkin_freq < ADF4371_MIN_CLKIN_DOUB_FREQ))
+ st->ref_doubler_en = false;
+
+ ret = regmap_update_bits(st->regmap, ADF4371_REG(0x22),
+ ADF4371_REF_DOUB_MASK |
+ ADF4371_RDIV2_MASK,
+ ADF4371_REF_DOUB(st->ref_doubler_en) |
+ ADF4371_RDIV2(st->ref_div2_en));
+ if (ret < 0)
+ return ret;
+
/*
* Calculate and maximize PFD frequency
* fPFD = REFIN × ((1 + D)/(R × (1 + T)))
* Where D is the REFIN doubler bit, T is the reference divide by 2,
* R is the reference division factor
- * TODO: it is assumed D and T equal 0.
*/
do {
st->ref_div_factor++;
- st->fpfd = st->clkin_freq / st->ref_div_factor;
+ st->fpfd = (st->clkin_freq * (st->ref_doubler_en ? 2 : 1)) /
+ (st->ref_div_factor * (st->ref_div2_en ? 2 : 1));
} while (st->fpfd > ADF4371_MAX_FREQ_PFD);
/* Calculate Timeouts */
--
2.47.0
next prev parent reply other threads:[~2024-11-22 11:33 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-22 11:32 [PATCH 1/2] dt-bindings: iio: adf4371: add rdiv2 and doubler Antoniu Miclaus
2024-11-22 11:32 ` Antoniu Miclaus [this message]
2024-11-23 16:16 ` [PATCH 2/2] iio: frequency: adf4371: add ref doubler and div2 Jonathan Cameron
2024-11-23 16:13 ` [PATCH 1/2] dt-bindings: iio: adf4371: add rdiv2 and doubler Jonathan Cameron
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=20241122113226.49346-2-antoniu.miclaus@analog.com \
--to=antoniu.miclaus@analog.com \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=jic23@kernel.org \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pwm@vger.kernel.org \
--cc=robh@kernel.org \
/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