On Mon, Jun 15, 2020 at 11:49:14PM +0000, Ugur Usug wrote: > add support for max20710 into the existing max20730 driver. > > Signed-off-by: Ugur Usug <ugur.usug@xxxxxxxxxxxxxxxxxxx> > --- > Documentation/hwmon/max20730.rst | 10 ++++++- > drivers/hwmon/pmbus/Kconfig | 4 +-- > drivers/hwmon/pmbus/max20730.c | 57 ++++++++++++++++++++++++++++++++++------ > 3 files changed, 60 insertions(+), 11 deletions(-) > > diff --git a/Documentation/hwmon/max20730.rst b/Documentation/hwmon/max20730.rst > index cea7ae5..cb0c95b 100644 > --- a/Documentation/hwmon/max20730.rst > +++ b/Documentation/hwmon/max20730.rst > @@ -5,6 +5,14 @@ Kernel driver max20730 > > Supported chips: > > + * Maxim MAX20710 > + > + Prefix: 'max20710' > + > + Addresses scanned: - > + > + Datasheet: https://datasheets.maximintegrated.com/en/ds/MAX20710.pdf > + > * Maxim MAX20730 > > Prefix: 'max20730' > @@ -35,7 +43,7 @@ Author: Guenter Roeck <linux@xxxxxxxxxxxx> > Description > ----------- > > -This driver implements support for Maxim MAX20730, MAX20734, and MAX20743 > +This driver implements support for Maxim MAX20710, MAX20730, MAX20734, and MAX20743 > Integrated, Step-Down Switching Regulators with PMBus support. > > The driver is a client driver to the core PMBus driver. > diff --git a/drivers/hwmon/pmbus/Kconfig b/drivers/hwmon/pmbus/Kconfig > index a337195..3ad97fd 100644 > --- a/drivers/hwmon/pmbus/Kconfig > +++ b/drivers/hwmon/pmbus/Kconfig > @@ -156,10 +156,10 @@ config SENSORS_MAX16601 > be called max16601. > > config SENSORS_MAX20730 > - tristate "Maxim MAX20730, MAX20734, MAX20743" > + tristate "Maxim MAX20710, MAX20730, MAX20734, MAX20743" > help > If you say yes here you get hardware monitoring support for Maxim > - MAX20730, MAX20734, and MAX20743. > + MAX20710, MAX20730, MAX20734, and MAX20743. > > This driver can also be built as a module. If so, the module will > be called max20730. > diff --git a/drivers/hwmon/pmbus/max20730.c b/drivers/hwmon/pmbus/max20730.c > index c0bb054..3ddc19b 100644 > --- a/drivers/hwmon/pmbus/max20730.c > +++ b/drivers/hwmon/pmbus/max20730.c > @@ -1,9 +1,10 @@ > // SPDX-License-Identifier: GPL-2.0-or-later > /* > - * Driver for MAX20730, MAX20734, and MAX20743 Integrated, Step-Down > - * Switching Regulators > + * Driver for MAX20710, MAX20730, MAX20734, and MAX20743 Integrated, > + * Step-Down Switching Regulators > * > * Copyright 2019 Google LLC. > + * Copyright 2020 Maxim Integrated > */ > > #include <linux/bits.h> > @@ -19,6 +20,7 @@ > #include "pmbus.h" > > enum chips { > + max20710, > max20730, > max20734, > max20743 > @@ -80,6 +82,7 @@ static long direct_to_val(u16 w, enum pmbus_sensor_classes class, > } > > static u32 max_current[][5] = { > + [max20710] = { 6200, 8000, 9700, 11600 }, > [max20730] = { 13000, 16600, 20100, 23600 }, > [max20734] = { 21000, 27000, 32000, 38000 }, > [max20743] = { 18900, 24100, 29200, 34100 }, > @@ -164,6 +167,35 @@ static int max20730_write_word_data(struct i2c_client *client, int page, > } > > static const struct pmbus_driver_info max20730_info[] = { > + [max20710] = { > + .pages = 1, > + .read_word_data = max20730_read_word_data, > + .write_word_data = max20730_write_word_data, > + > + /* Source : Maxim AN6140 and AN6042 */ > + .format[PSC_TEMPERATURE] = direct, > + .m[PSC_TEMPERATURE] = 21, > + .b[PSC_TEMPERATURE] = 5887, > + .R[PSC_TEMPERATURE] = -1, > + > + .format[PSC_VOLTAGE_IN] = direct, > + .m[PSC_VOLTAGE_IN] = 3609, > + .b[PSC_VOLTAGE_IN] = 0, > + .R[PSC_VOLTAGE_IN] = -2, > + > + .format[PSC_CURRENT_OUT] = direct, > + .m[PSC_CURRENT_OUT] = 153, > + .b[PSC_CURRENT_OUT] = 4976, > + .R[PSC_CURRENT_OUT] = -1, > + > + .format[PSC_VOLTAGE_OUT] = linear, > + > + .func[0] = PMBUS_HAVE_VIN | > + PMBUS_HAVE_VOUT | PMBUS_HAVE_STATUS_VOUT | > + PMBUS_HAVE_IOUT | PMBUS_HAVE_STATUS_IOUT | > + PMBUS_HAVE_TEMP | PMBUS_HAVE_STATUS_TEMP | > + PMBUS_HAVE_STATUS_INPUT, > + }, > [max20730] = { > .pages = 1, > .read_word_data = max20730_read_word_data, > @@ -200,7 +232,8 @@ static const struct pmbus_driver_info max20730_info[] = { > .func[0] = PMBUS_HAVE_VIN | > PMBUS_HAVE_VOUT | PMBUS_HAVE_STATUS_VOUT | > PMBUS_HAVE_IOUT | PMBUS_HAVE_STATUS_IOUT | > - PMBUS_HAVE_TEMP | PMBUS_HAVE_STATUS_TEMP, > + PMBUS_HAVE_TEMP | PMBUS_HAVE_STATUS_TEMP | > + PMBUS_HAVE_STATUS_INPUT, unrelated and undocumented change, should be done in a separate patch. > }, > [max20734] = { > .pages = 1, > @@ -228,7 +261,8 @@ static const struct pmbus_driver_info max20730_info[] = { > .func[0] = PMBUS_HAVE_VIN | > PMBUS_HAVE_VOUT | PMBUS_HAVE_STATUS_VOUT | > PMBUS_HAVE_IOUT | PMBUS_HAVE_STATUS_IOUT | > - PMBUS_HAVE_TEMP | PMBUS_HAVE_STATUS_TEMP, > + PMBUS_HAVE_TEMP | PMBUS_HAVE_STATUS_TEMP | > + PMBUS_HAVE_STATUS_INPUT, unrelated and undocumented change, should be done in a separate patch. > }, > [max20743] = { > .pages = 1, > @@ -256,7 +290,8 @@ static const struct pmbus_driver_info max20730_info[] = { > .func[0] = PMBUS_HAVE_VIN | > PMBUS_HAVE_VOUT | PMBUS_HAVE_STATUS_VOUT | > PMBUS_HAVE_IOUT | PMBUS_HAVE_STATUS_IOUT | > - PMBUS_HAVE_TEMP | PMBUS_HAVE_STATUS_TEMP, > + PMBUS_HAVE_TEMP | PMBUS_HAVE_STATUS_TEMP | > + PMBUS_HAVE_STATUS_INPUT, unrelated and undocumented change, should be done in a separate patch. > }, > }; > > @@ -274,7 +309,7 @@ static int max20730_probe(struct i2c_client *client, > I2C_FUNC_SMBUS_READ_WORD_DATA | > I2C_FUNC_SMBUS_BLOCK_DATA)) > return -ENODEV; > - > + Whitespace change and bug (do not insert empty tab) > ret = i2c_smbus_read_block_data(client, PMBUS_MFR_ID, buf); > if (ret < 0) { > dev_err(&client->dev, "Failed to read Manufacturer ID\n"); > @@ -335,10 +370,15 @@ static int max20730_probe(struct i2c_client *client, > return ret; > data->mfr_devset1 = ret; > > - return pmbus_do_probe(client, id, &data->info); > + ret = pmbus_do_probe(client, id, &data->info); > + if (ret < 0) > + return ret; > + > + return 0; Unnecessary change. Please drop. > } > > static const struct i2c_device_id max20730_id[] = { > + { "max20710", max20710 }, > { "max20730", max20730 }, > { "max20734", max20734 }, > { "max20743", max20743 }, > @@ -348,6 +388,7 @@ static const struct i2c_device_id max20730_id[] = { > MODULE_DEVICE_TABLE(i2c, max20730_id); > > static const struct of_device_id max20730_of_match[] = { > + { .compatible = "maxim,max20710", .data = (void *)max20710 }, > { .compatible = "maxim,max20730", .data = (void *)max20730 }, > { .compatible = "maxim,max20734", .data = (void *)max20734 }, > { .compatible = "maxim,max20743", .data = (void *)max20743 }, > @@ -369,5 +410,5 @@ static struct i2c_driver max20730_driver = { > module_i2c_driver(max20730_driver); > > MODULE_AUTHOR("Guenter Roeck <linux@xxxxxxxxxxxx>"); > -MODULE_DESCRIPTION("PMBus driver for Maxim MAX20730 / MAX20734 / MAX20743"); > +MODULE_DESCRIPTION("PMBus driver for Maxim MAX20710 / MAX20730 / MAX20734 / MAX20743"); > MODULE_LICENSE("GPL"); > -- > 2.7.4
