Is it the attchment format? diff --git a/drivers/hwmon/nct6775.c b/drivers/hwmon/nct6775.c index e7e1ddc1d631..385ef79d79c4 100644 --- a/drivers/hwmon/nct6775.c +++ b/drivers/hwmon/nct6775.c @@ -28,7 +28,7 @@ * nct6792d 15 6 6 2+6 0xc910 0xc1 0x5ca3 * nct6793d 15 6 6 2+6 0xd120 0xc1 0x5ca3 * nct6795d 14 6 6 2+6 0xd350 0xc1 0x5ca3 - * nct6796d 14 7 7 2+6 0xd420 0xc1 0x5ca3 + * nct6796d 16 7 7 2+6 0xd420 0xc1 0x5ca3 * nct6797d 14 7 7 2+6 0xd450 0xc1 0x5ca3 * (0xd451) * nct6798d 14 7 7 2+6 0xd428 0xc1 0x5ca3 @@ -209,14 +209,14 @@ superio_exit(int ioreg) /* Common and NCT6775 specific data */ -/* Voltage min/max registers for nr=7..14 are in bank 5 */ +/* Voltage min/max registers for nr=7..15 are in bank 5 */ static const u16 NCT6775_REG_IN_MAX[] = { 0x2b, 0x2d, 0x2f, 0x31, 0x33, 0x35, 0x37, 0x554, 0x556, 0x558, 0x55a, - 0x55c, 0x55e, 0x560, 0x562 }; + 0x55c, 0x55e, 0x560, 0x562, 0x564 }; static const u16 NCT6775_REG_IN_MIN[] = { 0x2c, 0x2e, 0x30, 0x32, 0x34, 0x36, 0x38, 0x555, 0x557, 0x559, 0x55b, - 0x55d, 0x55f, 0x561, 0x563 }; + 0x55d, 0x55f, 0x561, 0x563, 0x565 }; static const u16 NCT6775_REG_IN[] = { 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x550, 0x551, 0x552 }; @@ -478,7 +478,7 @@ static const u16 NCT6776_REG_TEMP_CRIT[32] = { static const u16 NCT6779_REG_IN[] = { 0x480, 0x481, 0x482, 0x483, 0x484, 0x485, 0x486, 0x487, - 0x488, 0x489, 0x48a, 0x48b, 0x48c, 0x48d, 0x48e }; + 0x488, 0x489, 0x48a, 0x48b, 0x48c, 0x48d, 0x48e, 0x48f }; static const u16 NCT6779_REG_ALARM[NUM_REG_ALARM] = { 0x459, 0x45A, 0x45B, 0x568 }; @@ -1047,9 +1047,9 @@ div_from_reg(u8 reg) * Some of the voltage inputs have internal scaling, the tables below * contain 8 (the ADC LSB in mV) * scaling factor * 100 */ -static const u16 scale_in[15] = { +static const u16 scale_in[16] = { 800, 800, 1600, 1600, 800, 800, 800, 1600, 1600, 800, 800, 800, 800, - 800, 800 + 800, 800, 800 }; static inline long in_from_reg(u8 reg, u8 nr) @@ -1143,7 +1143,7 @@ struct nct6775_data { /* Register values */ u8 bank; /* current register bank */ u8 in_num; /* number of in inputs we have */ - u8 in[15][3]; /* [0]=in, [1]=in_max, [2]=in_min */ + u8 in[16][3]; /* [0]=in, [1]=in_max, [2]=in_min */ unsigned int rpm[NUM_FAN]; u16 fan_min[NUM_FAN]; u8 fan_pulses[NUM_FAN]; @@ -4200,7 +4200,7 @@ static int nct6775_probe(struct platform_device *pdev) case nct6796: case nct6797: case nct6798: - data->in_num = 15; + data->in_num = (data->kind == nct6796) ? 16 : 15; data->pwm_num = (data->kind == nct6796 || data->kind == nct6797 || data->kind == nct6798) ? 7 : 6; Op wo 7 jul. 2021 om 03:51 schreef Guenter Roeck : > > On 7/6/21 6:40 PM, Henk wrote: > > Thank you Guenter, > > > > This should be fixed now, here is a reading from the sensors output > > without any scaling done: > > > > $ sensors > > nct6796-isa-0290 > > Adapter: ISA adapter > > ... > > in15 VIN9: 840.00 mV > > ... > > > > Changes available on: https://github.com/hvegh/linux.git > > > > Op ma 5 jul. 2021 om 16:47 schreef Guenter Roeck : > >> > >> As for the patch itself, it doesn't define the limit register addresses > >> in NCT6775_REG_IN_MAX[] and NCT6775_REG_IN_MIN[], and it doesn't define > >> the register address itself in NCT6779_REG_IN[]. That means it won't work. > >> > >> Guenter > > This is not an acceptable patch format. > > Guenter