linux-kernel - Re: [PATCH v6 2/3] iio: frequency: adf4371: add refin mode

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20250201123230.017884a2@jic23-huawei>
Date: Sat, 1 Feb 2025 12:32:30 +0000
From: Jonathan Cameron <jic23@...nel.org>
To: Antoniu Miclaus <antoniu.miclaus@...log.com>
Cc: <robh@...nel.org>, <conor+dt@...nel.org>, <linux-iio@...r.kernel.org>,
 <devicetree@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
 <linux-pwm@...r.kernel.org>, Nuno Sa <nuno.sa@...log.com>
Subject: Re: [PATCH v6 2/3] iio: frequency: adf4371: add refin mode

On Mon, 27 Jan 2025 12:10:22 +0200
Antoniu Miclaus <antoniu.miclaus@...log.com> wrote:

> Add support for single-ended/differential reference input mode.
> 
> Reviewed-by: Nuno Sa <nuno.sa@...log.com>
> Signed-off-by: Antoniu Miclaus <antoniu.miclaus@...log.com>
> ---
> no changes in v6.
This needed a rebase. There is no st->clkin any more.

Rather than go around again, I fixed it up as:
diff --git a/drivers/iio/frequency/adf4371.c b/drivers/iio/frequency/adf4371.c
index 205dfd341489..41155af3c4f6 100644
--- a/drivers/iio/frequency/adf4371.c
+++ b/drivers/iio/frequency/adf4371.c
@@ -593,10 +593,10 @@ static int adf4371_probe(struct spi_device *spi)
 
        st->ref_diff_en = false;
 
-       st->clkin = devm_clk_get_enabled(&spi->dev, "clkin");
-       if (IS_ERR(st->clkin)) {
-               st->clkin = devm_clk_get_enabled(&spi->dev, "clkin-diff");
-               if (IS_ERR(st->clkin))
+       clkin = devm_clk_get_enabled(&spi->dev, "clkin");
+       if (IS_ERR(clkin)) {
+               clkin = devm_clk_get_enabled(&spi->dev, "clkin-diff");
+               if (IS_ERR(clkin))
                        return dev_err_probe(&spi->dev, PTR_ERR(clkin),
                                     "Failed to get clkin/clkin-diff\n");
                st->ref_diff_en = true;


>  drivers/iio/frequency/adf4371.c | 31 +++++++++++++++++++++++++++----
>  1 file changed, 27 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/iio/frequency/adf4371.c b/drivers/iio/frequency/adf4371.c
> index d752507e0c98..205dfd341489 100644
> --- a/drivers/iio/frequency/adf4371.c
> +++ b/drivers/iio/frequency/adf4371.c
> @@ -42,6 +42,10 @@
>  #define ADF4371_MOD2WORD_MSK		GENMASK(5, 0)
>  #define ADF4371_MOD2WORD(x)		FIELD_PREP(ADF4371_MOD2WORD_MSK, x)
>  
> +/* ADF4371_REG22 */
> +#define ADF4371_REFIN_MODE_MASK		BIT(6)
> +#define ADF4371_REFIN_MODE(x)		FIELD_PREP(ADF4371_REFIN_MODE_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 +74,7 @@
>  
>  #define ADF4371_MAX_FREQ_PFD		250000000UL /* Hz */
>  #define ADF4371_MAX_FREQ_REFIN		600000000UL /* Hz */
> +#define ADF4371_MAX_FREQ_REFIN_SE	500000000UL /* Hz */
>  
>  /* MOD1 is a 24-bit primary modulus with fixed value of 2^25 */
>  #define ADF4371_MODULUS1		33554432ULL
> @@ -176,6 +181,7 @@ struct adf4371_state {
>  	unsigned int mod2;
>  	unsigned int rf_div_sel;
>  	unsigned int ref_div_factor;
> +	bool ref_diff_en;
>  	u8 buf[10] __aligned(IIO_DMA_MINALIGN);
>  };
>  
> @@ -505,6 +511,17 @@ static int adf4371_setup(struct adf4371_state *st)
>  				 ADF4371_ADDR_ASC(1) | ADF4371_ADDR_ASC_R(1));
>  	if (ret < 0)
>  		return ret;
> +
> +	if ((st->ref_diff_en && st->clkin_freq > ADF4371_MAX_FREQ_REFIN) ||
> +	    (!st->ref_diff_en && st->clkin_freq > ADF4371_MAX_FREQ_REFIN_SE))
> +		return -EINVAL;
> +
> +	ret = regmap_update_bits(st->regmap,  ADF4371_REG(0x22),
> +				 ADF4371_REFIN_MODE_MASK,
> +				 ADF4371_REFIN_MODE(st->ref_diff_en));
> +	if (ret < 0)
> +		return ret;
> +
>  	/*
>  	 * Calculate and maximize PFD frequency
>  	 * fPFD = REFIN × ((1 + D)/(R × (1 + T)))
> @@ -574,10 +591,16 @@ static int adf4371_probe(struct spi_device *spi)
>  	indio_dev->channels = st->chip_info->channels;
>  	indio_dev->num_channels = st->chip_info->num_channels;
>  
> -	clkin = devm_clk_get_enabled(&spi->dev, "clkin");
> -	if (IS_ERR(clkin))
> -		return dev_err_probe(&spi->dev, PTR_ERR(clkin),
> -				     "Failed to get clkin\n");
> +	st->ref_diff_en = false;
> +
> +	st->clkin = devm_clk_get_enabled(&spi->dev, "clkin");
> +	if (IS_ERR(st->clkin)) {
> +		st->clkin = devm_clk_get_enabled(&spi->dev, "clkin-diff");
> +		if (IS_ERR(st->clkin))
> +			return dev_err_probe(&spi->dev, PTR_ERR(clkin),
> +				     "Failed to get clkin/clkin-diff\n");
> +		st->ref_diff_en = true;
> +	}
>  
>  	st->clkin_freq = clk_get_rate(clkin);
>