diff mbox series

[v3,2/3] hwmon (xdpe12284): Add support for xdpe11280

Message ID c9c0bcd8106c370243ba061dc4298d58b4e2f64b.1646157237.git.sylv@sylv.io (mailing list archive)
State Superseded
Headers show
Series Support XDPE112 | expand

Commit Message

Marcello Sylvester Bauer March 1, 2022, 6:01 p.m. UTC 
Add support for another Infineon Multi-phase controller chip. The
xdpe11280 uses linear instead of vid data format for VOUT. Detect
VOUT_MODE format during probing and set the xdpe122 related pointers
in case it uses vid.

Signed-off-by: Marcello Sylvester Bauer <sylv@sylv.io>
---
 Documentation/hwmon/xdpe12284.rst | 12 ++++++++----
 drivers/hwmon/pmbus/xdpe12284.c   | 22 +++++++++++++++++++---
 2 files changed, 27 insertions(+), 7 deletions(-)

Comments

Guenter Roeck March 1, 2022, 7:20 p.m. UTC | #1 
On 3/1/22 10:01, Marcello Sylvester Bauer wrote:
> Add support for another Infineon Multi-phase controller chip. The
> xdpe11280 uses linear instead of vid data format for VOUT. Detect
> VOUT_MODE format during probing and set the xdpe122 related pointers
> in case it uses vid.
> 
> Signed-off-by: Marcello Sylvester Bauer <sylv@sylv.io>
> ---
>   Documentation/hwmon/xdpe12284.rst | 12 ++++++++----
>   drivers/hwmon/pmbus/xdpe12284.c   | 22 +++++++++++++++++++---
>   2 files changed, 27 insertions(+), 7 deletions(-)
> 
> diff --git a/Documentation/hwmon/xdpe12284.rst b/Documentation/hwmon/xdpe12284.rst
> index 67d1f87808e5..a224dc74ad35 100644
> --- a/Documentation/hwmon/xdpe12284.rst
> +++ b/Documentation/hwmon/xdpe12284.rst
> @@ -5,6 +5,10 @@ Kernel driver xdpe122
>   
>   Supported chips:
>   
> +  * Infineon XDPE11280
> +
> +    Prefix: 'xdpe11280'
> +
>     * Infineon XDPE12254
>   
>       Prefix: 'xdpe12254'
> @@ -20,10 +24,10 @@ Authors:
>   Description
>   -----------
>   
> -This driver implements support for Infineon Multi-phase XDPE122 family
> -dual loop voltage regulators.
> -The family includes XDPE12284 and XDPE12254 devices.
> -The devices from this family complaint with:
> +This driver implements support for Infineon Multi-phase XDPE112 and XDPE122
> +family dual loop voltage regulators.
> +These families include XDPE11280, XDPE12284 and XDPE12254 devices.
> +The devices from this family compliant with:
>   
>   - Intel VR13 and VR13HC rev 1.3, IMVP8 rev 1.2 and IMPVP9 rev 1.3 DC-DC
>     converter specification.
> diff --git a/drivers/hwmon/pmbus/xdpe12284.c b/drivers/hwmon/pmbus/xdpe12284.c
> index b07da06a40c9..3413aba9d5be 100644
> --- a/drivers/hwmon/pmbus/xdpe12284.c
> +++ b/drivers/hwmon/pmbus/xdpe12284.c
> @@ -110,7 +110,6 @@ static int xdpe122_identify(struct i2c_client *client,
>   static struct pmbus_driver_info xdpe122_info = {
>   	.pages = XDPE122_PAGE_NUM,
>   	.format[PSC_VOLTAGE_IN] = linear,
> -	.format[PSC_VOLTAGE_OUT] = vid,
>   	.format[PSC_TEMPERATURE] = linear,
>   	.format[PSC_CURRENT_IN] = linear,
>   	.format[PSC_CURRENT_OUT] = linear,
> @@ -123,23 +122,39 @@ static struct pmbus_driver_info xdpe122_info = {
>   		PMBUS_HAVE_IIN | PMBUS_HAVE_IOUT | PMBUS_HAVE_STATUS_IOUT |
>   		PMBUS_HAVE_TEMP | PMBUS_HAVE_STATUS_TEMP |
>   		PMBUS_HAVE_POUT | PMBUS_HAVE_PIN | PMBUS_HAVE_STATUS_INPUT,
> -	.identify = xdpe122_identify,
> -	.read_word_data = xdpe122_read_word_data,
>   };
>   
>   static int xdpe122_probe(struct i2c_client *client)
>   {
>   	struct pmbus_driver_info *info;
> +	int vout_mode;
>   
>   	info = devm_kmemdup(&client->dev, &xdpe122_info, sizeof(*info),
>   			    GFP_KERNEL);
>   	if (!info)
>   		return -ENOMEM;
>   
> +	vout_mode = pmbus_read_byte_data(client, 0, PMBUS_VOUT_MODE);
> +	if (vout_mode >= 0 && vout_mode != 0xff) {
> +		switch (vout_mode >> 5) {
> +		case 0:
> +			info->format[PSC_VOLTAGE_OUT] = linear;
> +			break;
> +		case 1:
> +			info->format[PSC_VOLTAGE_OUT] = vid;
> +			info->identify = xdpe122_identify;
> +			info->read_word_data = xdpe122_read_word_data;
> +			break;
> +		default:
> +			return -ENODEV;
> +		}
> +	}

I am not entirely happy with this. Why not detect the mode (linear vs. vid)
in the identify function ?

Thanks,
Guenter

> +
>   	return pmbus_do_probe(client, info);
>   }
>   
>   static const struct i2c_device_id xdpe122_id[] = {
> +	{"xdpe11280", 0},
>   	{"xdpe12254", 0},
>   	{"xdpe12284", 0},
>   	{}
> @@ -148,6 +163,7 @@ static const struct i2c_device_id xdpe122_id[] = {
>   MODULE_DEVICE_TABLE(i2c, xdpe122_id);
>   
>   static const struct of_device_id __maybe_unused xdpe122_of_match[] = {
> +	{.compatible = "infineon,xdpe11280"},
>   	{.compatible = "infineon,xdpe12254"},
>   	{.compatible = "infineon,xdpe12284"},
>   	{}
Marcello Sylvester Bauer March 1, 2022, 8:07 p.m. UTC | #2 
On Tue, 2022-03-01 at 11:20 -0800, Guenter Roeck wrote:
> On 3/1/22 10:01, Marcello Sylvester Bauer wrote:
> > Add support for another Infineon Multi-phase controller chip. The
> > xdpe11280 uses linear instead of vid data format for VOUT. Detect
> > VOUT_MODE format during probing and set the xdpe122 related
> > pointers
> > in case it uses vid.
> > 
> > Signed-off-by: Marcello Sylvester Bauer <sylv@sylv.io>
> > ---
> >   Documentation/hwmon/xdpe12284.rst | 12 ++++++++----
> >   drivers/hwmon/pmbus/xdpe12284.c   | 22 +++++++++++++++++++---
> >   2 files changed, 27 insertions(+), 7 deletions(-)
> > 
> > diff --git a/Documentation/hwmon/xdpe12284.rst
> > b/Documentation/hwmon/xdpe12284.rst
> > index 67d1f87808e5..a224dc74ad35 100644
> > --- a/Documentation/hwmon/xdpe12284.rst
> > +++ b/Documentation/hwmon/xdpe12284.rst
> > @@ -5,6 +5,10 @@ Kernel driver xdpe122
> >   
> >   Supported chips:
> >   
> > +  * Infineon XDPE11280
> > +
> > +    Prefix: 'xdpe11280'
> > +
> >     * Infineon XDPE12254
> >   
> >       Prefix: 'xdpe12254'
> > @@ -20,10 +24,10 @@ Authors:
> >   Description
> >   -----------
> >   
> > -This driver implements support for Infineon Multi-phase XDPE122
> > family
> > -dual loop voltage regulators.
> > -The family includes XDPE12284 and XDPE12254 devices.
> > -The devices from this family complaint with:
> > +This driver implements support for Infineon Multi-phase XDPE112
> > and XDPE122
> > +family dual loop voltage regulators.
> > +These families include XDPE11280, XDPE12284 and XDPE12254 devices.
> > +The devices from this family compliant with:
> >   
> >   - Intel VR13 and VR13HC rev 1.3, IMVP8 rev 1.2 and IMPVP9 rev 1.3
> > DC-DC
> >     converter specification.
> > diff --git a/drivers/hwmon/pmbus/xdpe12284.c
> > b/drivers/hwmon/pmbus/xdpe12284.c
> > index b07da06a40c9..3413aba9d5be 100644
> > --- a/drivers/hwmon/pmbus/xdpe12284.c
> > +++ b/drivers/hwmon/pmbus/xdpe12284.c
> > @@ -110,7 +110,6 @@ static int xdpe122_identify(struct i2c_client
> > *client,
> >   static struct pmbus_driver_info xdpe122_info = {
> >         .pages = XDPE122_PAGE_NUM,
> >         .format[PSC_VOLTAGE_IN] = linear,
> > -       .format[PSC_VOLTAGE_OUT] = vid,
> >         .format[PSC_TEMPERATURE] = linear,
> >         .format[PSC_CURRENT_IN] = linear,
> >         .format[PSC_CURRENT_OUT] = linear,
> > @@ -123,23 +122,39 @@ static struct pmbus_driver_info xdpe122_info
> > = {
> >                 PMBUS_HAVE_IIN | PMBUS_HAVE_IOUT |
> > PMBUS_HAVE_STATUS_IOUT |
> >                 PMBUS_HAVE_TEMP | PMBUS_HAVE_STATUS_TEMP |
> >                 PMBUS_HAVE_POUT | PMBUS_HAVE_PIN |
> > PMBUS_HAVE_STATUS_INPUT,
> > -       .identify = xdpe122_identify,
> > -       .read_word_data = xdpe122_read_word_data,
> >   };
> >   
> >   static int xdpe122_probe(struct i2c_client *client)
> >   {
> >         struct pmbus_driver_info *info;
> > +       int vout_mode;
> >   
> >         info = devm_kmemdup(&client->dev, &xdpe122_info,
> > sizeof(*info),
> >                             GFP_KERNEL);
> >         if (!info)
> >                 return -ENOMEM;
> >   
> > +       vout_mode = pmbus_read_byte_data(client, 0,
> > PMBUS_VOUT_MODE);
> > +       if (vout_mode >= 0 && vout_mode != 0xff) {
> > +               switch (vout_mode >> 5) {
> > +               case 0:
> > +                       info->format[PSC_VOLTAGE_OUT] = linear;
> > +                       break;
> > +               case 1:
> > +                       info->format[PSC_VOLTAGE_OUT] = vid;
> > +                       info->identify = xdpe122_identify;
> > +                       info->read_word_data =
> > xdpe122_read_word_data;
> > +                       break;
> > +               default:
> > +                       return -ENODEV;
> > +               }
> > +       }
> 
> I am not entirely happy with this. Why not detect the mode (linear
> vs. vid)
> in the identify function ?

Oh, my bad. I misunderstood your last comment.
I'll move it into the identify function.

Thanks
Marcello

> 
> Thanks,
> Guenter
> 
> > +
> >         return pmbus_do_probe(client, info);
> >   }
> >   
> >   static const struct i2c_device_id xdpe122_id[] = {
> > +       {"xdpe11280", 0},
> >         {"xdpe12254", 0},
> >         {"xdpe12284", 0},
> >         {}
> > @@ -148,6 +163,7 @@ static const struct i2c_device_id xdpe122_id[]
> > = {
> >   MODULE_DEVICE_TABLE(i2c, xdpe122_id);
> >   
> >   static const struct of_device_id __maybe_unused
> > xdpe122_of_match[] = {
> > +       {.compatible = "infineon,xdpe11280"},
> >         {.compatible = "infineon,xdpe12254"},
> >         {.compatible = "infineon,xdpe12284"},
> >         {}
>
diff mbox series

Patch

diff --git a/Documentation/hwmon/xdpe12284.rst b/Documentation/hwmon/xdpe12284.rst
index 67d1f87808e5..a224dc74ad35 100644
--- a/Documentation/hwmon/xdpe12284.rst
+++ b/Documentation/hwmon/xdpe12284.rst
@@ -5,6 +5,10 @@  Kernel driver xdpe122
 
 Supported chips:
 
+  * Infineon XDPE11280
+
+    Prefix: 'xdpe11280'
+
   * Infineon XDPE12254
 
     Prefix: 'xdpe12254'
@@ -20,10 +24,10 @@  Authors:
 Description
 -----------
 
-This driver implements support for Infineon Multi-phase XDPE122 family
-dual loop voltage regulators.
-The family includes XDPE12284 and XDPE12254 devices.
-The devices from this family complaint with:
+This driver implements support for Infineon Multi-phase XDPE112 and XDPE122
+family dual loop voltage regulators.
+These families include XDPE11280, XDPE12284 and XDPE12254 devices.
+The devices from this family compliant with:
 
 - Intel VR13 and VR13HC rev 1.3, IMVP8 rev 1.2 and IMPVP9 rev 1.3 DC-DC
   converter specification.
diff --git a/drivers/hwmon/pmbus/xdpe12284.c b/drivers/hwmon/pmbus/xdpe12284.c
index b07da06a40c9..3413aba9d5be 100644
--- a/drivers/hwmon/pmbus/xdpe12284.c
+++ b/drivers/hwmon/pmbus/xdpe12284.c
@@ -110,7 +110,6 @@  static int xdpe122_identify(struct i2c_client *client,
 static struct pmbus_driver_info xdpe122_info = {
 	.pages = XDPE122_PAGE_NUM,
 	.format[PSC_VOLTAGE_IN] = linear,
-	.format[PSC_VOLTAGE_OUT] = vid,
 	.format[PSC_TEMPERATURE] = linear,
 	.format[PSC_CURRENT_IN] = linear,
 	.format[PSC_CURRENT_OUT] = linear,
@@ -123,23 +122,39 @@  static struct pmbus_driver_info xdpe122_info = {
 		PMBUS_HAVE_IIN | PMBUS_HAVE_IOUT | PMBUS_HAVE_STATUS_IOUT |
 		PMBUS_HAVE_TEMP | PMBUS_HAVE_STATUS_TEMP |
 		PMBUS_HAVE_POUT | PMBUS_HAVE_PIN | PMBUS_HAVE_STATUS_INPUT,
-	.identify = xdpe122_identify,
-	.read_word_data = xdpe122_read_word_data,
 };
 
 static int xdpe122_probe(struct i2c_client *client)
 {
 	struct pmbus_driver_info *info;
+	int vout_mode;
 
 	info = devm_kmemdup(&client->dev, &xdpe122_info, sizeof(*info),
 			    GFP_KERNEL);
 	if (!info)
 		return -ENOMEM;
 
+	vout_mode = pmbus_read_byte_data(client, 0, PMBUS_VOUT_MODE);
+	if (vout_mode >= 0 && vout_mode != 0xff) {
+		switch (vout_mode >> 5) {
+		case 0:
+			info->format[PSC_VOLTAGE_OUT] = linear;
+			break;
+		case 1:
+			info->format[PSC_VOLTAGE_OUT] = vid;
+			info->identify = xdpe122_identify;
+			info->read_word_data = xdpe122_read_word_data;
+			break;
+		default:
+			return -ENODEV;
+		}
+	}
+
 	return pmbus_do_probe(client, info);
 }
 
 static const struct i2c_device_id xdpe122_id[] = {
+	{"xdpe11280", 0},
 	{"xdpe12254", 0},
 	{"xdpe12284", 0},
 	{}
@@ -148,6 +163,7 @@  static const struct i2c_device_id xdpe122_id[] = {
 MODULE_DEVICE_TABLE(i2c, xdpe122_id);
 
 static const struct of_device_id __maybe_unused xdpe122_of_match[] = {
+	{.compatible = "infineon,xdpe11280"},
 	{.compatible = "infineon,xdpe12254"},
 	{.compatible = "infineon,xdpe12284"},
 	{}