* [PATCH v2 2/2] iio: frequency: admfm2000: New driver
2023-11-21 10:00 [PATCH v2 1/2] dt-bindings: iio: frequency: add admfm2000 Kim Seer Paller
@ 2023-11-21 10:00 ` Kim Seer Paller
2023-11-21 10:57 ` [PATCH v2 1/2] dt-bindings: iio: frequency: add admfm2000 Rob Herring
` (2 subsequent siblings)
3 siblings, 0 replies; 7+ messages in thread
From: Kim Seer Paller @ 2023-11-21 10:00 UTC (permalink / raw)
Cc: Jonathan Cameron, Lars-Peter Clausen, Michael Hennerich,
Rob Herring, Krzysztof Kozlowski, Conor Dooley, Kim Seer Paller,
linux-iio, devicetree, linux-kernel
Dual microwave down converter module with input RF and LO frequency
ranges from 0.5 to 32 GHz and an output IF frequency range from 0.1 to
8 GHz. It consists of a LNA, mixer, IF filter, DSA, and IF amplifier
for each down conversion path.
Signed-off-by: Kim Seer Paller <kimseer.paller@analog.com>
---
V1 -> V2: No changes.
MAINTAINERS | 1 +
drivers/iio/frequency/Kconfig | 10 +
drivers/iio/frequency/Makefile | 1 +
drivers/iio/frequency/admfm2000.c | 309 ++++++++++++++++++++++++++++++
4 files changed, 321 insertions(+)
create mode 100644 drivers/iio/frequency/admfm2000.c
diff --git a/MAINTAINERS b/MAINTAINERS
index a5d18864519e..5df3aa39d1f5 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1253,6 +1253,7 @@ L: linux-iio@vger.kernel.org
S: Supported
W: https://ez.analog.com/linux-software-drivers
F: Documentation/devicetree/bindings/iio/frequency/adi,admfm2000.yaml
+F: drivers/iio/frequency/admfm2000.c
ANALOG DEVICES INC ADMV1013 DRIVER
M: Antoniu Miclaus <antoniu.miclaus@analog.com>
diff --git a/drivers/iio/frequency/Kconfig b/drivers/iio/frequency/Kconfig
index 9e85dfa58508..c455be7d4a1c 100644
--- a/drivers/iio/frequency/Kconfig
+++ b/drivers/iio/frequency/Kconfig
@@ -60,6 +60,16 @@ config ADF4377
To compile this driver as a module, choose M here: the
module will be called adf4377.
+config ADMFM2000
+ tristate "Analog Devices ADMFM2000 Dual Microwave Down Converter"
+ depends on GPIOLIB
+ help
+ Say yes here to build support for Analog Devices ADMFM2000 Dual
+ Microwave Down Converter.
+
+ To compile this driver as a module, choose M here: the
+ module will be called admfm2000.
+
config ADMV1013
tristate "Analog Devices ADMV1013 Microwave Upconverter"
depends on SPI && COMMON_CLK
diff --git a/drivers/iio/frequency/Makefile b/drivers/iio/frequency/Makefile
index b616c29b4a08..70d0e0b70e80 100644
--- a/drivers/iio/frequency/Makefile
+++ b/drivers/iio/frequency/Makefile
@@ -8,6 +8,7 @@ obj-$(CONFIG_AD9523) += ad9523.o
obj-$(CONFIG_ADF4350) += adf4350.o
obj-$(CONFIG_ADF4371) += adf4371.o
obj-$(CONFIG_ADF4377) += adf4377.o
+obj-$(CONFIG_ADMFM2000) += admfm2000.o
obj-$(CONFIG_ADMV1013) += admv1013.o
obj-$(CONFIG_ADMV1014) += admv1014.o
obj-$(CONFIG_ADMV4420) += admv4420.o
diff --git a/drivers/iio/frequency/admfm2000.c b/drivers/iio/frequency/admfm2000.c
new file mode 100644
index 000000000000..e0b5edce7f79
--- /dev/null
+++ b/drivers/iio/frequency/admfm2000.c
@@ -0,0 +1,309 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * ADMFM2000 Dual Microwave Down Converter
+ *
+ * Copyright 2023 Analog Devices Inc.
+ */
+
+#include <linux/device.h>
+#include <linux/err.h>
+#include <linux/gpio/consumer.h>
+#include <linux/iio/iio.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/of_device.h>
+#include <linux/platform_device.h>
+#include <linux/regulator/consumer.h>
+
+#define ADMFM2000_MIXER_MODE 0
+#define ADMFM2000_DIRECT_IF_MODE 1
+#define ADMF20000_DSA_GPIOS 5
+#define ADMF20000_MODE_GPIOS 2
+#define ADMF20000_MAX_GAIN 0
+#define ADMF20000_MIN_GAIN -31000
+#define ADMF20000_DEFAULT_GAIN -0x20
+
+struct admfm2000_state {
+ struct mutex lock; /* protect sensor state */
+ struct gpio_descs *sw_ch[2];
+ struct gpio_descs *dsa_gpios[2];
+ u32 gain[2];
+};
+
+static int admfm2000_mode(struct iio_dev *indio_dev, u32 reg, u32 mode)
+{
+ struct admfm2000_state *st = iio_priv(indio_dev);
+ DECLARE_BITMAP(values, 2);
+
+ switch (mode) {
+ case ADMFM2000_MIXER_MODE:
+ values[0] = (reg == 0) ? 1 : 2;
+ gpiod_set_array_value_cansleep(st->sw_ch[reg]->ndescs,
+ st->sw_ch[reg]->desc,
+ NULL, values);
+ break;
+ case ADMFM2000_DIRECT_IF_MODE:
+ values[0] = (reg == 0) ? 2 : 1;
+ gpiod_set_array_value_cansleep(st->sw_ch[reg]->ndescs,
+ st->sw_ch[reg]->desc,
+ NULL, values);
+ break;
+ default:
+ return -EINVAL;
+ }
+
+ return 0;
+}
+
+static int admfm2000_attenuation(struct iio_dev *indio_dev, u32 chan,
+ u32 value)
+{
+ struct admfm2000_state *st = iio_priv(indio_dev);
+ DECLARE_BITMAP(values, BITS_PER_TYPE(value));
+
+ values[0] = value;
+
+ gpiod_set_array_value_cansleep(st->dsa_gpios[chan]->ndescs,
+ st->dsa_gpios[chan]->desc,
+ NULL, values);
+ return 0;
+}
+
+static int admfm2000_read_raw(struct iio_dev *indio_dev,
+ struct iio_chan_spec const *chan, int *val,
+ int *val2, long mask)
+{
+ struct admfm2000_state *st = iio_priv(indio_dev);
+ int gain;
+
+ switch (mask) {
+ case IIO_CHAN_INFO_HARDWAREGAIN:
+ mutex_lock(&st->lock);
+ gain = ~(st->gain[chan->channel]) * -1000;
+ *val = gain / 1000;
+ *val2 = (gain % 1000) * 1000;
+ mutex_unlock(&st->lock);
+
+ return IIO_VAL_INT_PLUS_MICRO_DB;
+ default:
+ return -EINVAL;
+ }
+}
+
+static int admfm2000_write_raw(struct iio_dev *indio_dev,
+ struct iio_chan_spec const *chan, int val,
+ int val2, long mask)
+{
+ struct admfm2000_state *st = iio_priv(indio_dev);
+ int gain, ret;
+
+ if (val < 0)
+ gain = (val * 1000) - (val2 / 1000);
+ else
+ gain = (val * 1000) + (val2 / 1000);
+
+ if (gain > ADMF20000_MAX_GAIN || gain < ADMF20000_MIN_GAIN)
+ return -EINVAL;
+
+ switch (mask) {
+ case IIO_CHAN_INFO_HARDWAREGAIN:
+ mutex_lock(&st->lock);
+ st->gain[chan->channel] = ~((abs(gain) / 1000) & 0x1F);
+
+ ret = admfm2000_attenuation(indio_dev, chan->channel,
+ st->gain[chan->channel]);
+
+ mutex_unlock(&st->lock);
+ if (ret)
+ return ret;
+ break;
+ default:
+ return -EINVAL;
+ }
+
+ return 0;
+}
+
+static int admfm2000_write_raw_get_fmt(struct iio_dev *indio_dev,
+ struct iio_chan_spec const *chan,
+ long mask)
+{
+ switch (mask) {
+ case IIO_CHAN_INFO_HARDWAREGAIN:
+ return IIO_VAL_INT_PLUS_MICRO_DB;
+ default:
+ return -EINVAL;
+ }
+}
+
+static const struct iio_info admfm2000_info = {
+ .read_raw = &admfm2000_read_raw,
+ .write_raw = &admfm2000_write_raw,
+ .write_raw_get_fmt = &admfm2000_write_raw_get_fmt,
+};
+
+#define ADMFM2000_CHAN(_channel) { \
+ .type = IIO_VOLTAGE, \
+ .output = 1, \
+ .indexed = 1, \
+ .channel = _channel, \
+ .info_mask_separate = BIT(IIO_CHAN_INFO_HARDWAREGAIN), \
+}
+
+static const struct iio_chan_spec admfm2000_channels[] = {
+ ADMFM2000_CHAN(0),
+ ADMFM2000_CHAN(1),
+};
+
+static int admfm2000_channel_config(struct admfm2000_state *st,
+ struct iio_dev *indio_dev)
+{
+ struct platform_device *pdev = to_platform_device(indio_dev->dev.parent);
+ struct device *dev = &pdev->dev;
+ struct fwnode_handle *child;
+ u32 reg, mode;
+ int ret;
+
+ device_for_each_child_node(dev, child) {
+ ret = fwnode_property_read_u32(child, "reg", ®);
+ if (ret) {
+ fwnode_handle_put(child);
+ return dev_err_probe(dev, ret,
+ "Failed to get reg property\n");
+ }
+
+ if (reg >= indio_dev->num_channels) {
+ fwnode_handle_put(child);
+ return dev_err_probe(dev, -EINVAL, "reg bigger than: %d\n",
+ indio_dev->num_channels);
+ }
+
+ ret = fwnode_property_read_u32(child, "adi,mode", &mode);
+ if (ret) {
+ fwnode_handle_put(child);
+ return dev_err_probe(dev, ret,
+ "Failed to get mode property\n");
+ }
+
+ if (mode >= 2) {
+ fwnode_handle_put(child);
+ return dev_err_probe(dev, -EINVAL, "mode bigger than: 1\n");
+ }
+
+ ret = admfm2000_mode(indio_dev, reg, mode);
+ if (ret) {
+ fwnode_handle_put(child);
+ return ret;
+ }
+ }
+
+ return 0;
+}
+
+static int admfm2000_setup(struct admfm2000_state *st,
+ struct iio_dev *indio_dev)
+{
+ struct platform_device *pdev = to_platform_device(indio_dev->dev.parent);
+ struct device *dev = &pdev->dev;
+
+ st->sw_ch[0] = devm_gpiod_get_array(dev, "switch1", GPIOD_OUT_LOW);
+ if (IS_ERR(st->sw_ch[0]))
+ return dev_err_probe(dev, PTR_ERR(st->sw_ch[0]),
+ "Failed to get gpios\n");
+
+ if (st->sw_ch[0]->ndescs != ADMF20000_MODE_GPIOS) {
+ dev_err_probe(dev, -ENODEV, "%d GPIOs needed to operate\n",
+ ADMF20000_MODE_GPIOS);
+ return -ENODEV;
+ }
+
+ st->sw_ch[1] = devm_gpiod_get_array(dev, "switch2", GPIOD_OUT_LOW);
+ if (IS_ERR(st->sw_ch[1]))
+ return dev_err_probe(dev, PTR_ERR(st->sw_ch[1]),
+ "Failed to get gpios\n");
+
+ if (st->sw_ch[1]->ndescs != ADMF20000_MODE_GPIOS) {
+ dev_err_probe(dev, -ENODEV, "%d GPIOs needed to operate\n",
+ ADMF20000_MODE_GPIOS);
+ return -ENODEV;
+ }
+
+ st->dsa_gpios[0] = devm_gpiod_get_array(dev, "attenuation1",
+ GPIOD_OUT_LOW);
+ if (IS_ERR(st->dsa_gpios[0]))
+ return dev_err_probe(dev, PTR_ERR(st->dsa_gpios[0]),
+ "Failed to get gpios\n");
+
+ if (st->dsa_gpios[0]->ndescs != ADMF20000_DSA_GPIOS) {
+ dev_err_probe(dev, -ENODEV, "%d GPIOs needed to operate\n",
+ ADMF20000_DSA_GPIOS);
+ return -ENODEV;
+ }
+
+ st->dsa_gpios[1] = devm_gpiod_get_array(dev, "attenuation2",
+ GPIOD_OUT_LOW);
+ if (IS_ERR(st->dsa_gpios[1]))
+ return dev_err_probe(dev, PTR_ERR(st->dsa_gpios[1]),
+ "Failed to get gpios\n");
+
+ if (st->dsa_gpios[1]->ndescs != ADMF20000_DSA_GPIOS) {
+ dev_err_probe(dev, -ENODEV, "%d GPIOs needed to operate\n",
+ ADMF20000_DSA_GPIOS);
+ }
+
+ return 0;
+}
+
+static int admfm2000_probe(struct platform_device *pdev)
+{
+ struct device *dev = &pdev->dev;
+ struct iio_dev *indio_dev;
+ struct admfm2000_state *st;
+ int ret;
+
+ indio_dev = devm_iio_device_alloc(dev, sizeof(*st));
+ if (!indio_dev)
+ return -ENOMEM;
+
+ st = iio_priv(indio_dev);
+
+ indio_dev->name = "admfm2000";
+ indio_dev->num_channels = ARRAY_SIZE(admfm2000_channels);
+ indio_dev->channels = admfm2000_channels;
+ indio_dev->info = &admfm2000_info;
+ indio_dev->modes = INDIO_DIRECT_MODE;
+
+ st->gain[0] = ADMF20000_DEFAULT_GAIN;
+ st->gain[1] = ADMF20000_DEFAULT_GAIN;
+
+ mutex_init(&st->lock);
+
+ ret = admfm2000_setup(st, indio_dev);
+ if (ret)
+ return ret;
+
+ ret = admfm2000_channel_config(st, indio_dev);
+ if (ret)
+ return ret;
+
+ return devm_iio_device_register(dev, indio_dev);
+}
+
+static const struct of_device_id admfm2000_of_match[] = {
+ { .compatible = "adi,admfm2000" },
+ { }
+};
+MODULE_DEVICE_TABLE(of, admfm2000_of_match);
+
+static struct platform_driver admfm2000_driver = {
+ .driver = {
+ .name = "admfm2000",
+ .of_match_table = admfm2000_of_match,
+ },
+ .probe = admfm2000_probe,
+};
+module_platform_driver(admfm2000_driver);
+
+MODULE_AUTHOR("Kim Seer Paller <kimseer.paller@analog.com>");
+MODULE_DESCRIPTION("ADMFM2000 Dual Microwave Down Converter");
+MODULE_LICENSE("GPL");
--
2.34.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH v2 1/2] dt-bindings: iio: frequency: add admfm2000
2023-11-21 10:00 [PATCH v2 1/2] dt-bindings: iio: frequency: add admfm2000 Kim Seer Paller
2023-11-21 10:00 ` [PATCH v2 2/2] iio: frequency: admfm2000: New driver Kim Seer Paller
2023-11-21 10:57 ` [PATCH v2 1/2] dt-bindings: iio: frequency: add admfm2000 Rob Herring
@ 2023-11-21 13:04 ` Krzysztof Kozlowski
2023-11-21 14:47 ` Paller, Kim Seer
2023-11-21 22:52 ` kernel test robot
3 siblings, 1 reply; 7+ messages in thread
From: Krzysztof Kozlowski @ 2023-11-21 13:04 UTC (permalink / raw)
To: Kim Seer Paller
Cc: Jonathan Cameron, Lars-Peter Clausen, Michael Hennerich,
Rob Herring, Krzysztof Kozlowski, Conor Dooley, linux-iio,
devicetree, linux-kernel
On 21/11/2023 11:00, Kim Seer Paller wrote:
> Dual microwave down converter module with input RF and LO frequency
> ranges from 0.5 to 32 GHz and an output IF frequency range from 0.1 to
> 8 GHz. It consists of a LNA, mixer, IF filter, DSA, and IF amplifier
> for each down conversion path.
>
> Signed-off-by: Kim Seer Paller <kimseer.paller@analog.com>
> ---
> V1 -> V2: Removed '|' after description. Specified the pins connected to
> the GPIOs. Added additionalProperties: false. Changed node name to gpio.
Why? Is this a GPIO? Your bindings title say this is a converter, not a
GPIO.
> Aligned < syntax with the previous syntax in the examples.
>
> .../bindings/iio/frequency/adi,admfm2000.yaml | 130 ++++++++++++++++++
> MAINTAINERS | 7 +
> 2 files changed, 137 insertions(+)
> create mode 100644 Documentation/devicetree/bindings/iio/frequency/adi,admfm2000.yaml
>
> diff --git a/Documentation/devicetree/bindings/iio/frequency/adi,admfm2000.yaml b/Documentation/devicetree/bindings/iio/frequency/adi,admfm2000.yaml
> new file mode 100644
> index 000000000000..92a7736c6eeb
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/iio/frequency/adi,admfm2000.yaml
> @@ -0,0 +1,130 @@
> +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
> +# Copyright 2023 Analog Devices Inc.
> +%YAML 1.2
> +---
> +$id: http://devicetree.org/schemas/iio/frequency/adi,admfm2000.yaml#
> +$schema: http://devicetree.org/meta-schemas/core.yaml#
> +
> +title: ADMFM2000 Dual Microwave Down Converter
> +
> +maintainers:
> + - Kim Seer Paller <kimseer.paller@analog.com>
> +
> +description:
> + Dual microwave down converter module with input RF and LO frequency ranges
> + from 0.5 to 32 GHz and an output IF frequency range from 0.1 to 8 GHz.
> + It consists of a LNA, mixer, IF filter, DSA, and IF amplifier for each down
> + conversion path.
> +
> +properties:
> + compatible:
> + enum:
> + - adi,admfm2000
> +
> + switch1-gpios:
> + description:
> + Must contain an array of 2 GPIO specifiers, referring to the GPIO pins
Not much improved here - you still repeat the constraints.
> + connected to the B15 and B16.
> + minItems: 2
> + maxItems: 2
Instead all this:
items:
- description: B15 GPIO something something doing something
- description: B16 GPIO something something doing some switching
> +
> + switch2-gpios:
> + description:
> + Must contain an array of 2 GPIO specifiers, referring to the GPIO pins
> + connected to the L14 and K14.
> + minItems: 2
> + maxItems: 2
> +
> + attenuation1-gpios:
> + description:
> + Must contain an array of 5 GPIO specifiers, referring to the GPIO pins
> + connected to the C14, C15, C16, D14, and D15.
> + minItems: 5
> + maxItems: 5
> +
> + attenuation2-gpios:
> + description:
> + Must contain an array of 5 GPIO specifiers, referring to the GPIO pins
> + connected to the L15, L16, M14, M15, and M16.
> + minItems: 5
> + maxItems: 5
> +
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH v2 1/2] dt-bindings: iio: frequency: add admfm2000
2023-11-21 10:00 [PATCH v2 1/2] dt-bindings: iio: frequency: add admfm2000 Kim Seer Paller
` (2 preceding siblings ...)
2023-11-21 13:04 ` Krzysztof Kozlowski
@ 2023-11-21 22:52 ` kernel test robot
3 siblings, 0 replies; 7+ messages in thread
From: kernel test robot @ 2023-11-21 22:52 UTC (permalink / raw)
To: Kim Seer Paller
Cc: oe-kbuild-all, Jonathan Cameron, Lars-Peter Clausen,
Michael Hennerich, Rob Herring, Krzysztof Kozlowski, Conor Dooley,
Kim Seer Paller, linux-iio, devicetree, linux-kernel
Hi Kim,
kernel test robot noticed the following build warnings:
[auto build test WARNING on 98b1cc82c4affc16f5598d4fa14b1858671b2263]
url: https://github.com/intel-lab-lkp/linux/commits/Kim-Seer-Paller/iio-frequency-admfm2000-New-driver/20231121-180427
base: 98b1cc82c4affc16f5598d4fa14b1858671b2263
patch link: https://lore.kernel.org/r/20231121100012.112861-1-kimseer.paller%40analog.com
patch subject: [PATCH v2 1/2] dt-bindings: iio: frequency: add admfm2000
compiler: loongarch64-linux-gcc (GCC) 13.2.0
reproduce: (https://download.01.org/0day-ci/archive/20231122/202311220624.J7Nqg5h1-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202311220624.J7Nqg5h1-lkp@intel.com/
dtcheck warnings: (new ones prefixed by >>)
>> Documentation/devicetree/bindings/iio/frequency/adi,admfm2000.yaml:14:5: [warning] wrong indentation: expected 2 but found 4 (indentation)
vim +14 Documentation/devicetree/bindings/iio/frequency/adi,admfm2000.yaml
9
10 maintainers:
11 - Kim Seer Paller <kimseer.paller@analog.com>
12
13 description:
> 14 Dual microwave down converter module with input RF and LO frequency ranges
15 from 0.5 to 32 GHz and an output IF frequency range from 0.1 to 8 GHz.
16 It consists of a LNA, mixer, IF filter, DSA, and IF amplifier for each down
17 conversion path.
18
19 properties:
20 compatible:
21 enum:
22 - adi,admfm2000
23
24 switch1-gpios:
25 description:
26 Must contain an array of 2 GPIO specifiers, referring to the GPIO pins
27 connected to the B15 and B16.
28 minItems: 2
29 maxItems: 2
30
31 switch2-gpios:
32 description:
33 Must contain an array of 2 GPIO specifiers, referring to the GPIO pins
34 connected to the L14 and K14.
35 minItems: 2
36 maxItems: 2
37
38 attenuation1-gpios:
39 description:
40 Must contain an array of 5 GPIO specifiers, referring to the GPIO pins
41 connected to the C14, C15, C16, D14, and D15.
42 minItems: 5
43 maxItems: 5
44
45 attenuation2-gpios:
46 description:
47 Must contain an array of 5 GPIO specifiers, referring to the GPIO pins
48 connected to the L15, L16, M14, M15, and M16.
49 minItems: 5
50 maxItems: 5
51
52 '#address-cells':
53 const: 1
54
55 '#size-cells':
56 const: 0
57
58 patternProperties:
59 "^channel@[0-1]$":
60 type: object
61 description: Represents a channel of the device.
62
63 additionalProperties: false
64
65 properties:
66 reg:
67 description:
68 The channel number.
69 minimum: 0
70 maximum: 1
71
72 adi,mode:
73 description:
74 RF path selected for the channel.
75 0 - Direct IF mode
76 1 - Mixer mode
77 $ref: /schemas/types.yaml#/definitions/uint32
78 enum: [0, 1]
79
80 required:
81 - reg
82 - adi,mode
83
84 required:
85 - compatible
86 - switch1-gpios
87 - switch2-gpios
88 - attenuation1-gpios
89 - attenuation2-gpios
90
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
^ permalink raw reply [flat|nested] 7+ messages in thread