* Re: HWMON: (nct6775) Correct number of inputs on NCT6796D [not found] <CAMFK4TN9jcvwkdBdX1E4zH2NzS0LbCFqGW+MUzCKXor=4UwoBw@mail.gmail.com> @ 2021-07-05 14:47 ` Guenter Roeck 2021-07-07 1:40 ` PATCH: " Henk 0 siblings, 1 reply; 5+ messages in thread From: Guenter Roeck @ 2021-07-05 14:47 UTC (permalink / raw) To: Henk, linux-hwmon On 7/5/21 5:30 AM, Henk wrote: > Noticed in the documentation that the NCT6796D actually has 16 analog voltage inputs, where only 15 are configured. > > See: https://www.nuvoton.com/resource-files/NCT6796D_Datasheet_V0_6.pdf <https://www.nuvoton.com/resource-files/NCT6796D_Datasheet_V0_6.pdf> page 59-60: > > 8.6.2.1. Voltage Reading > NCT6796D has 16 voltage reading: > ..... > and the missing one in the driver: > VIN9: Voltage reading Bank 4, Index 8F > > This patch adds support for in15 on the NCT6796D. > > Signed-off-by: Henk Vergonet <henk.vergonet@gmail.com <mailto:henk.vergonet@gmail.com>> > Please read and follow Documentation/process/submitting-patches.rst when submitting patches. 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 ^ permalink raw reply [flat|nested] 5+ messages in thread
* PATCH: HWMON: (nct6775) Correct number of inputs on NCT6796D 2021-07-05 14:47 ` HWMON: (nct6775) Correct number of inputs on NCT6796D Guenter Roeck @ 2021-07-07 1:40 ` Henk 2021-07-07 1:51 ` Guenter Roeck 0 siblings, 1 reply; 5+ messages in thread From: Henk @ 2021-07-07 1:40 UTC (permalink / raw) To: Guenter Roeck; +Cc: linux-hwmon [-- Attachment #1: Type: text/plain, Size: 563 bytes --] 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 <linux@roeck-us.net>: > > 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 [-- Attachment #2: nct6775.patch --] [-- Type: application/x-patch, Size: 2995 bytes --] ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: PATCH: HWMON: (nct6775) Correct number of inputs on NCT6796D 2021-07-07 1:40 ` PATCH: " Henk @ 2021-07-07 1:51 ` Guenter Roeck 2021-07-07 2:42 ` [PATCH v3]: hwmon: nct6775: Fix some issues with NCT6796D Henk 0 siblings, 1 reply; 5+ messages in thread From: Guenter Roeck @ 2021-07-07 1:51 UTC (permalink / raw) To: Henk; +Cc: linux-hwmon 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 <linux@roeck-us.net>: >> >> 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 ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v3]: hwmon: nct6775: Fix some issues with NCT6796D 2021-07-07 1:51 ` Guenter Roeck @ 2021-07-07 2:42 ` Henk 2021-07-07 4:14 ` Guenter Roeck 0 siblings, 1 reply; 5+ messages in thread From: Henk @ 2021-07-07 2:42 UTC (permalink / raw) To: Guenter Roeck; +Cc: linux-hwmon [-- Attachment #1: Type: text/plain, Size: 3797 bytes --] 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 <linux@roeck-us.net>: > > 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 <linux@roeck-us.net>: > >> > >> 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 [-- Attachment #2: nct6775.patch --] [-- Type: text/x-patch, Size: 2995 bytes --] diff --git a/drivers/hwmon/nct6775.c b/drivers/hwmon/nct6775.c index e7e1ddc1d631..a80df0bbc197 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 @@ -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; diff --git a/drivers/hwmon/nct6775.c b/drivers/hwmon/nct6775.c index a80df0bbc197..385ef79d79c4 100644 --- a/drivers/hwmon/nct6775.c +++ b/drivers/hwmon/nct6775.c @@ -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 }; ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v3]: hwmon: nct6775: Fix some issues with NCT6796D 2021-07-07 2:42 ` [PATCH v3]: hwmon: nct6775: Fix some issues with NCT6796D Henk @ 2021-07-07 4:14 ` Guenter Roeck 0 siblings, 0 replies; 5+ messages in thread From: Guenter Roeck @ 2021-07-07 4:14 UTC (permalink / raw) To: Henk; +Cc: linux-hwmon On 7/6/21 7:42 PM, Henk wrote: > Is it the attchment format? > Please read and follow Documentation/process/submitting-patches.rst. Guenter > 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 <linux@roeck-us.net>: >> >> 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 <linux@roeck-us.net>: >>>> >>>> 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 ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-07-07 4:14 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <CAMFK4TN9jcvwkdBdX1E4zH2NzS0LbCFqGW+MUzCKXor=4UwoBw@mail.gmail.com>
2021-07-05 14:47 ` HWMON: (nct6775) Correct number of inputs on NCT6796D Guenter Roeck
2021-07-07 1:40 ` PATCH: " Henk
2021-07-07 1:51 ` Guenter Roeck
2021-07-07 2:42 ` [PATCH v3]: hwmon: nct6775: Fix some issues with NCT6796D Henk
2021-07-07 4:14 ` Guenter Roeck
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.