hwmon: (pmbus) Add IC_DEVICE_ID and IC_DEVICE_REV command definitions
Subsystems (2)
Guenter Roeck
maintainerPATCH 1/8 hwmon: (pmbus) Add IC_DEVICE_ID and IC_DEVICE_REV command definitions
Recent PMBus versions added IC_DEVICE_ID and IC_DEVICE_REV commands as additional means to identify the chip. Add command definitions to pmbus.h include file.
--- drivers/hwmon/pmbus/pmbus.h | 3 +++ 1 file changed, 3 insertions(+)
drivers/hwmon/pmbus/pmbus.h +3 -0
@@ -119,6 +119,9 @@ enum pmbus_regs {PMBUS_MFR_DATE =0x9D ,PMBUS_MFR_SERIAL =0x9E , +PMBUS_IC_DEVICE_ID =0xAD , +PMBUS_IC_DEVICE_REV =0xAE , +/* * Virtual registers. * Useful to support attributes which are not supported by standard PMBus
Signature · 1 line
2.17.1
Guenter Roeck
maintainerPATCH 2/8 hwmon: (pmbus) Add 'phase' parameter where needed for multi-phase support
In preparation for multi-phase support, add 'phase' parameter to read_word and set_page functions. Actual multi-phase support will be added in a subsequent patch.
--- Documentation/hwmon/pmbus-core.rst | 22 +++++++++++------ drivers/hwmon/pmbus/adm1275.c | 37 ++++++++++++++++++---------- drivers/hwmon/pmbus/ibm-cffps.c | 15 ++++++------ drivers/hwmon/pmbus/ir35221.c | 23 +++++++++++------- drivers/hwmon/pmbus/isl68137.c | 3 ++- drivers/hwmon/pmbus/lm25066.c | 39 ++++++++++++++++++------------ drivers/hwmon/pmbus/ltc2978.c | 36 ++++++++++++++++----------- drivers/hwmon/pmbus/ltc3815.c | 20 +++++++++------ drivers/hwmon/pmbus/max16064.c | 7 +++--- drivers/hwmon/pmbus/max20730.c | 3 ++- drivers/hwmon/pmbus/max31785.c | 6 ++--- drivers/hwmon/pmbus/max34440.c | 25 ++++++++++--------- drivers/hwmon/pmbus/max8688.c | 17 +++++++------ drivers/hwmon/pmbus/pmbus.c | 4 +-- drivers/hwmon/pmbus/pmbus.h | 11 ++++++--- drivers/hwmon/pmbus/pmbus_core.c | 36 ++++++++++++++++----------- drivers/hwmon/pmbus/ucd9000.c | 2 +- drivers/hwmon/pmbus/zl6100.c | 5 ++-- 18 files changed, 189 insertions(+), 122 deletions(-)
Documentation/hwmon/pmbus-core.rst +15 -7
@@ -162,9 +162,12 @@ Read byte from page <page>, register <reg>. :: - int (*read_word_data)(struct i2c_client *client, int page, int reg); + int (*read_word_data)(struct i2c_client *client, int page, int phase, + int reg); -Read word from page <page>, register <reg>. +Read word from page <page>, phase <pase>, register <reg>. If the chip does not +support multiple phases, the phase parameter can be ignored. If the chip +supports multiple phases, a phase value of 0xff indicates all phases. ::
@@ -201,16 +204,21 @@ is mandatory. :: - int pmbus_set_page(struct i2c_client *client, u8 page); + int pmbus_set_page(struct i2c_client *client, u8 page, u8 phase); -Set PMBus page register to <page> for subsequent commands. +Set PMBus page register to <page> and <phase> for subsequent commands. +If the chip does not support multiple phases, the phase parameter is +ignored. Otherwise, a phase value of 0xff selects all phases. :: - int pmbus_read_word_data(struct i2c_client *client, u8 page, u8 reg); + int pmbus_read_word_data(struct i2c_client *client, u8 page, u8 phase, + u8 reg); -Read word data from <page>, <reg>. Similar to i2c_smbus_read_word_data(), but -selects page first. +Read word data from <page>, <phase>, <reg>. Similar to +i2c_smbus_read_word_data(), but selects page and phase first. If the chip does +not support multiple phases, the phase parameter is ignored. Otherwise, a phase +value of 0xff selects all phases. ::
drivers/hwmon/pmbus/adm1275.c +24 -13
@@ -226,7 +226,8 @@ static int adm1275_write_pmon_config(const struct adm1275_data *data,return ret; } -static int adm1275_read_word_data (struct i2c_client *client,int page,int reg) +static int adm1275_read_word_data (struct i2c_client *client,int page, +int phase,int reg) {const struct pmbus_driver_info *info =pmbus_get_driver_info (client);const struct adm1275_data *data =to_adm1275_data (info);
@@ -239,58 +240,68 @@ static int adm1275_read_word_data(struct i2c_client *client, int page, int reg)case PMBUS_IOUT_UC_FAULT_LIMIT :if (!data->have_uc_fault)return -ENXIO ; - ret =pmbus_read_word_data (client,0 ,ADM1275_IOUT_WARN2_LIMIT ); + ret =pmbus_read_word_data (client,0 ,0xff , +ADM1275_IOUT_WARN2_LIMIT );break ;case PMBUS_IOUT_OC_FAULT_LIMIT :if (!data->have_oc_fault)return -ENXIO ; - ret =pmbus_read_word_data (client,0 ,ADM1275_IOUT_WARN2_LIMIT ); + ret =pmbus_read_word_data (client,0 ,0xff , +ADM1275_IOUT_WARN2_LIMIT );break ;case PMBUS_VOUT_OV_WARN_LIMIT :if (data->have_vout)return -ENODATA ; - ret =pmbus_read_word_data (client,0 , + ret =pmbus_read_word_data (client,0 ,0xff ,ADM1075_VAUX_OV_WARN_LIMIT );break ;case PMBUS_VOUT_UV_WARN_LIMIT :if (data->have_vout)return -ENODATA ; - ret =pmbus_read_word_data (client,0 , + ret =pmbus_read_word_data (client,0 ,0xff ,ADM1075_VAUX_UV_WARN_LIMIT );break ;case PMBUS_READ_VOUT :if (data->have_vout)return -ENODATA ; - ret =pmbus_read_word_data (client,0 ,ADM1075_READ_VAUX ); + ret =pmbus_read_word_data (client,0 ,0xff , +ADM1075_READ_VAUX );break ;case PMBUS_VIRT_READ_IOUT_MIN :if (!data->have_iout_min)return -ENXIO ; - ret =pmbus_read_word_data (client,0 ,ADM1293_IOUT_MIN ); + ret =pmbus_read_word_data (client,0 ,0xff , +ADM1293_IOUT_MIN );break ;case PMBUS_VIRT_READ_IOUT_MAX : - ret =pmbus_read_word_data (client,0 ,ADM1275_PEAK_IOUT ); + ret =pmbus_read_word_data (client,0 ,0xff , +ADM1275_PEAK_IOUT );break ;case PMBUS_VIRT_READ_VOUT_MAX : - ret =pmbus_read_word_data (client,0 ,ADM1275_PEAK_VOUT ); + ret =pmbus_read_word_data (client,0 ,0xff , +ADM1275_PEAK_VOUT );break ;case PMBUS_VIRT_READ_VIN_MAX : - ret =pmbus_read_word_data (client,0 ,ADM1275_PEAK_VIN ); + ret =pmbus_read_word_data (client,0 ,0xff , +ADM1275_PEAK_VIN );break ;case PMBUS_VIRT_READ_PIN_MIN :if (!data->have_pin_min)return -ENXIO ; - ret =pmbus_read_word_data (client,0 ,ADM1293_PIN_MIN ); + ret =pmbus_read_word_data (client,0 ,0xff , +ADM1293_PIN_MIN );break ;case PMBUS_VIRT_READ_PIN_MAX :if (!data->have_pin_max)return -ENXIO ; - ret =pmbus_read_word_data (client,0 ,ADM1276_PEAK_PIN ); + ret =pmbus_read_word_data (client,0 ,0xff , +ADM1276_PEAK_PIN );break ;case PMBUS_VIRT_READ_TEMP_MAX :if (!data->have_temp_max)return -ENXIO ; - ret =pmbus_read_word_data (client,0 ,ADM1278_PEAK_TEMP ); + ret =pmbus_read_word_data (client,0 ,0xff , +ADM1278_PEAK_TEMP );break ;case PMBUS_VIRT_RESET_IOUT_HISTORY :case PMBUS_VIRT_RESET_VOUT_HISTORY :
drivers/hwmon/pmbus/ibm-cffps.c +8 -7
@@ -148,7 +148,7 @@ static ssize_t ibm_cffps_debugfs_read(struct file *file, char __user *buf,struct ibm_cffps *psu =to_psu (idxp, idx);char data[I2C_SMBUS_BLOCK_MAX +2 ] = {0 }; -pmbus_set_page (psu->client,0 ); +pmbus_set_page (psu->client,0 ,0xff );switch (idx) {case CFFPS_DEBUGFS_INPUT_HISTORY :
@@ -247,7 +247,7 @@ static ssize_t ibm_cffps_debugfs_write(struct file *file,switch (idx) {case CFFPS_DEBUGFS_ON_OFF_CONFIG : -pmbus_set_page (psu->client,0 ); +pmbus_set_page (psu->client,0 ,0xff ); rc =simple_write_to_buffer (&data,1 , ppos, buf, count);if (rc <=0 )
@@ -325,13 +325,13 @@ static int ibm_cffps_read_byte_data(struct i2c_client *client, int page, }static int ibm_cffps_read_word_data (struct i2c_client *client,int page, -int reg) +int phase,int reg) {int rc, mfr;switch (reg) {case PMBUS_STATUS_WORD : - rc =pmbus_read_word_data (client, page, reg); + rc =pmbus_read_word_data (client, page, phase, reg);if (rc <0 )return rc;
@@ -348,7 +348,8 @@ static int ibm_cffps_read_word_data(struct i2c_client *client, int page, rc |=PB_STATUS_OFF ;break ;case PMBUS_VIRT_READ_VMON : - rc =pmbus_read_word_data (client, page,CFFPS_12VCS_VOUT_CMD ); + rc =pmbus_read_word_data (client, page, phase, +CFFPS_12VCS_VOUT_CMD );break ;default : rc = -ENODATA ;
@@ -379,7 +380,7 @@ static int ibm_cffps_led_brightness_set(struct led_classdev *led_cdev,dev_dbg (&psu->client->dev,"LED brightness set: %d. Command: %d.\n" , brightness, next_led_state); -pmbus_set_page (psu->client,0 ); +pmbus_set_page (psu->client,0 ,0xff ); rc =i2c_smbus_write_byte_data (psu->client,CFFPS_SYS_CONFIG_CMD , next_led_state);
@@ -401,7 +402,7 @@ static int ibm_cffps_led_blink_set(struct led_classdev *led_cdev,dev_dbg (&psu->client->dev,"LED blink set.\n" ); -pmbus_set_page (psu->client,0 ); +pmbus_set_page (psu->client,0 ,0xff ); rc =i2c_smbus_write_byte_data (psu->client,CFFPS_SYS_CONFIG_CMD ,CFFPS_LED_BLINK );
drivers/hwmon/pmbus/ir35221.c +14 -9
@@ -21,37 +21,42 @@#define IR35221_MFR_IOUT_VALLEY 0xcb#define IR35221_MFR_TEMP_VALLEY 0xcc -static int ir35221_read_word_data (struct i2c_client *client,int page,int reg) +static int ir35221_read_word_data (struct i2c_client *client,int page, +int phase,int reg) {int ret;switch (reg) {case PMBUS_VIRT_READ_VIN_MAX : - ret =pmbus_read_word_data (client, page,IR35221_MFR_VIN_PEAK ); + ret =pmbus_read_word_data (client, page, phase, +IR35221_MFR_VIN_PEAK );break ;case PMBUS_VIRT_READ_VOUT_MAX : - ret =pmbus_read_word_data (client, page,IR35221_MFR_VOUT_PEAK ); + ret =pmbus_read_word_data (client, page, phase, +IR35221_MFR_VOUT_PEAK );break ;case PMBUS_VIRT_READ_IOUT_MAX : - ret =pmbus_read_word_data (client, page,IR35221_MFR_IOUT_PEAK ); + ret =pmbus_read_word_data (client, page, phase, +IR35221_MFR_IOUT_PEAK );break ;case PMBUS_VIRT_READ_TEMP_MAX : - ret =pmbus_read_word_data (client, page,IR35221_MFR_TEMP_PEAK ); + ret =pmbus_read_word_data (client, page, phase, +IR35221_MFR_TEMP_PEAK );break ;case PMBUS_VIRT_READ_VIN_MIN : - ret =pmbus_read_word_data (client, page, + ret =pmbus_read_word_data (client, page, phase,IR35221_MFR_VIN_VALLEY );break ;case PMBUS_VIRT_READ_VOUT_MIN : - ret =pmbus_read_word_data (client, page, + ret =pmbus_read_word_data (client, page, phase,IR35221_MFR_VOUT_VALLEY );break ;case PMBUS_VIRT_READ_IOUT_MIN : - ret =pmbus_read_word_data (client, page, + ret =pmbus_read_word_data (client, page, phase,IR35221_MFR_IOUT_VALLEY );break ;case PMBUS_VIRT_READ_TEMP_MIN : - ret =pmbus_read_word_data (client, page, + ret =pmbus_read_word_data (client, page, phase,IR35221_MFR_TEMP_VALLEY );break ;default :
drivers/hwmon/pmbus/isl68137.c +2 -1
@@ -49,7 +49,8 @@ static ssize_t isl68137_avs_enable_store_page(struct i2c_client *client,* enabling AVS control is the workaround. */ if (op_val ==ISL68137_VOUT_AVS ) { - rc =pmbus_read_word_data (client, page,PMBUS_VOUT_COMMAND ); + rc =pmbus_read_word_data (client, page,0xff , +PMBUS_VOUT_COMMAND );if (rc <0 )return rc;
drivers/hwmon/pmbus/lm25066.c +24 -15
@@ -211,7 +211,8 @@ struct lm25066_data {#define to_lm25066_data (x) container_of(x, struct lm25066_data, info) -static int lm25066_read_word_data (struct i2c_client *client,int page,int reg) +static int lm25066_read_word_data (struct i2c_client *client,int page, +int phase,int reg) {const struct pmbus_driver_info *info =pmbus_get_driver_info (client);const struct lm25066_data *data =to_lm25066_data (info);
@@ -219,7 +220,7 @@ static int lm25066_read_word_data(struct i2c_client *client, int page, int reg)switch (reg) {case PMBUS_VIRT_READ_VMON : - ret =pmbus_read_word_data (client,0 ,LM25066_READ_VAUX ); + ret =pmbus_read_word_data (client,0 ,0xff ,LM25066_READ_VAUX );if (ret <0 )break ;/* Adjust returned value to match VIN coefficients */
@@ -244,33 +245,40 @@ static int lm25066_read_word_data(struct i2c_client *client, int page, int reg) }break ;case PMBUS_READ_IIN : - ret =pmbus_read_word_data (client,0 ,LM25066_MFR_READ_IIN ); + ret =pmbus_read_word_data (client,0 ,0xff , +LM25066_MFR_READ_IIN );break ;case PMBUS_READ_PIN : - ret =pmbus_read_word_data (client,0 ,LM25066_MFR_READ_PIN ); + ret =pmbus_read_word_data (client,0 ,0xff , +LM25066_MFR_READ_PIN );break ;case PMBUS_IIN_OC_WARN_LIMIT : - ret =pmbus_read_word_data (client,0 , + ret =pmbus_read_word_data (client,0 ,0xff ,LM25066_MFR_IIN_OC_WARN_LIMIT );break ;case PMBUS_PIN_OP_WARN_LIMIT : - ret =pmbus_read_word_data (client,0 , + ret =pmbus_read_word_data (client,0 ,0xff ,LM25066_MFR_PIN_OP_WARN_LIMIT );break ;case PMBUS_VIRT_READ_VIN_AVG : - ret =pmbus_read_word_data (client,0 ,LM25066_READ_AVG_VIN ); + ret =pmbus_read_word_data (client,0 ,0xff , +LM25066_READ_AVG_VIN );break ;case PMBUS_VIRT_READ_VOUT_AVG : - ret =pmbus_read_word_data (client,0 ,LM25066_READ_AVG_VOUT ); + ret =pmbus_read_word_data (client,0 ,0xff , +LM25066_READ_AVG_VOUT );break ;case PMBUS_VIRT_READ_IIN_AVG : - ret =pmbus_read_word_data (client,0 ,LM25066_READ_AVG_IIN ); + ret =pmbus_read_word_data (client,0 ,0xff , +LM25066_READ_AVG_IIN );break ;case PMBUS_VIRT_READ_PIN_AVG : - ret =pmbus_read_word_data (client,0 ,LM25066_READ_AVG_PIN ); + ret =pmbus_read_word_data (client,0 ,0xff , +LM25066_READ_AVG_PIN );break ;case PMBUS_VIRT_READ_PIN_MAX : - ret =pmbus_read_word_data (client,0 ,LM25066_READ_PIN_PEAK ); + ret =pmbus_read_word_data (client,0 ,0xff , +LM25066_READ_PIN_PEAK );break ;case PMBUS_VIRT_RESET_PIN_HISTORY : ret =0 ;
@@ -288,13 +296,14 @@ static int lm25066_read_word_data(struct i2c_client *client, int page, int reg)return ret; } -static int lm25056_read_word_data (struct i2c_client *client,int page,int reg) +static int lm25056_read_word_data (struct i2c_client *client,int page, +int phase,int reg) {int ret;switch (reg) {case PMBUS_VIRT_VMON_UV_WARN_LIMIT : - ret =pmbus_read_word_data (client,0 , + ret =pmbus_read_word_data (client,0 ,0xff ,LM25056_VAUX_UV_WARN_LIMIT );if (ret <0 )break ;
@@ -302,7 +311,7 @@ static int lm25056_read_word_data(struct i2c_client *client, int page, int reg) ret =DIV_ROUND_CLOSEST (ret *293 ,6140 );break ;case PMBUS_VIRT_VMON_OV_WARN_LIMIT : - ret =pmbus_read_word_data (client,0 , + ret =pmbus_read_word_data (client,0 ,0xff ,LM25056_VAUX_OV_WARN_LIMIT );if (ret <0 )break ;
@@ -310,7 +319,7 @@ static int lm25056_read_word_data(struct i2c_client *client, int page, int reg) ret =DIV_ROUND_CLOSEST (ret *293 ,6140 );break ;default : - ret =lm25066_read_word_data (client, page, reg); + ret =lm25066_read_word_data (client, page, phase, reg);break ; }return ret;
drivers/hwmon/pmbus/ltc2978.c +22 -14
@@ -151,7 +151,8 @@ static int ltc_wait_ready(struct i2c_client *client)return -ETIMEDOUT ; } -static int ltc_read_word_data (struct i2c_client *client,int page,int reg) +static int ltc_read_word_data (struct i2c_client *client,int page,int phase, +int reg) {int ret;
@@ -159,7 +160,7 @@ static int ltc_read_word_data(struct i2c_client *client, int page, int reg)if (ret <0 )return ret; -return pmbus_read_word_data (client, page, reg); +return pmbus_read_word_data (client, page,0xff , reg); }static int ltc_read_byte_data (struct i2c_client *client,int page,int reg)
@@ -202,7 +203,7 @@ static int ltc_get_max(struct ltc2978_data *data, struct i2c_client *client, {int ret; - ret =ltc_read_word_data (client, page, reg); + ret =ltc_read_word_data (client, page,0xff , reg);if (ret >=0 ) {if (lin11_to_val (ret) >lin11_to_val (*pmax)) *pmax = ret;
@@ -216,7 +217,7 @@ static int ltc_get_min(struct ltc2978_data *data, struct i2c_client *client, {int ret; - ret =ltc_read_word_data (client, page, reg); + ret =ltc_read_word_data (client, page,0xff , reg);if (ret >=0 ) {if (lin11_to_val (ret) <lin11_to_val (*pmin)) *pmin = ret;
@@ -238,7 +239,8 @@ static int ltc2978_read_word_data_common(struct i2c_client *client, int page, &data->vin_max);break ;case PMBUS_VIRT_READ_VOUT_MAX : - ret =ltc_read_word_data (client, page,LTC2978_MFR_VOUT_PEAK ); + ret =ltc_read_word_data (client, page,0xff , +LTC2978_MFR_VOUT_PEAK );if (ret >=0 ) {/* * VOUT is 16 bit unsigned with fixed exponent,
@@ -269,7 +271,8 @@ static int ltc2978_read_word_data_common(struct i2c_client *client, int page,return ret; } -static int ltc2978_read_word_data (struct i2c_client *client,int page,int reg) +static int ltc2978_read_word_data (struct i2c_client *client,int page, +int phase,int reg) {const struct pmbus_driver_info *info =pmbus_get_driver_info (client);struct ltc2978_data *data =to_ltc2978_data (info);
@@ -281,7 +284,8 @@ static int ltc2978_read_word_data(struct i2c_client *client, int page, int reg) &data->vin_min);break ;case PMBUS_VIRT_READ_VOUT_MIN : - ret =ltc_read_word_data (client, page,LTC2978_MFR_VOUT_MIN ); + ret =ltc_read_word_data (client, page, phase, +LTC2978_MFR_VOUT_MIN );if (ret >=0 ) {/* * VOUT_MIN is known to not be supported on some lots
@@ -314,7 +318,8 @@ static int ltc2978_read_word_data(struct i2c_client *client, int page, int reg)return ret; } -static int ltc2974_read_word_data (struct i2c_client *client,int page,int reg) +static int ltc2974_read_word_data (struct i2c_client *client,int page, +int phase,int reg) {const struct pmbus_driver_info *info =pmbus_get_driver_info (client);struct ltc2978_data *data =to_ltc2978_data (info);
@@ -333,13 +338,14 @@ static int ltc2974_read_word_data(struct i2c_client *client, int page, int reg) ret =0 ;break ;default : - ret =ltc2978_read_word_data (client, page, reg); + ret =ltc2978_read_word_data (client, page, phase, reg);break ; }return ret; } -static int ltc2975_read_word_data (struct i2c_client *client,int page,int reg) +static int ltc2975_read_word_data (struct i2c_client *client,int page, +int phase,int reg) {const struct pmbus_driver_info *info =pmbus_get_driver_info (client);struct ltc2978_data *data =to_ltc2978_data (info);
@@ -367,13 +373,14 @@ static int ltc2975_read_word_data(struct i2c_client *client, int page, int reg) ret =0 ;break ;default : - ret =ltc2978_read_word_data (client, page, reg); + ret =ltc2978_read_word_data (client, page, phase, reg);break ; }return ret; } -static int ltc3880_read_word_data (struct i2c_client *client,int page,int reg) +static int ltc3880_read_word_data (struct i2c_client *client,int page, +int phase,int reg) {const struct pmbus_driver_info *info =pmbus_get_driver_info (client);struct ltc2978_data *data =to_ltc2978_data (info);
@@ -405,7 +412,8 @@ static int ltc3880_read_word_data(struct i2c_client *client, int page, int reg)return ret; } -static int ltc3883_read_word_data (struct i2c_client *client,int page,int reg) +static int ltc3883_read_word_data (struct i2c_client *client,int page, +int phase,int reg) {const struct pmbus_driver_info *info =pmbus_get_driver_info (client);struct ltc2978_data *data =to_ltc2978_data (info);
@@ -420,7 +428,7 @@ static int ltc3883_read_word_data(struct i2c_client *client, int page, int reg) ret =0 ;break ;default : - ret =ltc3880_read_word_data (client, page, reg); + ret =ltc3880_read_word_data (client, page, phase, reg);break ; }return ret;
drivers/hwmon/pmbus/ltc3815.c +13 -7
@@ -55,7 +55,7 @@ static int ltc3815_write_byte(struct i2c_client *client, int page, u8 reg)* LTC3815 does not support the CLEAR_FAULTS command. * Emulate it by clearing the status register. */ - ret =pmbus_read_word_data (client,0 ,PMBUS_STATUS_WORD ); + ret =pmbus_read_word_data (client,0 ,0xff ,PMBUS_STATUS_WORD );if (ret >0 ) {pmbus_write_word_data (client,0 ,PMBUS_STATUS_WORD , ret);
@@ -69,25 +69,31 @@ static int ltc3815_write_byte(struct i2c_client *client, int page, u8 reg)return ret; } -static int ltc3815_read_word_data (struct i2c_client *client,int page,int reg) +static int ltc3815_read_word_data (struct i2c_client *client,int page, +int phase,int reg) {int ret;switch (reg) {case PMBUS_VIRT_READ_VIN_MAX : - ret =pmbus_read_word_data (client, page,LTC3815_MFR_VIN_PEAK ); + ret =pmbus_read_word_data (client, page, phase, +LTC3815_MFR_VIN_PEAK );break ;case PMBUS_VIRT_READ_VOUT_MAX : - ret =pmbus_read_word_data (client, page,LTC3815_MFR_VOUT_PEAK ); + ret =pmbus_read_word_data (client, page, phase, +LTC3815_MFR_VOUT_PEAK );break ;case PMBUS_VIRT_READ_TEMP_MAX : - ret =pmbus_read_word_data (client, page,LTC3815_MFR_TEMP_PEAK ); + ret =pmbus_read_word_data (client, page, phase, +LTC3815_MFR_TEMP_PEAK );break ;case PMBUS_VIRT_READ_IOUT_MAX : - ret =pmbus_read_word_data (client, page,LTC3815_MFR_IOUT_PEAK ); + ret =pmbus_read_word_data (client, page, phase, +LTC3815_MFR_IOUT_PEAK );break ;case PMBUS_VIRT_READ_IIN_MAX : - ret =pmbus_read_word_data (client, page,LTC3815_MFR_IIN_PEAK ); + ret =pmbus_read_word_data (client, page, phase, +LTC3815_MFR_IIN_PEAK );break ;case PMBUS_VIRT_RESET_VOUT_HISTORY :case PMBUS_VIRT_RESET_VIN_HISTORY :
drivers/hwmon/pmbus/max16064.c +4 -3
@@ -15,17 +15,18 @@#define MAX16064_MFR_VOUT_PEAK 0xd4#define MAX16064_MFR_TEMPERATURE_PEAK 0xd6 -static int max16064_read_word_data (struct i2c_client *client,int page,int reg) +static int max16064_read_word_data (struct i2c_client *client,int page, +int phase,int reg) {int ret;switch (reg) {case PMBUS_VIRT_READ_VOUT_MAX : - ret =pmbus_read_word_data (client, page, + ret =pmbus_read_word_data (client, page, phase,MAX16064_MFR_VOUT_PEAK );break ;case PMBUS_VIRT_READ_TEMP_MAX : - ret =pmbus_read_word_data (client, page, + ret =pmbus_read_word_data (client, page, phase,MAX16064_MFR_TEMPERATURE_PEAK );break ;case PMBUS_VIRT_RESET_VOUT_HISTORY :
drivers/hwmon/pmbus/max20730.c +2 -1
@@ -85,7 +85,8 @@ static u32 max_current[][5] = { [max20743] = { 18900, 24100, 29200, 34100 }, }; -static int max20730_read_word_data (struct i2c_client *client,int page,int reg) +static int max20730_read_word_data (struct i2c_client *client,int page, +int phase,int reg) {const struct pmbus_driver_info *info =pmbus_get_driver_info (client);const struct max20730_data *data =to_max20730_data (info);
drivers/hwmon/pmbus/max31785.c +3 -3
@@ -72,7 +72,7 @@ static int max31785_read_long_data(struct i2c_client *client, int page, cmdbuf[0 ] = reg; - rc =pmbus_set_page (client, page); + rc =pmbus_set_page (client, page,0xff );if (rc <0 )return rc;
@@ -110,7 +110,7 @@ static int max31785_get_pwm_mode(struct i2c_client *client, int page)if (config <0 )return config; - command =pmbus_read_word_data (client, page,PMBUS_FAN_COMMAND_1 ); + command =pmbus_read_word_data (client, page,0xff ,PMBUS_FAN_COMMAND_1 );if (command <0 )return command;
@@ -126,7 +126,7 @@ static int max31785_get_pwm_mode(struct i2c_client *client, int page) }static int max31785_read_word_data (struct i2c_client *client,int page, -int reg) +int phase,int reg) {u32 val;int rv;
drivers/hwmon/pmbus/max34440.c +13 -12
@@ -41,7 +41,8 @@ struct max34440_data {#define to_max34440_data (x) container_of(x, struct max34440_data, info) -static int max34440_read_word_data (struct i2c_client *client,int page,int reg) +static int max34440_read_word_data (struct i2c_client *client,int page, +int phase,int reg) {int ret;const struct pmbus_driver_info *info =pmbus_get_driver_info (client);
@@ -49,44 +50,44 @@ static int max34440_read_word_data(struct i2c_client *client, int page, int reg)switch (reg) {case PMBUS_VIRT_READ_VOUT_MIN : - ret =pmbus_read_word_data (client, page, + ret =pmbus_read_word_data (client, page, phase,MAX34440_MFR_VOUT_MIN );break ;case PMBUS_VIRT_READ_VOUT_MAX : - ret =pmbus_read_word_data (client, page, + ret =pmbus_read_word_data (client, page, phase,MAX34440_MFR_VOUT_PEAK );break ;case PMBUS_VIRT_READ_IOUT_AVG :if (data->id != max34446 && data->id != max34451)return -ENXIO ; - ret =pmbus_read_word_data (client, page, + ret =pmbus_read_word_data (client, page, phase,MAX34446_MFR_IOUT_AVG );break ;case PMBUS_VIRT_READ_IOUT_MAX : - ret =pmbus_read_word_data (client, page, + ret =pmbus_read_word_data (client, page, phase,MAX34440_MFR_IOUT_PEAK );break ;case PMBUS_VIRT_READ_POUT_AVG :if (data->id != max34446)return -ENXIO ; - ret =pmbus_read_word_data (client, page, + ret =pmbus_read_word_data (client, page, phase,MAX34446_MFR_POUT_AVG );break ;case PMBUS_VIRT_READ_POUT_MAX :if (data->id != max34446)return -ENXIO ; - ret =pmbus_read_word_data (client, page, + ret =pmbus_read_word_data (client, page, phase,MAX34446_MFR_POUT_PEAK );break ;case PMBUS_VIRT_READ_TEMP_AVG :if (data->id != max34446 && data->id != max34460 && data->id != max34461)return -ENXIO ; - ret =pmbus_read_word_data (client, page, + ret =pmbus_read_word_data (client, page, phase,MAX34446_MFR_TEMPERATURE_AVG );break ;case PMBUS_VIRT_READ_TEMP_MAX : - ret =pmbus_read_word_data (client, page, + ret =pmbus_read_word_data (client, page, phase,MAX34440_MFR_TEMPERATURE_PEAK );break ;case PMBUS_VIRT_RESET_POUT_HISTORY :
@@ -159,14 +160,14 @@ static int max34440_read_byte_data(struct i2c_client *client, int page, int reg)int mfg_status;if (page >=0 ) { - ret =pmbus_set_page (client, page); + ret =pmbus_set_page (client, page,0xff );if (ret <0 )return ret; }switch (reg) {case PMBUS_STATUS_IOUT : - mfg_status =pmbus_read_word_data (client,0 , + mfg_status =pmbus_read_word_data (client,0 ,0xff ,PMBUS_STATUS_MFR_SPECIFIC );if (mfg_status <0 )return mfg_status;
@@ -176,7 +177,7 @@ static int max34440_read_byte_data(struct i2c_client *client, int page, int reg) ret |=PB_IOUT_OC_FAULT ;break ;case PMBUS_STATUS_TEMPERATURE : - mfg_status =pmbus_read_word_data (client,0 , + mfg_status =pmbus_read_word_data (client,0 ,0xff ,PMBUS_STATUS_MFR_SPECIFIC );if (mfg_status <0 )return mfg_status;
drivers/hwmon/pmbus/max8688.c +10 -7
@@ -28,7 +28,8 @@#define MAX8688_STATUS_OT_FAULT BIT(13)#define MAX8688_STATUS_OT_WARNING BIT(14) -static int max8688_read_word_data (struct i2c_client *client,int page,int reg) +static int max8688_read_word_data (struct i2c_client *client,int page, +int phase,int reg) {int ret;
@@ -37,13 +38,15 @@ static int max8688_read_word_data(struct i2c_client *client, int page, int reg)switch (reg) {case PMBUS_VIRT_READ_VOUT_MAX : - ret =pmbus_read_word_data (client,0 ,MAX8688_MFR_VOUT_PEAK ); + ret =pmbus_read_word_data (client,0 ,0xff , +MAX8688_MFR_VOUT_PEAK );break ;case PMBUS_VIRT_READ_IOUT_MAX : - ret =pmbus_read_word_data (client,0 ,MAX8688_MFR_IOUT_PEAK ); + ret =pmbus_read_word_data (client,0 ,0xff , +MAX8688_MFR_IOUT_PEAK );break ;case PMBUS_VIRT_READ_TEMP_MAX : - ret =pmbus_read_word_data (client,0 , + ret =pmbus_read_word_data (client,0 ,0xff ,MAX8688_MFR_TEMPERATURE_PEAK );break ;case PMBUS_VIRT_RESET_VOUT_HISTORY :
@@ -94,7 +97,7 @@ static int max8688_read_byte_data(struct i2c_client *client, int page, int reg)switch (reg) {case PMBUS_STATUS_VOUT : - mfg_status =pmbus_read_word_data (client,0 , + mfg_status =pmbus_read_word_data (client,0 ,0xff ,MAX8688_MFG_STATUS );if (mfg_status <0 )return mfg_status;
@@ -108,7 +111,7 @@ static int max8688_read_byte_data(struct i2c_client *client, int page, int reg) ret |=PB_VOLTAGE_OV_FAULT ;break ;case PMBUS_STATUS_IOUT : - mfg_status =pmbus_read_word_data (client,0 , + mfg_status =pmbus_read_word_data (client,0 ,0xff ,MAX8688_MFG_STATUS );if (mfg_status <0 )return mfg_status;
@@ -120,7 +123,7 @@ static int max8688_read_byte_data(struct i2c_client *client, int page, int reg) ret |=PB_IOUT_OC_FAULT ;break ;case PMBUS_STATUS_TEMPERATURE : - mfg_status =pmbus_read_word_data (client,0 , + mfg_status =pmbus_read_word_data (client,0 ,0xff ,MAX8688_MFG_STATUS );if (mfg_status <0 )return mfg_status;
drivers/hwmon/pmbus/pmbus.c +2 -2
@@ -102,10 +102,10 @@ static int pmbus_identify(struct i2c_client *client,int page;for (page =1 ; page <PMBUS_PAGES ; page++) { -if (pmbus_set_page (client, page) <0 ) +if (pmbus_set_page (client, page,0xff ) <0 )break ; } -pmbus_set_page (client,0 ); +pmbus_set_page (client,0 ,0xff ); info->pages = page; }else { info->pages =1 ;
drivers/hwmon/pmbus/pmbus.h +7 -4
@@ -418,7 +418,8 @@ struct pmbus_driver_info {* the standard register. */ int (*read_byte_data)(struct i2c_client *client,int page,int reg); -int (*read_word_data)(struct i2c_client *client,int page,int reg); +int (*read_word_data)(struct i2c_client *client,int page,int phase, +int reg);int (*write_word_data)(struct i2c_client *client,int page,int reg,u16 word);int (*write_byte)(struct i2c_client *client,int page,u8 value);
@@ -457,9 +458,11 @@ extern const struct regulator_ops pmbus_regulator_ops;/* Function declarations */ void pmbus_clear_cache (struct i2c_client *client); -int pmbus_set_page (struct i2c_client *client,int page); -int pmbus_read_word_data (struct i2c_client *client,int page,u8 reg); -int pmbus_write_word_data (struct i2c_client *client,int page,u8 reg,u16 word); +int pmbus_set_page (struct i2c_client *client,int page,int phase); +int pmbus_read_word_data (struct i2c_client *client,int page,int phase, +u8 reg); +int pmbus_write_word_data (struct i2c_client *client,int page,u8 reg, +u16 word);int pmbus_read_byte_data (struct i2c_client *client,int page,u8 reg);int pmbus_write_byte (struct i2c_client *client,int page,u8 value); int pmbus_write_byte_data(struct i2c_client *client, int page, u8 reg,
drivers/hwmon/pmbus/pmbus_core.c +22 -14
@@ -146,7 +146,7 @@ void pmbus_clear_cache(struct i2c_client *client) }EXPORT_SYMBOL_GPL (pmbus_clear_cache); -int pmbus_set_page (struct i2c_client *client,int page) +int pmbus_set_page (struct i2c_client *client,int page,int phase) {struct pmbus_data *data =i2c_get_clientdata (client);int rv;
@@ -177,7 +177,7 @@ int pmbus_write_byte(struct i2c_client *client, int page, u8 value) {int rv; - rv =pmbus_set_page (client, page); + rv =pmbus_set_page (client, page,0xff );if (rv <0 )return rv;
@@ -208,7 +208,7 @@ int pmbus_write_word_data(struct i2c_client *client, int page, u8 reg, {int rv; - rv =pmbus_set_page (client, page); + rv =pmbus_set_page (client, page,0xff );if (rv <0 )return rv;
@@ -286,11 +286,11 @@ int pmbus_update_fan(struct i2c_client *client, int page, int id, }EXPORT_SYMBOL_GPL (pmbus_update_fan); -int pmbus_read_word_data (struct i2c_client *client,int page,u8 reg) +int pmbus_read_word_data (struct i2c_client *client,int page,int phase,u8 reg) {int rv; - rv =pmbus_set_page (client, page); + rv =pmbus_set_page (client, page, phase);if (rv <0 )return rv;
@@ -320,14 +320,15 @@ static int pmbus_read_virt_reg(struct i2c_client *client, int page, int reg)* _pmbus_read_word_data() is similar to pmbus_read_word_data(), but checks if * a device specific mapping function exists and calls it if necessary. */ -static int _pmbus_read_word_data (struct i2c_client *client,int page,int reg) +static int _pmbus_read_word_data (struct i2c_client *client,int page, +int phase,int reg) {struct pmbus_data *data =i2c_get_clientdata (client);const struct pmbus_driver_info *info = data->info;int status;if (info->read_word_data) { - status = info->read_word_data (client, page, reg); + status = info->read_word_data (client, page, phase, reg);if (status != -ENODATA )return status; }
@@ -335,14 +336,20 @@ static int _pmbus_read_word_data(struct i2c_client *client, int page, int reg)if (reg >=PMBUS_VIRT_BASE )return pmbus_read_virt_reg (client, page, reg); -return pmbus_read_word_data (client, page, reg); +return pmbus_read_word_data (client, page, phase, reg); +} + +/* Same as above, but without phase parameter, for use in check functions */ +static int __pmbus_read_word_data (struct i2c_client *client,int page,int reg) +{ +return _pmbus_read_word_data (client, page,0xff , reg); }int pmbus_read_byte_data (struct i2c_client *client,int page,u8 reg) {int rv; - rv =pmbus_set_page (client, page); + rv =pmbus_set_page (client, page,0xff );if (rv <0 )return rv;
@@ -354,7 +361,7 @@ int pmbus_write_byte_data(struct i2c_client *client, int page, u8 reg, u8 value) {int rv; - rv =pmbus_set_page (client, page); + rv =pmbus_set_page (client, page,0xff );if (rv <0 )return rv;
@@ -440,7 +447,7 @@ static int pmbus_get_fan_rate(struct i2c_client *client, int page, int id, have_rpm = !!(config & pmbus_fan_rpm_mask[id]);if (want_rpm == have_rpm) -return pmbus_read_word_data (client, page, +return pmbus_read_word_data (client, page,0xff , pmbus_fan_command_registers[id]);/* Can't sensibly map between RPM and PWM, just return zero */
@@ -530,7 +537,7 @@ EXPORT_SYMBOL_GPL(pmbus_check_byte_register);bool pmbus_check_word_register (struct i2c_client *client,int page,int reg) { -return pmbus_check_register (client, _pmbus_read_word_data, page, reg); +return pmbus_check_register (client, __pmbus_read_word_data, page, reg); }EXPORT_SYMBOL_GPL (pmbus_check_word_register);
@@ -595,6 +602,7 @@ static struct pmbus_data *pmbus_update_device(struct device *dev) sensor->data =_pmbus_read_word_data (client, sensor->page, +0xff , sensor->reg); }pmbus_clear_faults (client);
@@ -1964,7 +1972,7 @@ static ssize_t pmbus_show_samples(struct device *dev,struct i2c_client *client =to_i2c_client (dev->parent);struct pmbus_samples_reg *reg =to_samples_reg (devattr); - val =_pmbus_read_word_data (client, reg->page, reg->attr->reg); + val =_pmbus_read_word_data (client, reg->page,0xff , reg->attr->reg);if (val <0 )return val;
@@ -2120,7 +2128,7 @@ static int pmbus_read_status_byte(struct i2c_client *client, int page)static int pmbus_read_status_word (struct i2c_client *client,int page) { -return _pmbus_read_word_data (client, page,PMBUS_STATUS_WORD ); +return _pmbus_read_word_data (client, page,0xff ,PMBUS_STATUS_WORD ); } static int pmbus_init_common(struct i2c_client *client, struct pmbus_data *data,
drivers/hwmon/pmbus/ucd9000.c +1 -1
@@ -370,7 +370,7 @@ static void ucd9000_probe_gpio(struct i2c_client *client,#ifdef CONFIG_DEBUG_FS static int ucd9000_get_mfr_status (struct i2c_client *client,u8 *buffer) { -int ret =pmbus_set_page (client,0 ); +int ret =pmbus_set_page (client,0 ,0xff );if (ret <0 )return ret;
drivers/hwmon/pmbus/zl6100.c +3 -2
@@ -125,7 +125,8 @@ static inline void zl6100_wait(const struct zl6100_data *data) } } -static int zl6100_read_word_data (struct i2c_client *client,int page,int reg) +static int zl6100_read_word_data (struct i2c_client *client,int page, +int phase,int reg) {const struct pmbus_driver_info *info =pmbus_get_driver_info (client);struct zl6100_data *data =to_zl6100_data (info);
@@ -167,7 +168,7 @@ static int zl6100_read_word_data(struct i2c_client *client, int page, int reg) }zl6100_wait (data); - ret =pmbus_read_word_data (client, page, vreg); + ret =pmbus_read_word_data (client, page, phase, vreg); data->access =ktime_get ();if (ret <0 )return ret;
Signature · 1 line
2.17.1
Guenter Roeck
maintainerPATCH 3/8 hwmon: (pmbus) Implement multi-phase support
In reply to Guenter RoeckSome PMBus chips support multiple phases, and report telemetry such as input current, output current, or temperature for each phase. Add support for such chips to the PMBus core.
Start with a maximum of 8 phases per page, and assume that supported sensors per phase are similar for all pages. Only support per-phase telemetry attributes, no limits or alarms.
As part of this patch, set the initial page variable to 0xff to ensure that the page is updated when the first page command is issued. Also only issue page commands if the chip supports more than one page.
--- Documentation/hwmon/pmbus.rst | 8 ++- drivers/hwmon/pmbus/pmbus.h | 6 ++- drivers/hwmon/pmbus/pmbus_core.c | 85 +++++++++++++++++++++++--------- 3 files changed, 74 insertions(+), 25 deletions(-)
Documentation/hwmon/pmbus.rst +6 -2
@@ -227,7 +227,9 @@ currX_lcrit_alarm Output current critical low alarm. From IOUT_UC_FAULT status. currX_crit_alarm Current critical high alarm. From IIN_OC_FAULT or IOUT_OC_FAULT status. -currX_label "iin" or "ioutY" +currX_label "iin", "iinY", "iinY.Z", "ioutY", or "ioutY.Z", + where Y reflects the page number and Z reflects the + phase. powerX_input Measured power. From READ_PIN or READ_POUT register. powerX_cap Output power cap. From POUT_MAX register.
@@ -239,7 +241,9 @@ powerX_alarm Power high alarm. From PIN_OP_WARNING or POUT_OP_WARNING status. powerX_crit_alarm Output power critical high alarm. From POUT_OP_FAULT status. -powerX_label "pin" or "poutY" +powerX_label "pin", "pinY", "pinY.Z", "poutY", or "poutY.Z", + where Y reflects the page number and Z reflects the + phase. tempX_input Measured temperature. From READ_TEMPERATURE_X register.
drivers/hwmon/pmbus/pmbus.h +5 -1
@@ -362,6 +362,7 @@ enum pmbus_sensor_classes { };#define PMBUS_PAGES 32/* Per PMBus specification */ +#define PMBUS_PHASES 8/* Maximum number of phases per page */ /* Functionality bit mask */ #define PMBUS_HAVE_VIN BIT(0)
@@ -388,13 +389,15 @@ enum pmbus_sensor_classes {#define PMBUS_HAVE_PWM34 BIT(21)#define PMBUS_HAVE_SAMPLES BIT(22) -#define PMBUS_PAGE_VIRTUAL BIT(31) +#define PMBUS_PHASE_VIRTUAL BIT(30)/* Phases on this page are virtual */ +#define PMBUS_PAGE_VIRTUAL BIT(31)/* Page is virtual */ enum pmbus_data_format { linear =0 , direct, vid };enum vrm_version { vr11 =0 , vr12, vr13, imvp9, amd625mv };struct pmbus_driver_info {int pages;/* Total number of pages */ +u8 phases[PMBUS_PAGES ];/* Number of phases per page */ enum pmbus_data_format format[PSC_NUM_CLASSES ];enum vrm_version vrm_version[PMBUS_PAGES ];/* vrm version per page */ /*
@@ -406,6 +409,7 @@ struct pmbus_driver_info {int R [PSC_NUM_CLASSES ];/* exponent */ u32 func[PMBUS_PAGES ];/* Functionality, per page */ +u32 pfunc[PMBUS_PHASES ];/* Functionality, per phase */ /* * The following functions map manufacturing specific register values * to PMBus standard register values. Specify only if mapping is
drivers/hwmon/pmbus/pmbus_core.c +63 -22
205 lines not on this page · raw message
Signature · 1 line
2.17.1
Guenter Roeck
maintainerPATCH 4/8 hwmon: (pmbus/tps53679) Add support for multiple chips IDs
In reply to Guenter RoeckChip specific support will be needed in the driver to be able to support additional chips of the same series. Add support for it to the driver.
To simplify adding support for more chips, call identification code from the probe function. This lets us use a single structure for common elements of struct pmbus_driver_info, thus reducing code size as support for more chips is added.
--- drivers/hwmon/pmbus/tps53679.c | 41 +++++++++++++++++++++++++--------- 1 file changed, 31 insertions(+), 10 deletions(-)
drivers/hwmon/pmbus/tps53679.c +31 -10
@@ -11,8 +11,13 @@#include <linux/init.h> #include <linux/kernel.h> #include <linux/module.h> +#include <linux/of_device.h> #include "pmbus.h" +enum chips { + tps53679, tps53688, +}; +#define TPS53679_PROT_VR12_5MV 0x01/* VR12.0 mode, 5-mV DAC */ #define TPS53679_PROT_VR12_5_10MV 0x02/* VR12.5 mode, 10-mV DAC */ #define TPS53679_PROT_VR13_10MV 0x04/* VR13.0 mode, 10-mV DAC */
@@ -53,47 +58,63 @@ static int tps53679_identify(struct i2c_client *client, }static struct pmbus_driver_info tps53679_info = { - .pages =TPS53679_PAGE_NUM , .format[PSC_VOLTAGE_IN ] = linear, .format[PSC_VOLTAGE_OUT ] = vid, .format[PSC_TEMPERATURE ] = linear, .format[PSC_CURRENT_OUT ] = linear, .format[PSC_POWER ] = linear, - .func[0 ] =PMBUS_HAVE_VIN |PMBUS_HAVE_VOUT |PMBUS_HAVE_STATUS_VOUT | + .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_POUT , - .func[1 ] =PMBUS_HAVE_VIN |PMBUS_HAVE_VOUT |PMBUS_HAVE_STATUS_VOUT | + .func[1 ] =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_POUT , - .identify = tps53679_identify, };static int tps53679_probe (struct i2c_client *client,const struct i2c_device_id *id) { +struct device *dev = &client->dev;struct pmbus_driver_info *info; +enum chips chip_id; + +if (dev->of_node) + chip_id = (enum chips )of_device_get_match_data (dev); +else + chip_id = id->driver_data; - info =devm_kmemdup (&client->dev, &tps53679_info,sizeof (*info), -GFP_KERNEL ); + info =devm_kmemdup (dev, &tps53679_info,sizeof (*info),GFP_KERNEL );if (!info)return -ENOMEM ; +switch (chip_id) { +case tps53679: +case tps53688: + info->pages =TPS53679_PAGE_NUM ; + info->identify = tps53679_identify; +break ; +default : +return -ENODEV ; + } +return pmbus_do_probe (client, id, info); }static const struct i2c_device_id tps53679_id[] = { - {"tps53679" ,0 }, - {"tps53688" ,0 }, + {"tps53679" , tps53679}, + {"tps53688" , tps53688}, {} };MODULE_DEVICE_TABLE (i2c, tps53679_id);static const struct of_device_id __maybe_unused tps53679_of_match[] = { - {.compatible ="ti,tps53679" }, - {.compatible ="ti,tps53688" }, + {.compatible ="ti,tps53679" , .data = (void *)tps53679}, + {.compatible ="ti,tps53688" , .data = (void *)tps53688}, {} };MODULE_DEVICE_TABLE (of, tps53679_of_match);
Signature · 1 line
2.17.1
Guenter Roeck
maintainerPATCH 5/8 hwmon: (pmbus/tps53679) Add support for IIN and PIN to TPS53679 and TPS53688
In reply to Guenter RoeckAll chips of this series with published datasheets support IIN, PIN, and STATUS_INPUT PMBus commands. Per TI Power Management Forum, "TPS53679 and TPS53681 have the same PMBus command set". There is no reason to believe that this does not apply to TPS53688. Let's assume that this is correct and add support for IIN, PIN, and STATUS_INPUT to TPS53679 and TPS53688 to simplify adding support for more chips of the same series.
At the same time, drop reporting VIN on channel 2. On chips with published datasheets this voltage is identical to the voltage reported on channel 1, and there is no reason to believe that this is different for TPS53679 and TPS53888.
--- drivers/hwmon/pmbus/tps53679.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/hwmon/pmbus/tps53679.c +3 -3
@@ -63,13 +63,13 @@ static struct pmbus_driver_info tps53679_info = { .format[PSC_TEMPERATURE] = linear, .format[PSC_CURRENT_OUT] = linear, .format[PSC_POWER] = linear, - .func[0 ] =PMBUS_HAVE_VIN | + .func[0 ] =PMBUS_HAVE_VIN |PMBUS_HAVE_IIN |PMBUS_HAVE_PIN | +PMBUS_HAVE_STATUS_INPUT |PMBUS_HAVE_VOUT |PMBUS_HAVE_STATUS_VOUT |PMBUS_HAVE_IOUT |PMBUS_HAVE_STATUS_IOUT |PMBUS_HAVE_TEMP |PMBUS_HAVE_STATUS_TEMP | PMBUS_HAVE_POUT, - .func[1 ] =PMBUS_HAVE_VIN | -PMBUS_HAVE_VOUT |PMBUS_HAVE_STATUS_VOUT | + .func[1 ] =PMBUS_HAVE_VOUT |PMBUS_HAVE_STATUS_VOUT |PMBUS_HAVE_IOUT |PMBUS_HAVE_STATUS_IOUT |PMBUS_HAVE_TEMP |PMBUS_HAVE_STATUS_TEMP | PMBUS_HAVE_POUT,
Signature · 1 line
2.17.1
Guenter Roeck
maintainerPATCH 6/8 hwmon: (pmbus/tps53679) Add support for TPS53681
In reply to Guenter RoeckTPS53681 is a dual-channel multiphase step-down controller supporting per-phase and per-channel output telemetry.
--- drivers/hwmon/pmbus/Kconfig | 4 +- drivers/hwmon/pmbus/tps53679.c | 120 ++++++++++++++++++++++++++++++++- 2 files changed, 119 insertions(+), 5 deletions(-)
drivers/hwmon/pmbus/Kconfig +2 -2
@@ -209,10 +209,10 @@ config SENSORS_TPS40422 be called tps40422. config SENSORS_TPS53679 - tristate "TI TPS53679, TPS53688" + tristate "TI TPS53679, TPS53681, TPS53688" help If you say yes here you get hardware monitoring support for TI - TPS53679, TPS53688 + TPS53679, TPS53681, and TPS53688. This driver can also be built as a module. If so, the module will be called tps53679.
drivers/hwmon/pmbus/tps53679.c +117 -3
168 lines not on this page · raw message
Signature · 1 line
2.17.1
Guenter Roeck
maintainerPATCH 7/8 hwmon: (pmbus/tps53679) Add support for TPS53647 and TPS53667
In reply to Guenter RoeckTPS53647 and TPS53667 are single channel, Step-Down Buck Controllers. TPS53647 supports 4 phases, TPS53667 supports 6 phases. The chips do not support per-phase output telemetry.
--- drivers/hwmon/pmbus/Kconfig | 4 ++-- drivers/hwmon/pmbus/tps53679.c | 15 +++++++++++++-- 2 files changed, 15 insertions(+), 4 deletions(-)
drivers/hwmon/pmbus/Kconfig +2 -2
@@ -209,10 +209,10 @@ config SENSORS_TPS40422 be called tps40422. config SENSORS_TPS53679 - tristate "TI TPS53679, TPS53681, TPS53688" + tristate "TI TPS53647, TPS53667, TPS53679, TPS53681, TPS53688" help If you say yes here you get hardware monitoring support for TI - TPS53679, TPS53681, and TPS53688. + TPS53647, TPS53667, TPS53679, TPS53681, and TPS53688. This driver can also be built as a module. If so, the module will be called tps53679.
drivers/hwmon/pmbus/tps53679.c +13 -2
@@ -16,9 +16,11 @@#include "pmbus.h" enum chips { - tps53679, tps53681, tps53688 + tps53647, tps53667, tps53679, tps53681, tps53688 }; +#define TPS53647_PAGE_NUM 1 +#define TPS53679_PROT_VR12_5MV 0x01/* VR12.0 mode, 5-mV DAC */ #define TPS53679_PROT_VR12_5_10MV 0x02/* VR12.5 mode, 10-mV DAC */ #define TPS53679_PROT_VR13_10MV 0x04/* VR13.0 mode, 10-mV DAC */
@@ -38,7 +40,7 @@ static int tps53679_identify_mode(struct i2c_client *client,u8 vout_params;int i, ret; -for (i =0 ; i <TPS53679_PAGE_NUM ; i++) { +for (i =0 ; i < info->pages; i++) {/* Read the register with VOUT scaling value.*/ ret =pmbus_read_byte_data (client, i,PMBUS_VOUT_MODE );if (ret <0 )
@@ -198,6 +200,11 @@ static int tps53679_probe(struct i2c_client *client,return -ENOMEM ;switch (chip_id) { +case tps53647: +case tps53667: + info->pages =TPS53647_PAGE_NUM ; + info->identify = tps53679_identify; +break ;case tps53679:case tps53688: info->pages =TPS53679_PAGE_NUM ;
@@ -217,6 +224,8 @@ static int tps53679_probe(struct i2c_client *client, }static const struct i2c_device_id tps53679_id[] = { + {"tps53647" , tps53647}, + {"tps53667" , tps53667}, {"tps53679" , tps53679}, {"tps53681" , tps53681}, {"tps53688" , tps53688},
@@ -226,6 +235,8 @@ static const struct i2c_device_id tps53679_id[] = {MODULE_DEVICE_TABLE (i2c, tps53679_id);static const struct of_device_id __maybe_unused tps53679_of_match[] = { + {.compatible ="ti,tps53647" , .data = (void *)tps53647}, + {.compatible ="ti,tps53667" , .data = (void *)tps53667}, {.compatible ="ti,tps53679" , .data = (void *)tps53679}, {.compatible ="ti,tps53681" , .data = (void *)tps53681}, {.compatible ="ti,tps53688" , .data = (void *)tps53688},
Signature · 1 line
2.17.1
Guenter Roeck
maintainerPATCH 8/8 hwmon: (pmbus/tps53679) Add documentation
In reply to Guenter RoeckDocument tps53679 driver with all chips supported by it.
--- Documentation/hwmon/index.rst | 1 + Documentation/hwmon/tps53679.rst | 178 +++++++++++++++++++++++++++++++ 2 files changed, 179 insertions(+) create mode 100644 Documentation/hwmon/tps53679.rst
Documentation/hwmon/index.rst +1 -0
@@ -162,6 +162,7 @@ Hardware Monitoring Kernel Drivers tmp421 tmp513 tps40422 + tps53679 twl4030-madc-hwmon ucd9000 ucd9200
Documentation/hwmon/tps53679.rst new file +178 -0
178 lines not on this page · raw message
Signature · 1 line
2.17.1