Hi,
This patch set adds support for PLI1209BC Digital Supervisor from Vicor
Corporation. It replaces the previous submitted driver "bcm6123" [1],
since there are multiple digital supervisors, which uses BCMs in different
configurations [2].
Change in v4:
- Add Documetation to index.rst
- Add missing license identifier
- Fix typo and Makefile obj order
Change in v3:
- prevent potential over- or underflow of PMBUS_READ_POUT
Changes in v2:
- Multiply PMBUS_READ_POUT with 10 (R=1)
instead of dividing PMBUS_READ_PIN by 10.
- Set all pmbus formats to direct.
- Comment reason why page 0 is redundant.
- Import pmbus namespace.
[1]: https://www.spinics.net/lists/linux-hwmon/msg14097.html
[2]: https://www.spinics.net/lists/linux-hwmon/msg14123.html
Marcello Sylvester Bauer (4):
dt-bindings: vendor-prefixes: add Vicor Corporation
dt-bindings:trivial-devices: Add pli1209bc
pmbus: Add support for pli1209bc
pmbus (pli1209bc): Add regulator support
.../devicetree/bindings/trivial-devices.yaml | 2 +
.../devicetree/bindings/vendor-prefixes.yaml | 2 +
Documentation/hwmon/index.rst | 1 +
Documentation/hwmon/pli1209bc.rst | 75 +++++++++
drivers/hwmon/pmbus/Kconfig | 16 ++
drivers/hwmon/pmbus/Makefile | 1 +
drivers/hwmon/pmbus/pli1209bc.c | 146 ++++++++++++++++++
7 files changed, 243 insertions(+)
create mode 100644 Documentation/hwmon/pli1209bc.rst
create mode 100644 drivers/hwmon/pmbus/pli1209bc.c
--
2.34.1
Add trivial device entry for PLI1209BC Digital Supervisor from Vicor
Corporation.
Signed-off-by: Marcello Sylvester Bauer <[email protected]>
---
Documentation/devicetree/bindings/trivial-devices.yaml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/Documentation/devicetree/bindings/trivial-devices.yaml b/Documentation/devicetree/bindings/trivial-devices.yaml
index 091792ba993e..d03d90360aa0 100644
--- a/Documentation/devicetree/bindings/trivial-devices.yaml
+++ b/Documentation/devicetree/bindings/trivial-devices.yaml
@@ -354,6 +354,8 @@ properties:
- ti,tps544c25
# Winbond/Nuvoton H/W Monitor
- winbond,w83793
+ # Vicor Corporation Digital Supervisor
+ - vicor,pli1209bc
# i2c trusted platform module (TPM)
- winbond,wpct301
--
2.34.1
Add regulator support for PLI1209BC Digital Supervisor.
Signed-off-by: Marcello Sylvester Bauer <[email protected]>
---
drivers/hwmon/pmbus/Kconfig | 7 +++++++
drivers/hwmon/pmbus/pli1209bc.c | 31 +++++++++++++++++++++++++++++++
2 files changed, 38 insertions(+)
diff --git a/drivers/hwmon/pmbus/Kconfig b/drivers/hwmon/pmbus/Kconfig
index f18f67a94697..6552467c588d 100644
--- a/drivers/hwmon/pmbus/Kconfig
+++ b/drivers/hwmon/pmbus/Kconfig
@@ -326,6 +326,13 @@ config SENSORS_PLI1209BC
This driver can also be built as a module. If so, the module will
be called pli1209bc.
+config SENSORS_PLI1209BC_REGULATOR
+ bool "Regulator support for PLI1209BC"
+ depends on SENSORS_PLI1209BC && REGULATOR
+ help
+ If you say yes here you get regulator support for Vicor PLI1209BC
+ Digital Supervisor.
+
config SENSORS_PM6764TR
tristate "ST PM6764TR"
help
diff --git a/drivers/hwmon/pmbus/pli1209bc.c b/drivers/hwmon/pmbus/pli1209bc.c
index 5f8847307e55..05b4ee35ba27 100644
--- a/drivers/hwmon/pmbus/pli1209bc.c
+++ b/drivers/hwmon/pmbus/pli1209bc.c
@@ -8,6 +8,7 @@
#include <linux/i2c.h>
#include <linux/module.h>
#include <linux/pmbus.h>
+#include <linux/regulator/driver.h>
#include "pmbus.h"
/*
@@ -33,11 +34,37 @@ static int pli1209bc_read_word_data(struct i2c_client *client, int page,
return data;
data = sign_extend32(data, 15) * 10;
return clamp_val(data, -32768, 32767) & 0xffff;
+ /*
+ * PMBUS_READ_VOUT and PMBUS_READ_TEMPERATURE_1 return invalid data
+ * when the BCM is turned off. Since it is not possible to return
+ * ENODATA error, return zero instead.
+ */
+ case PMBUS_READ_VOUT:
+ case PMBUS_READ_TEMPERATURE_1:
+ data = pmbus_read_word_data(client, page, phase,
+ PMBUS_STATUS_WORD);
+ if (data < 0)
+ return data;
+ if (data & PB_STATUS_POWER_GOOD_N)
+ return 0;
+ return pmbus_read_word_data(client, page, phase, reg);
default:
return -ENODATA;
}
}
+#if IS_ENABLED(CONFIG_SENSORS_PLI1209BC_REGULATOR)
+static const struct regulator_desc pli1209bc_reg_desc = {
+ .name = "vout2",
+ .id = 1,
+ .of_match = of_match_ptr("vout2"),
+ .regulators_node = of_match_ptr("regulators"),
+ .ops = &pmbus_regulator_ops,
+ .type = REGULATOR_VOLTAGE,
+ .owner = THIS_MODULE,
+};
+#endif
+
static struct pmbus_driver_info pli1209bc_info = {
.pages = 2,
.format[PSC_VOLTAGE_IN] = direct,
@@ -75,6 +102,10 @@ static struct pmbus_driver_info pli1209bc_info = {
| PMBUS_HAVE_TEMP | PMBUS_HAVE_STATUS_TEMP
| PMBUS_HAVE_STATUS_IOUT | PMBUS_HAVE_STATUS_INPUT,
.read_word_data = pli1209bc_read_word_data,
+#if IS_ENABLED(CONFIG_SENSORS_PLI1209BC_REGULATOR)
+ .num_regulators = 1,
+ .reg_desc = &pli1209bc_reg_desc,
+#endif
};
static int pli1209bc_probe(struct i2c_client *client)
--
2.34.1
Add vendor prefix for Vicor Corporation.
Signed-off-by: Marcello Sylvester Bauer <[email protected]>
---
Documentation/devicetree/bindings/vendor-prefixes.yaml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/Documentation/devicetree/bindings/vendor-prefixes.yaml b/Documentation/devicetree/bindings/vendor-prefixes.yaml
index 294093d45a23..047a83a089ce 100644
--- a/Documentation/devicetree/bindings/vendor-prefixes.yaml
+++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml
@@ -1298,6 +1298,8 @@ patternProperties:
description: Vertexcom Technologies, Inc.
"^via,.*":
description: VIA Technologies, Inc.
+ "^vicor,.*":
+ description: Vicor Corporation
"^videostrong,.*":
description: Videostrong Technology Co., Ltd.
"^virtio,.*":
--
2.34.1
On Mon, 21 Feb 2022 10:42:04 +0100, Marcello Sylvester Bauer wrote:
> Add vendor prefix for Vicor Corporation.
>
> Signed-off-by: Marcello Sylvester Bauer <[email protected]>
> ---
> Documentation/devicetree/bindings/vendor-prefixes.yaml | 2 ++
> 1 file changed, 2 insertions(+)
>
Acked-by: Rob Herring <[email protected]>
On Mon, Feb 21, 2022 at 10:42:05AM +0100, Marcello Sylvester Bauer wrote:
> Add trivial device entry for PLI1209BC Digital Supervisor from Vicor
> Corporation.
>
> Signed-off-by: Marcello Sylvester Bauer <[email protected]>
> Acked-by: Rob Herring <[email protected]>
Applied to hwmon-next.
Thanks,
Guenter
> ---
> Documentation/devicetree/bindings/trivial-devices.yaml | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/trivial-devices.yaml b/Documentation/devicetree/bindings/trivial-devices.yaml
> index 091792ba993e..d03d90360aa0 100644
> --- a/Documentation/devicetree/bindings/trivial-devices.yaml
> +++ b/Documentation/devicetree/bindings/trivial-devices.yaml
> @@ -354,6 +354,8 @@ properties:
> - ti,tps544c25
> # Winbond/Nuvoton H/W Monitor
> - winbond,w83793
> + # Vicor Corporation Digital Supervisor
> + - vicor,pli1209bc
> # i2c trusted platform module (TPM)
> - winbond,wpct301
>
On Mon, Feb 21, 2022 at 10:42:04AM +0100, Marcello Sylvester Bauer wrote:
> Add vendor prefix for Vicor Corporation.
>
> Signed-off-by: Marcello Sylvester Bauer <[email protected]>
> Acked-by: Rob Herring <[email protected]>
Applied to hwmon-next.
Thanks,
Guenter
> ---
> Documentation/devicetree/bindings/vendor-prefixes.yaml | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/vendor-prefixes.yaml b/Documentation/devicetree/bindings/vendor-prefixes.yaml
> index 294093d45a23..047a83a089ce 100644
> --- a/Documentation/devicetree/bindings/vendor-prefixes.yaml
> +++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml
> @@ -1298,6 +1298,8 @@ patternProperties:
> description: Vertexcom Technologies, Inc.
> "^via,.*":
> description: VIA Technologies, Inc.
> + "^vicor,.*":
> + description: Vicor Corporation
> "^videostrong,.*":
> description: Videostrong Technology Co., Ltd.
> "^virtio,.*":
On Mon, 21 Feb 2022 10:42:05 +0100, Marcello Sylvester Bauer wrote:
> Add trivial device entry for PLI1209BC Digital Supervisor from Vicor
> Corporation.
>
> Signed-off-by: Marcello Sylvester Bauer <[email protected]>
> ---
> Documentation/devicetree/bindings/trivial-devices.yaml | 2 ++
> 1 file changed, 2 insertions(+)
>
Acked-by: Rob Herring <[email protected]>
On Mon, Feb 21, 2022 at 10:42:07AM +0100, Marcello Sylvester Bauer wrote:
> Add regulator support for PLI1209BC Digital Supervisor.
>
> Signed-off-by: Marcello Sylvester Bauer <[email protected]>
Applied to hwmon-next.
Thanks,
Guenter
> ---
> drivers/hwmon/pmbus/Kconfig | 7 +++++++
> drivers/hwmon/pmbus/pli1209bc.c | 31 +++++++++++++++++++++++++++++++
> 2 files changed, 38 insertions(+)
>
> diff --git a/drivers/hwmon/pmbus/Kconfig b/drivers/hwmon/pmbus/Kconfig
> index f18f67a94697..6552467c588d 100644
> --- a/drivers/hwmon/pmbus/Kconfig
> +++ b/drivers/hwmon/pmbus/Kconfig
> @@ -326,6 +326,13 @@ config SENSORS_PLI1209BC
> This driver can also be built as a module. If so, the module will
> be called pli1209bc.
>
> +config SENSORS_PLI1209BC_REGULATOR
> + bool "Regulator support for PLI1209BC"
> + depends on SENSORS_PLI1209BC && REGULATOR
> + help
> + If you say yes here you get regulator support for Vicor PLI1209BC
> + Digital Supervisor.
> +
> config SENSORS_PM6764TR
> tristate "ST PM6764TR"
> help
> diff --git a/drivers/hwmon/pmbus/pli1209bc.c b/drivers/hwmon/pmbus/pli1209bc.c
> index 5f8847307e55..05b4ee35ba27 100644
> --- a/drivers/hwmon/pmbus/pli1209bc.c
> +++ b/drivers/hwmon/pmbus/pli1209bc.c
> @@ -8,6 +8,7 @@
> #include <linux/i2c.h>
> #include <linux/module.h>
> #include <linux/pmbus.h>
> +#include <linux/regulator/driver.h>
> #include "pmbus.h"
>
> /*
> @@ -33,11 +34,37 @@ static int pli1209bc_read_word_data(struct i2c_client *client, int page,
> return data;
> data = sign_extend32(data, 15) * 10;
> return clamp_val(data, -32768, 32767) & 0xffff;
> + /*
> + * PMBUS_READ_VOUT and PMBUS_READ_TEMPERATURE_1 return invalid data
> + * when the BCM is turned off. Since it is not possible to return
> + * ENODATA error, return zero instead.
> + */
> + case PMBUS_READ_VOUT:
> + case PMBUS_READ_TEMPERATURE_1:
> + data = pmbus_read_word_data(client, page, phase,
> + PMBUS_STATUS_WORD);
> + if (data < 0)
> + return data;
> + if (data & PB_STATUS_POWER_GOOD_N)
> + return 0;
> + return pmbus_read_word_data(client, page, phase, reg);
> default:
> return -ENODATA;
> }
> }
>
> +#if IS_ENABLED(CONFIG_SENSORS_PLI1209BC_REGULATOR)
> +static const struct regulator_desc pli1209bc_reg_desc = {
> + .name = "vout2",
> + .id = 1,
> + .of_match = of_match_ptr("vout2"),
> + .regulators_node = of_match_ptr("regulators"),
> + .ops = &pmbus_regulator_ops,
> + .type = REGULATOR_VOLTAGE,
> + .owner = THIS_MODULE,
> +};
> +#endif
> +
> static struct pmbus_driver_info pli1209bc_info = {
> .pages = 2,
> .format[PSC_VOLTAGE_IN] = direct,
> @@ -75,6 +102,10 @@ static struct pmbus_driver_info pli1209bc_info = {
> | PMBUS_HAVE_TEMP | PMBUS_HAVE_STATUS_TEMP
> | PMBUS_HAVE_STATUS_IOUT | PMBUS_HAVE_STATUS_INPUT,
> .read_word_data = pli1209bc_read_word_data,
> +#if IS_ENABLED(CONFIG_SENSORS_PLI1209BC_REGULATOR)
> + .num_regulators = 1,
> + .reg_desc = &pli1209bc_reg_desc,
> +#endif
> };
>
> static int pli1209bc_probe(struct i2c_client *client)