diff mbox series

[v2,4/4] pmbus (pli1209bc): Add regulator support

Message ID fc5b0ba1f7d41e88ef066c3ff23aaf882c19c543.1644834803.git.sylv@sylv.io (mailing list archive)
State Superseded
Headers show
Series Support pli1209bc Digital Supervisor | expand

Commit Message

Marcello Sylvester Bauer Feb. 14, 2022, 12:40 p.m. UTC 
Add regulator support for PLI1209BC Digital Supervisor.

Signed-off-by: Marcello Sylvester Bauer <sylv@sylv.io>
---
 drivers/hwmon/pmbus/Kconfig     |  7 +++++++
 drivers/hwmon/pmbus/pli1209bc.c | 31 +++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+)

Comments

Guenter Roeck Feb. 14, 2022, 5:40 p.m. UTC | #1 
On 2/14/22 04:40, Marcello Sylvester Bauer wrote:
> Add regulator support for PLI1209BC Digital Supervisor.
> 
> Signed-off-by: Marcello Sylvester Bauer <sylv@sylv.io>
> ---
>   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 831db423bea0..8b8f0d8733b2 100644
> --- a/drivers/hwmon/pmbus/Kconfig
> +++ b/drivers/hwmon/pmbus/Kconfig
> @@ -319,6 +319,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 8a9af2ccc46f..7212d73f6e04 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"
>   
>   /*
> @@ -32,11 +33,37 @@ static int pli1209bc_read_word_data(struct i2c_client *client, int page,
>   		if (data < 0)
>   			return data;
>   		return data * 10;
> +	/*
> +	 * 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 0L;

Why 0L ? The return value of pli1209bc_read_word_data() is int.

> +		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,
> @@ -74,6 +101,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)
Marcello Sylvester Bauer Feb. 14, 2022, 6:19 p.m. UTC | #2 
On Mon, 2022-02-14 at 09:40 -0800, Guenter Roeck wrote:
> On 2/14/22 04:40, Marcello Sylvester Bauer wrote:
> > Add regulator support for PLI1209BC Digital Supervisor.
> > 
> > Signed-off-by: Marcello Sylvester Bauer <sylv@sylv.io>
> > ---
> >   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 831db423bea0..8b8f0d8733b2 100644
> > --- a/drivers/hwmon/pmbus/Kconfig
> > +++ b/drivers/hwmon/pmbus/Kconfig
> > @@ -319,6 +319,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 8a9af2ccc46f..7212d73f6e04 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"
> >   
> >   /*
> > @@ -32,11 +33,37 @@ static int pli1209bc_read_word_data(struct
> > i2c_client *client, int page,
> >                 if (data < 0)
> >                         return data;
> >                 return data * 10;
> > +       /*
> > +        * 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 0L;
> 
> Why 0L ? The return value of pli1209bc_read_word_data() is int.

ack. 0L makes no sense here.

> 
> > +               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,
> > @@ -74,6 +101,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)
>
diff mbox series

Patch

diff --git a/drivers/hwmon/pmbus/Kconfig b/drivers/hwmon/pmbus/Kconfig
index 831db423bea0..8b8f0d8733b2 100644
--- a/drivers/hwmon/pmbus/Kconfig
+++ b/drivers/hwmon/pmbus/Kconfig
@@ -319,6 +319,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 8a9af2ccc46f..7212d73f6e04 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"
 
 /*
@@ -32,11 +33,37 @@  static int pli1209bc_read_word_data(struct i2c_client *client, int page,
 		if (data < 0)
 			return data;
 		return data * 10;
+	/*
+	 * 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 0L;
+		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,
@@ -74,6 +101,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)