* [PATCH 0/5] mfd: max597x: Add support for max597x @ 2022-07-04 9:00 Naresh Solanki 2022-07-04 9:00 ` [PATCH 4/5] iio: " Naresh Solanki 0 siblings, 1 reply; 3+ messages in thread From: Naresh Solanki @ 2022-07-04 9:00 UTC (permalink / raw) To: Patrick Rudolph, linux-leds, linux-kernel; +Cc: Naresh Solanki max597x is multifunction device with hot swap controller, fault protection & upto four indication leds. max5978 has single hot swap controller whereas max5970 has two hot swap controllers. Marcello Sylvester Bauer (1): dt-bindings: mfd: Add bindings for MAX5970 and MAX5978 Patrick Rudolph (4): mfd: max597x: Add support for MAX5970 and MAX5978 regulator: max597x: Add support for max597x regulator iio: max597x: Add support for max597x leds: max597x: Add support for max597x .../devicetree/bindings/mfd/max5970.yaml | 164 ++++++ drivers/iio/adc/Kconfig | 9 + drivers/iio/adc/Makefile | 1 + drivers/iio/adc/max597x-iio.c | 156 ++++++ drivers/leds/Kconfig | 10 + drivers/leds/Makefile | 1 + drivers/leds/leds-max597x.c | 130 +++++ drivers/mfd/Kconfig | 12 + drivers/mfd/Makefile | 2 + drivers/mfd/max597x.c | 109 ++++ drivers/regulator/Kconfig | 10 + drivers/regulator/Makefile | 1 + drivers/regulator/max597x-regulator.c | 506 ++++++++++++++++++ include/linux/mfd/max597x.h | 100 ++++ 14 files changed, 1211 insertions(+) create mode 100644 Documentation/devicetree/bindings/mfd/max5970.yaml create mode 100644 drivers/iio/adc/max597x-iio.c create mode 100644 drivers/leds/leds-max597x.c create mode 100644 drivers/mfd/max597x.c create mode 100644 drivers/regulator/max597x-regulator.c create mode 100644 include/linux/mfd/max597x.h base-commit: 88084a3df1672e131ddc1b4e39eeacfd39864acf -- 2.35.3 ^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 4/5] iio: max597x: Add support for max597x 2022-07-04 9:00 [PATCH 0/5] mfd: max597x: Add support for max597x Naresh Solanki @ 2022-07-04 9:00 ` Naresh Solanki 0 siblings, 0 replies; 3+ messages in thread From: Naresh Solanki @ 2022-07-04 9:00 UTC (permalink / raw) To: linux-kernel; +Cc: Patrick Rudolph, Naresh Solanki From: Patrick Rudolph <patrick.rudolph@9elements.com> max597x has 10bit ADC for voltage & current monitoring. Use iio framework to expose the same in sysfs. Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com> Signed-off-by: Naresh Solanki <Naresh.Solanki@9elements.com> --- drivers/iio/adc/Kconfig | 9 ++ drivers/iio/adc/Makefile | 1 + drivers/iio/adc/max597x-iio.c | 156 ++++++++++++++++++++++++++++++++++ 3 files changed, 166 insertions(+) create mode 100644 drivers/iio/adc/max597x-iio.c diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig index 48ace7412874..d4676eefb60f 100644 --- a/drivers/iio/adc/Kconfig +++ b/drivers/iio/adc/Kconfig @@ -683,6 +683,15 @@ config MAX1363 To compile this driver as a module, choose M here: the module will be called max1363. +config MAX597X_IIO + tristate "Maxim 597x power switch and monitor" + depends on I2C + depends on OF + select MFD_MAX597X + help + This driver exposes Maxim 5970/5978 voltage/current monitoring + interface using iio framework. + config MAX9611 tristate "Maxim max9611/max9612 ADC driver" depends on I2C diff --git a/drivers/iio/adc/Makefile b/drivers/iio/adc/Makefile index 39d806f6d457..f8cb5a30a946 100644 --- a/drivers/iio/adc/Makefile +++ b/drivers/iio/adc/Makefile @@ -63,6 +63,7 @@ obj-$(CONFIG_MAX11100) += max11100.o obj-$(CONFIG_MAX1118) += max1118.o obj-$(CONFIG_MAX1241) += max1241.o obj-$(CONFIG_MAX1363) += max1363.o +obj-$(CONFIG_MAX597X_IIO) += max597x-iio.o obj-$(CONFIG_MAX9611) += max9611.o obj-$(CONFIG_MCP320X) += mcp320x.o obj-$(CONFIG_MCP3422) += mcp3422.o diff --git a/drivers/iio/adc/max597x-iio.c b/drivers/iio/adc/max597x-iio.c new file mode 100644 index 000000000000..de0ea762c5c8 --- /dev/null +++ b/drivers/iio/adc/max597x-iio.c @@ -0,0 +1,156 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Device driver for regulators in MAX5970 and MAX5978 IC + * + * Copyright (c) 2022 9elements GmbH + * + * Author: Patrick Rudolph <patrick.rudolph@9elements.com> + */ + +#include <linux/bitops.h> +#include <linux/device.h> +#include <linux/err.h> +#include <linux/module.h> +#include <linux/io.h> +#include <linux/iio/iio.h> +#include <linux/of.h> +#include <linux/i2c.h> +#include <linux/mfd/max597x.h> +#include <linux/regmap.h> +#include <linux/version.h> +#include <linux/platform_device.h> + +struct max597x_iio { + struct regmap *regmap; + int shunt_micro_ohms[MAX5970_NUM_SWITCHES]; + unsigned int irng[MAX5970_NUM_SWITCHES]; + unsigned int mon_rng[MAX5970_NUM_SWITCHES]; +}; + +#define MAX597X_ADC_CHANNEL(_idx, _type) { \ + .type = IIO_ ## _type, \ + .indexed = 1, \ + .channel = (_idx), \ + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \ + BIT(IIO_CHAN_INFO_SCALE), \ + .address = MAX5970_REG_ ## _type ## _L(_idx), \ +} + +static const struct iio_chan_spec max5978_adc_iio_channels[] = { + MAX597X_ADC_CHANNEL(0, VOLTAGE), + MAX597X_ADC_CHANNEL(0, CURRENT), +}; + +static const struct iio_chan_spec max5970_adc_iio_channels[] = { + MAX597X_ADC_CHANNEL(0, VOLTAGE), + MAX597X_ADC_CHANNEL(0, CURRENT), + MAX597X_ADC_CHANNEL(1, VOLTAGE), + MAX597X_ADC_CHANNEL(1, CURRENT), +}; + +static int max597x_iio_read_raw(struct iio_dev *iio_dev, + struct iio_chan_spec const *chan, + int *val, int *val2, long info) +{ + int ret; + struct max597x_iio *data = iio_priv(iio_dev); + unsigned int reg_l, reg_h; + + switch (info) { + case IIO_CHAN_INFO_RAW: + ret = regmap_read(data->regmap, chan->address, ®_l); + if (ret < 0) + return ret; + ret = regmap_read(data->regmap, chan->address - 1, ®_h); + if (ret < 0) + return ret; + *val = (reg_h << 2) | (reg_l & 3); + + return IIO_VAL_INT; + case IIO_CHAN_INFO_SCALE: + + switch (chan->address) { + case MAX5970_REG_CURRENT_L(0): + fallthrough; + case MAX5970_REG_CURRENT_L(1): + /* in A, convert to mA */ + *val = data->irng[chan->channel] * 1000; + *val2 = + data->shunt_micro_ohms[chan->channel] * ADC_MASK; + return IIO_VAL_FRACTIONAL; + + case MAX5970_REG_VOLTAGE_L(0): + fallthrough; + case MAX5970_REG_VOLTAGE_L(1): + /* in uV, convert to mV */ + *val = data->mon_rng[chan->channel]; + *val2 = ADC_MASK * 1000; + return IIO_VAL_FRACTIONAL; + } + + break; + } + return -EINVAL; +} + +static const struct iio_info max597x_adc_iio_info = { + .read_raw = &max597x_iio_read_raw, +}; + +static int max597x_iio_probe(struct platform_device *pdev) +{ + struct max597x_data *max597x = dev_get_drvdata(pdev->dev.parent); + struct iio_dev *indio_dev; + struct max597x_iio *priv; + int ret, i; + + /* registering iio */ + indio_dev = devm_iio_device_alloc(max597x->dev, sizeof(*priv)); + if (!indio_dev) { + dev_err(max597x->dev, "failed allocating iio device\n"); + return -ENOMEM; + } + indio_dev->name = dev_name(max597x->dev); + indio_dev->info = &max597x_adc_iio_info; + indio_dev->modes = INDIO_DIRECT_MODE; + + switch (max597x->num_switches) { + case MAX597x_TYPE_MAX5970: + indio_dev->channels = max5970_adc_iio_channels; + indio_dev->num_channels = ARRAY_SIZE(max5970_adc_iio_channels); + break; + case MAX597x_TYPE_MAX5978: + indio_dev->channels = max5978_adc_iio_channels; + indio_dev->num_channels = ARRAY_SIZE(max5978_adc_iio_channels); + break; + } + + priv = iio_priv(indio_dev); + priv->regmap = max597x->regmap; + for (i = 0; i < indio_dev->num_channels; i++) { + priv->irng[i] = max597x->irng[i]; + priv->mon_rng[i] = max597x->mon_rng[i]; + priv->shunt_micro_ohms[i] = max597x->shunt_micro_ohms[i]; + } + + ret = devm_iio_device_register(max597x->dev, indio_dev); + if (ret) + dev_err(max597x->dev, "could not register iio device"); + + return ret; + +} + +static struct platform_driver max597x_iio_driver = { + .driver = { + .name = "max597x-iio", + }, + .probe = max597x_iio_probe, +}; + +module_platform_driver(max597x_iio_driver); + + +MODULE_AUTHOR("Patrick Rudolph <patrick.rudolph@9elements.com>"); +MODULE_DESCRIPTION("MAX5970_hot-swap controller driver"); +MODULE_LICENSE("GPL v2"); -- 2.35.3 ^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 1/5] dt-bindings: mfd: Add bindings for MAX5970 and MAX5978 @ 2022-07-05 12:22 Naresh Solanki 2022-07-05 12:22 ` [PATCH 4/5] iio: max597x: Add support for max597x Naresh Solanki 0 siblings, 1 reply; 3+ messages in thread From: Naresh Solanki @ 2022-07-05 12:22 UTC (permalink / raw) To: linux-kernel, Lee Jones Cc: Marcello Sylvester Bauer, Patrick Rudolph, Naresh Solanki From: Marcello Sylvester Bauer <sylv@sylv.io> The MAX597x is a hot swap controller with configurable fault protection. It also has 10bit ADC for current & voltage measurements. Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com> Signed-off-by: Marcello Sylvester Bauer <sylv@sylv.io> Signed-off-by: Naresh Solanki <Naresh.Solanki@9elements.com> --- .../devicetree/bindings/mfd/max5970.yaml | 164 ++++++++++++++++++ 1 file changed, 164 insertions(+) create mode 100644 Documentation/devicetree/bindings/mfd/max5970.yaml diff --git a/Documentation/devicetree/bindings/mfd/max5970.yaml b/Documentation/devicetree/bindings/mfd/max5970.yaml new file mode 100644 index 000000000000..a0cc6a7543b5 --- /dev/null +++ b/Documentation/devicetree/bindings/mfd/max5970.yaml @@ -0,0 +1,164 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/mfd/max5970.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Regulator driver for MAX5970 smart switch from Maxim Integrated. + +maintainers: + - Patrick Rudolph <patrick.rudolph@9elements.com> + +description: | + The smart switch provides no output regulation, but independent fault protection + and voltage and current sensing. + Programming is done through I2C bus. + + Datasheets: + https://datasheets.maximintegrated.com/en/ds/MAX5970.pdf + https://datasheets.maximintegrated.com/en/ds/MAX5978.pdf + +properties: + compatible: + enum: + - maxim,max5970 + - maxim,max5978 + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + + leds: + type: object + description: + Properties for single channel. + + patternProperties: + "^led@[0-3]$": + $ref: /schemas/leds/common.yaml# + type: object + + additionalProperties: true + + vss1-supply: + description: Supply of the first channel. + + "#io-channel-cells": + const: 1 + + regulators: + type: object + description: + Properties for single channel. + + patternProperties: + "^(sw[0-1])$": + $ref: /schemas/regulator/regulator.yaml# + type: object + + shunt-resistor-micro-ohms: + description: | + The value of curent sense resistor in microohms. + Must be specified for each channel. + + additionalProperties: true + +required: + - compatible + - reg + - regulators + - vss1-supply + +allOf: + - $ref: /schemas/regulator/regulator.yaml# + - if: + properties: + compatible: + enum: + - maxim,max5970 + then: + properties: + vss2-supply: + description: Supply of the second channel. + + io-channels: + items: + - description: voltage first channel + - description: current first channel + - description: voltage second channel + - description: current second channel + description: | + Voltage and current for first and second channel. + required: + - vss2-supply + + else: + properties: + io-channels: + items: + - description: voltage first channel + - description: current first channel + description: | + Voltage and current for first channel. + +additionalProperties: false + +examples: + - | + i2c { + #address-cells = <1>; + #size-cells = <0>; + leds { + #address-cells = <1>; + #size-cells = <0>; + led@0 { + reg = <0>; + label = "led0"; + default-state = "on"; + }; + led@1 { + reg = <1>; + label = "led1"; + default-state = "on"; + }; + }; + regulator@3a { + reg = <0x3a>; + vss1-supply = <&p3v3>; + compatible = "maxim,max5978"; + + regulators { + sw0_ref_0: SW0 { + regulator-compatible = "SW0"; + shunt-resistor-micro-ohms = <12000>; + }; + }; + }; + }; + + - | + i2c { + #address-cells = <1>; + #size-cells = <0>; + + regulator@3a { + reg = <0x3a>; + vss1-supply = <&p3v3>; + vss2-supply = <&p5v>; + compatible = "maxim,max5970"; + + regulators { + sw0_ref_1: SW0 { + regulator-compatible = "SW0"; + shunt-resistor-micro-ohms = <12000>; + }; + sw1_ref_1: SW1 { + regulator-compatible = "SW1"; + shunt-resistor-micro-ohms = <10000>; + }; + }; + }; + }; +... -- 2.35.3 ^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 4/5] iio: max597x: Add support for max597x 2022-07-05 12:22 [PATCH 1/5] dt-bindings: mfd: Add bindings for MAX5970 and MAX5978 Naresh Solanki @ 2022-07-05 12:22 ` Naresh Solanki 0 siblings, 0 replies; 3+ messages in thread From: Naresh Solanki @ 2022-07-05 12:22 UTC (permalink / raw) To: linux-kernel; +Cc: Patrick Rudolph, Naresh Solanki From: Patrick Rudolph <patrick.rudolph@9elements.com> max597x has 10bit ADC for voltage & current monitoring. Use iio framework to expose the same in sysfs. Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com> Signed-off-by: Naresh Solanki <Naresh.Solanki@9elements.com> --- drivers/iio/adc/Kconfig | 9 ++ drivers/iio/adc/Makefile | 1 + drivers/iio/adc/max597x-iio.c | 156 ++++++++++++++++++++++++++++++++++ 3 files changed, 166 insertions(+) create mode 100644 drivers/iio/adc/max597x-iio.c diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig index 48ace7412874..d4676eefb60f 100644 --- a/drivers/iio/adc/Kconfig +++ b/drivers/iio/adc/Kconfig @@ -683,6 +683,15 @@ config MAX1363 To compile this driver as a module, choose M here: the module will be called max1363. +config MAX597X_IIO + tristate "Maxim 597x power switch and monitor" + depends on I2C + depends on OF + select MFD_MAX597X + help + This driver exposes Maxim 5970/5978 voltage/current monitoring + interface using iio framework. + config MAX9611 tristate "Maxim max9611/max9612 ADC driver" depends on I2C diff --git a/drivers/iio/adc/Makefile b/drivers/iio/adc/Makefile index 39d806f6d457..f8cb5a30a946 100644 --- a/drivers/iio/adc/Makefile +++ b/drivers/iio/adc/Makefile @@ -63,6 +63,7 @@ obj-$(CONFIG_MAX11100) += max11100.o obj-$(CONFIG_MAX1118) += max1118.o obj-$(CONFIG_MAX1241) += max1241.o obj-$(CONFIG_MAX1363) += max1363.o +obj-$(CONFIG_MAX597X_IIO) += max597x-iio.o obj-$(CONFIG_MAX9611) += max9611.o obj-$(CONFIG_MCP320X) += mcp320x.o obj-$(CONFIG_MCP3422) += mcp3422.o diff --git a/drivers/iio/adc/max597x-iio.c b/drivers/iio/adc/max597x-iio.c new file mode 100644 index 000000000000..de0ea762c5c8 --- /dev/null +++ b/drivers/iio/adc/max597x-iio.c @@ -0,0 +1,156 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Device driver for regulators in MAX5970 and MAX5978 IC + * + * Copyright (c) 2022 9elements GmbH + * + * Author: Patrick Rudolph <patrick.rudolph@9elements.com> + */ + +#include <linux/bitops.h> +#include <linux/device.h> +#include <linux/err.h> +#include <linux/module.h> +#include <linux/io.h> +#include <linux/iio/iio.h> +#include <linux/of.h> +#include <linux/i2c.h> +#include <linux/mfd/max597x.h> +#include <linux/regmap.h> +#include <linux/version.h> +#include <linux/platform_device.h> + +struct max597x_iio { + struct regmap *regmap; + int shunt_micro_ohms[MAX5970_NUM_SWITCHES]; + unsigned int irng[MAX5970_NUM_SWITCHES]; + unsigned int mon_rng[MAX5970_NUM_SWITCHES]; +}; + +#define MAX597X_ADC_CHANNEL(_idx, _type) { \ + .type = IIO_ ## _type, \ + .indexed = 1, \ + .channel = (_idx), \ + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \ + BIT(IIO_CHAN_INFO_SCALE), \ + .address = MAX5970_REG_ ## _type ## _L(_idx), \ +} + +static const struct iio_chan_spec max5978_adc_iio_channels[] = { + MAX597X_ADC_CHANNEL(0, VOLTAGE), + MAX597X_ADC_CHANNEL(0, CURRENT), +}; + +static const struct iio_chan_spec max5970_adc_iio_channels[] = { + MAX597X_ADC_CHANNEL(0, VOLTAGE), + MAX597X_ADC_CHANNEL(0, CURRENT), + MAX597X_ADC_CHANNEL(1, VOLTAGE), + MAX597X_ADC_CHANNEL(1, CURRENT), +}; + +static int max597x_iio_read_raw(struct iio_dev *iio_dev, + struct iio_chan_spec const *chan, + int *val, int *val2, long info) +{ + int ret; + struct max597x_iio *data = iio_priv(iio_dev); + unsigned int reg_l, reg_h; + + switch (info) { + case IIO_CHAN_INFO_RAW: + ret = regmap_read(data->regmap, chan->address, ®_l); + if (ret < 0) + return ret; + ret = regmap_read(data->regmap, chan->address - 1, ®_h); + if (ret < 0) + return ret; + *val = (reg_h << 2) | (reg_l & 3); + + return IIO_VAL_INT; + case IIO_CHAN_INFO_SCALE: + + switch (chan->address) { + case MAX5970_REG_CURRENT_L(0): + fallthrough; + case MAX5970_REG_CURRENT_L(1): + /* in A, convert to mA */ + *val = data->irng[chan->channel] * 1000; + *val2 = + data->shunt_micro_ohms[chan->channel] * ADC_MASK; + return IIO_VAL_FRACTIONAL; + + case MAX5970_REG_VOLTAGE_L(0): + fallthrough; + case MAX5970_REG_VOLTAGE_L(1): + /* in uV, convert to mV */ + *val = data->mon_rng[chan->channel]; + *val2 = ADC_MASK * 1000; + return IIO_VAL_FRACTIONAL; + } + + break; + } + return -EINVAL; +} + +static const struct iio_info max597x_adc_iio_info = { + .read_raw = &max597x_iio_read_raw, +}; + +static int max597x_iio_probe(struct platform_device *pdev) +{ + struct max597x_data *max597x = dev_get_drvdata(pdev->dev.parent); + struct iio_dev *indio_dev; + struct max597x_iio *priv; + int ret, i; + + /* registering iio */ + indio_dev = devm_iio_device_alloc(max597x->dev, sizeof(*priv)); + if (!indio_dev) { + dev_err(max597x->dev, "failed allocating iio device\n"); + return -ENOMEM; + } + indio_dev->name = dev_name(max597x->dev); + indio_dev->info = &max597x_adc_iio_info; + indio_dev->modes = INDIO_DIRECT_MODE; + + switch (max597x->num_switches) { + case MAX597x_TYPE_MAX5970: + indio_dev->channels = max5970_adc_iio_channels; + indio_dev->num_channels = ARRAY_SIZE(max5970_adc_iio_channels); + break; + case MAX597x_TYPE_MAX5978: + indio_dev->channels = max5978_adc_iio_channels; + indio_dev->num_channels = ARRAY_SIZE(max5978_adc_iio_channels); + break; + } + + priv = iio_priv(indio_dev); + priv->regmap = max597x->regmap; + for (i = 0; i < indio_dev->num_channels; i++) { + priv->irng[i] = max597x->irng[i]; + priv->mon_rng[i] = max597x->mon_rng[i]; + priv->shunt_micro_ohms[i] = max597x->shunt_micro_ohms[i]; + } + + ret = devm_iio_device_register(max597x->dev, indio_dev); + if (ret) + dev_err(max597x->dev, "could not register iio device"); + + return ret; + +} + +static struct platform_driver max597x_iio_driver = { + .driver = { + .name = "max597x-iio", + }, + .probe = max597x_iio_probe, +}; + +module_platform_driver(max597x_iio_driver); + + +MODULE_AUTHOR("Patrick Rudolph <patrick.rudolph@9elements.com>"); +MODULE_DESCRIPTION("MAX5970_hot-swap controller driver"); +MODULE_LICENSE("GPL v2"); -- 2.35.3 ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-07-05 12:39 UTC | newest] Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2022-07-04 9:00 [PATCH 0/5] mfd: max597x: Add support for max597x Naresh Solanki 2022-07-04 9:00 ` [PATCH 4/5] iio: " Naresh Solanki 2022-07-05 12:22 [PATCH 1/5] dt-bindings: mfd: Add bindings for MAX5970 and MAX5978 Naresh Solanki 2022-07-05 12:22 ` [PATCH 4/5] iio: max597x: Add support for max597x Naresh Solanki
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®