hwmon: (nct6755) Add support for NCT6799D
Guenter Roeck
maintainerPATCH 1/1 hwmon: (nct6755) Add support for NCT6799D
NCT6799D is mostly compatible to NCT6798D, with minor variations.
Note that NCT6798D and NCT6799D have a new means to select temperature sources, and to report temperatures from those sources. This is not currently implemented, meaning that most likely not all temperatures are reported.
Initial support. Compile tested only.
Cc Sebastian Arnhold <[email protected]>
Cc Ahmad Khalifa <[email protected]>
Signed-off-by Guenter Roeck <[email protected]>
--- drivers/hwmon/nct6775-core.c | 55 ++++++++++++++++++++++++++++++-- drivers/hwmon/nct6775-i2c.c | 2 ++ drivers/hwmon/nct6775-platform.c | 41 ++++++++++++++++++++++-- drivers/hwmon/nct6775.h | 2 +- 4 files changed, 94 insertions(+), 6 deletions(-)
drivers/hwmon/nct6775-core.c +53 -2
@@ -33,6 +33,7 @@* (0xd451) * nct6798d 14 7 7 2+6 0xd428 0xc1 0x5ca3 * (0xd429) +* nct6799d 14 7 7 2+6 0xd802 0xc1 0x5ca3 * * #temp lists the number of monitored temperature sources (first value) plus * the number of directly connectable temperature sensors (second value).
@@ -73,6 +74,7 @@ static const char * const nct6775_device_names[] = {"nct6796" ,"nct6797" ,"nct6798" , + "nct6799", };/* Common and NCT6775 specific data */
@@ -381,7 +383,7 @@ static const u16 NCT6779_REG_TEMP_OVER[ARRAY_SIZE(NCT6779_REG_TEMP)] = { 0x39, 0x155 };static const u16 NCT6779_REG_TEMP_OFFSET [] = { -0x454 ,0x455 ,0x456 ,0x44a ,0x44b ,0x44c }; +0x454 ,0x455 ,0x456 ,0x44a ,0x44b ,0x44c ,0x44d ,0x449 };static const char *const nct6779_temp_label[] = {"" ,
@@ -654,6 +656,44 @@ static const char *const nct6798_temp_label[] = {#define NCT6798_TEMP_MASK 0xbfff0ffe#define NCT6798_VIRT_TEMP_MASK 0x80000c00 +static const char *const nct6799_temp_label[] = { +"" , +"SYSTIN" , +"CPUTIN" , +"AUXTIN0" , +"AUXTIN1" , +"AUXTIN2" , +"AUXTIN3" , +"AUXTIN4" , +"SMBUSMASTER 0" , +"SMBUSMASTER 1" , +"Virtual_TEMP" , +"Virtual_TEMP" , +"" , +"AUXTIN5" , +"" , +"" , +"PECI Agent 0" , +"PECI Agent 1" , +"PCH_CHIP_CPU_MAX_TEMP" , +"PCH_CHIP_TEMP" , +"PCH_CPU_TEMP" , +"PCH_MCH_TEMP" , +"Agent0 Dimm0" , +"Agent0 Dimm1" , +"Agent1 Dimm0" , +"Agent1 Dimm1" , +"BYTE_TEMP0" , +"BYTE_TEMP1" , +"PECI Agent 0 Calibration" ,/* undocumented */ +"PECI Agent 1 Calibration" ,/* undocumented */ +"" , +"Virtual_TEMP" +}; + +#define NCT6799_TEMP_MASK 0xbfff2ffe +#define NCT6799_VIRT_TEMP_MASK 0x80000c00 +/* NCT6102D/NCT6106D specific data */ #define NCT6106_REG_VBAT 0x318
@@ -1109,6 +1149,7 @@ bool nct6775_reg_is_word_sized(struct nct6775_data *data, u16 reg)case nct6796:case nct6797:case nct6798: +case nct6799:return reg ==0x150 || reg ==0x153 || reg ==0x155 || (reg &0xfff0 ) ==0x4c0 || reg == 0x402 ||
@@ -1462,6 +1503,7 @@ static int nct6775_update_pwm_limits(struct device *dev)case nct6796:case nct6797:case nct6798: +case nct6799: err =nct6775_read_value (data, data->REG_CRITICAL_PWM_ENABLE[i], ®);if (err)return err;
@@ -3109,6 +3151,7 @@ store_auto_pwm(struct device *dev, struct device_attribute *attr,case nct6796:case nct6797:case nct6798: +case nct6799: err =nct6775_write_value (data, data->REG_CRITICAL_PWM[nr], val);if (err)break ;
@@ -3807,10 +3850,12 @@ int nct6775_probe(struct device *dev, struct nct6775_data *data,case nct6796:case nct6797:case nct6798: +case nct6799: data->in_num =15 ; data->pwm_num = (data->kind == nct6796 || data->kind == nct6797 || - data->kind == nct6798) ?7 :6 ; + data->kind == nct6798 || + data->kind == nct6799) ?7 :6 ; data->auto_pwm_num =4 ; data->has_fan_div = false; data->temp_fixed_num =6 ;
@@ -3859,6 +3904,11 @@ int nct6775_probe(struct device *dev, struct nct6775_data *data, data->temp_mask =NCT6798_TEMP_MASK ; data->virt_temp_mask =NCT6798_VIRT_TEMP_MASK ;break ; +case nct6799: + data->temp_label = nct6799_temp_label; + data->temp_mask =NCT6799_TEMP_MASK ; + data->virt_temp_mask =NCT6799_VIRT_TEMP_MASK ; +break ; } data->REG_CONFIG =NCT6775_REG_CONFIG ;
@@ -3918,6 +3968,7 @@ int nct6775_probe(struct device *dev, struct nct6775_data *data,case nct6796:case nct6797:case nct6798: +case nct6799: data->REG_TSI_TEMP =NCT6796_REG_TSI_TEMP ; num_reg_tsi_temp =ARRAY_SIZE (NCT6796_REG_TSI_TEMP );break ;
drivers/hwmon/nct6775-i2c.c +2 -0
@@ -87,6 +87,7 @@ static const struct of_device_id __maybe_unused nct6775_i2c_of_match[] = { { .compatible = "nuvoton,nct6796", .data = (void *)nct6796, }, { .compatible = "nuvoton,nct6797", .data = (void *)nct6797, }, { .compatible = "nuvoton,nct6798", .data = (void *)nct6798, }, + { .compatible = "nuvoton,nct6799", .data = (void *)nct6799, }, { }, }; MODULE_DEVICE_TABLE(of, nct6775_i2c_of_match);
@@ -104,6 +105,7 @@ static const struct i2c_device_id nct6775_i2c_id[] = { { "nct6796", nct6796 }, { "nct6797", nct6797 }, { "nct6798", nct6798 }, + { "nct6799", nct6799 }, { } };MODULE_DEVICE_TABLE (i2c, nct6775_i2c_id);
drivers/hwmon/nct6775-platform.c +38 -3
107 lines not on this page · raw message
drivers/hwmon/nct6775.h +1 -1
@@ -5,7 +5,7 @@#include <linux/types.h> enum kinds { nct6106, nct6116, nct6775, nct6776, nct6779, nct6791, nct6792, - nct6793, nct6795, nct6796, nct6797, nct6798 }; + nct6793, nct6795, nct6796, nct6797, nct6798, nct6799 };enum pwm_enable { off, manual, thermal_cruise, speed_cruise, sf3, sf4 };#define NUM_TEMP 10/* Max number of temp attribute sets w/ limits*/
Signature · 1 line
2.36.2
PATCH 1/1 hwmon: (nct6755) Add support for NCT6799D
Cc Jannik Glückert <[email protected]>
Cc Nick Owens <[email protected]>
Cc Slawomir Stepien <[email protected]>
Tested-by Sebastian Arnhold <[email protected]>