Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add ADF4382 #2387

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Add ADF4382 #2387

wants to merge 3 commits into from

Conversation

chegbeli
Copy link
Contributor

The ADF4382A is a high performance, ultralow jitter, Frac-N PLL
with integrated VCO ideally suited for LO generation for 5G applications
or data converter clock applications. The high performance
PLL has a figure of merit of -239 dBc/Hz, low 1/f Noise and
high PFD frequency of 625MHz in integer mode that can achieve
ultralow in-band noise and integrated jitter. The ADF4382A can
generate frequencies in a fundamental octave range of 11.5 GHz to
21 GHz, thereby eliminating the need for sub-harmonic filters. The
divide by 2 and 4 output dividers on the part allow frequencies to
be generated from 5.75GHz to 10.5GHz and 2.875GHz to 5.25GHz
respectively.

@chegbeli chegbeli force-pushed the adf4382 branch 5 times, most recently from e7a4153 to 562586b Compare January 8, 2024 14:10
@SRaus SRaus changed the base branch from master to main January 9, 2024 09:51
Copy link
Contributor

@amiclaus amiclaus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

some initial comments on my side. I'd suggest sending it upstream (although i noticed the datasheet not public yet, so the process might be harsher).

spi {
#address-cells = <1>;
#size-cells = <0>;
adf4382@0 {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please use generic naming for the binding example: frequency


/* ADF4382_REG0 */
#define ADF4382_ADDR_ASC_MSK BIT(2)
#define ADF4382_ADDR_ASC(x) FIELD_PREP(ADF4382_ADDR_ASC_MSK, x)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

drop all these parametrized definitions. i think it is preferred using FIELD_PREP/FIELD_GET inline.

#define ADF4382_VCO_CAL_VTUNE 124
#define ADF4382_VCO_CAL_ALC 250

#define UA_TO_A 1000000
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These should go in units.h, if not already there :)

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

they should be there, yes

ret = regmap_write(st->regmap, 0x1A, var);
if (ret)
return ret;
var = (mod2_word >> 8) & ADF4382_MOD2WORD_MID_MSK;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

instead of defining multiple GENMASK(7,0) for ADF4382_MOD2WORD_MID_MSK, ADF4382_MOD2WORD_MSB_MSK etc, i'd create some generic macros:
#define ADF4382_WORD_LSB_MSK GENMASK(7, 0)
#define ADF4382_WORD_MID_MSK GENMASK(15, 8)
#define ADF4382_WORD_MSB_MSK GENMASK(23, 16)

In this manner you drop multiple identical macro definitions and also get rid of explicit shifting by using FIELD_GET instead.


static int adf4382_get_freq(struct adf4382_state *st, u64 *freq)
{
*freq = st->freq;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we should obtain the frequency from hardware instead of cached values.

if (ret)
return ret;

mutex_lock(&st->lock);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i'd drop this mutex handling. it should go inside adf4382_set_freq. Moreover, adf4382_set_out_power doesn't seem to need locking.


ret = device_property_read_u32(&st->spi->dev, "adi,ref-divider",
&tmp);
if (ret || !tmp)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hmm, you treat "adi,ref-divider" property as optional, although you made it a required property in the dt bindings.


ret = device_property_read_u32(&st->spi->dev, "adi,charge-pump-current",
&tmp);
if (ret)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same here: property is optional in driver, while required in the dt bindings.

return ret;

if (val != ADF4382_SCRATCHPAD_VAL) {
dev_err(&st->spi->dev, "Scratch pad test failed please check SPI connection");
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

dev_err_probe


ret = adf4382_init(st);
if (ret) {
dev_err(&spi->dev, "adf4382 init failed\n");
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ditto: dev_err_probe.

Copy link
Collaborator

@nunojsa nunojsa left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

First set of comments on my side.

The most tricky stuff is thje CCF abuse together with the IIO userspace interface. I know we do it in more drivers but... Anyways, as always, I'm expecting this driver to be upstreamed first (as I don't see any reason why we can't upstream it) so let's see what they have to say about this.

- $ref: /schemas/types.yaml#/definitions/uint32
- enum: [0, 1, 2, 3, 6, 7, 9, 10, 11, 14, 15]
- default: 15
maxItems: 1
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Drop maxItems (I think). Ditto for all other places where we don't really have an array. On top of it, make this a proper current property. That means this should be adi,charge-pump-microamp. The translation for proper register values should then be done in the driver. In dts, we should be clear about the properties (when possible).

adi,ref-divider:
description: |
Input divider of the reference frequency, cannot be lower then 1 or
higher then 63.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't think you need formatted text in all the properties. So you can drop the |

- minimum: 687500000
- maximum: 22000000000
- default: 2305000000
maxItems: 1
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure if the the above two properties belong in dts. The frequency one will be an hard sell upstream since I suppose that is something you can do already at runtime (changing the frequency). So you need to have a very good justification for this.

The adi,bleed-word also seems like something we could/should have at runtime? Or is this word something dependent on the system/design and that we typically just want to program once?

adi,cmos-3v3:
description: |
Sets the SPI logic to 3.3V, by defautl it uses 1,8V.
type: boolean
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

- adi,ref-divider

additionalProperties: false

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The driver looks to be a clock provider but I'm not seeing any provider properties in the bindings...

if (IS_ERR(st->clkin))
return PTR_ERR(st->clkin);

return 0;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

return PTR_ERR_OR_ZERO()?

if (IS_ERR(clk))
return PTR_ERR(clk);

return of_clk_add_provider(of_node, of_clk_src_simple_get, clk);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

devm_of_clk_add_hw_provider()

st = iio_priv(indio_dev);

indio_dev->info = &adf4382_info;
indio_dev->name = "adf4382";
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you support two devices so ideally you would have the proper name when using adf4382a. Maybe have a chip_info struct only with const char *name


ret = clk_prepare_enable(st->clkin);
if (ret)
return ret;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you can drop the above with one of my previous comments


adf4382_setup_clk(st);
if (ret)
return ret;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The above is questionable. We do it for a couple of drivers and remember there was a reason for having both clock provider and an IIO userspace interface (like having different waveforms through IIO). But if the only reason is to have both userspace access top changing the frequency and having the clock exported as part of CCF at the same time, that will be more difficult to justify.

Anyways, one thing that should be protected is that if the channel is being exported through CCF, we should not allow to change it's frequency though the IIO interface as that could breaks potential consumers of the clock,

Anyways, let's see what upstream has to say about this.

The ADF4382A is a high performance, ultralow jitter, Frac-N PLL
with integrated VCO ideally suited for LO generation for 5G applications
or data converter clock applications. The high performance
PLL has a figure of merit of -239 dBc/Hz, low 1/f Noise and
high PFD frequency of 625MHz in integer mode that can achieve
ultralow in-band noise and integrated jitter. The ADF4382A can
generate frequencies in a fundamental octave range of 11.5 GHz to
21 GHz, thereby eliminating the need for sub-harmonic filters. The
divide by 2 and 4 output dividers on the part allow frequencies to
be generated from 5.75GHz to 10.5GHz and 2.875GHz to 5.25GHz
respectively.

Signed-off-by: Ciprian Hegbeli <[email protected]>
The ADF4382A is a high performance, ultralow jitter, Frac-N PLL
with integrated VCO ideally suited for LO generation for 5G applications
or data converter clock applications. The high performance
PLL has a figure of merit of -239 dBc/Hz, low 1/f Noise and
high PFD frequency of 625MHz in integer mode that can achieve
ultralow in-band noise and integrated jitter. The ADF4382A can
generate frequencies in a fundamental octave range of 11.5 GHz to
21 GHz, thereby eliminating the need for sub-harmonic filters. The
divide by 2 and 4 output dividers on the part allow frequencies to
be generated from 5.75GHz to 10.5GHz and 2.875GHz to 5.25GHz
respectively.

Signed-off-by: Ciprian Hegbeli <[email protected]>
Add ADF4382 to ADI Kconfig.

Signed-off-by: Ciprian Hegbeli <[email protected]>
@chegbeli
Copy link
Contributor Author

V1->V2

  • Fixed description.
  • Remove param definitions.
  • Using units.h, although I'm unsure if this shouldn't be improved.
  • Replaced clock_scale with a fixed value, based on cpu architecture.
  • Added enable and disable to clock ops.
  • Implemented recalculating clock from registers.
  • Changed the phase adjust functionality for higher accuracy.
  • Added auto-align based on external pins to the phase adjust.
  • Added displaying phase adjust value based on register value.
  • Added debugfs fields for the bleed current values which are set.
    The bleed current changes based on phase adjust value.
  • Added global initial output power level to DTS which will effect,
    both channels.

@chegbeli chegbeli requested a review from nunojsa October 25, 2024 09:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants