On Sat, Jul 15, 2023 at 08:52:44PM +0100, Ahmad Khalifa wrote:
> nct6799d-r and nct6796d-s are very similar and chip_id is only
> different in the version nibblet.
>
> Since both will be detected by the driver anyway due to the
> chipid mask, they should be labeled together for dmesg msg.
>
> Signed-off-by: Ahmad Khalifa <ahmad@xxxxxxxxxx>
Applied. Please add change logs to future versions of your patches.
Thanks,
Guenter
> ---
> Documentation/hwmon/nct6775.rst | 11 ++++++++++-
> drivers/hwmon/nct6775-core.c | 3 ++-
> drivers/hwmon/nct6775-platform.c | 2 +-
> 3 files changed, 13 insertions(+), 3 deletions(-)
>
>
> base-commit: 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5
> prerequisite-patch-id: 36e3467bd9ea72cb3ad2bef638a8389a9537d111
>
> diff --git a/Documentation/hwmon/nct6775.rst b/Documentation/hwmon/nct6775.rst
> index 5ba8276aad4b..9d7a10de61a7 100644
> --- a/Documentation/hwmon/nct6775.rst
> +++ b/Documentation/hwmon/nct6775.rst
> @@ -80,7 +80,13 @@ Supported chips:
>
> Datasheet: Available from Nuvoton upon request
>
> + * Nuvoton NCT6796D-S/NCT6799D-R
>
> + Prefix: 'nct6799'
> +
> + Addresses scanned: ISA address retrieved from Super I/O registers
> +
> + Datasheet: Available from Nuvoton upon request
>
> Authors:
>
> @@ -277,4 +283,7 @@ will not reflect a usable value. It often reports unreasonably high
> temperatures, and in some cases the reported temperature declines if the actual
> temperature increases (similar to the raw PECI temperature value - see PECI
> specification for details). CPUTIN should therefore be ignored on ASUS
> -boards. The CPU temperature on ASUS boards is reported from PECI 0.
> +boards. The CPU temperature on ASUS boards is reported from PECI 0 or TSI 0.
> +
> +NCT6796D-S and NCT6799D-R chips are very similar and their chip_id indicates
> +they are different versions. This driver treats them the same way.
> diff --git a/drivers/hwmon/nct6775-core.c b/drivers/hwmon/nct6775-core.c
> index 236dc97f4d22..029344b933ed 100644
> --- a/drivers/hwmon/nct6775-core.c
> +++ b/drivers/hwmon/nct6775-core.c
> @@ -33,7 +33,8 @@
> * (0xd451)
> * nct6798d 14 7 7 2+6 0xd428 0xc1 0x5ca3
> * (0xd429)
> - * nct6799d 14 7 7 2+6 0xd802 0xc1 0x5ca3
> + * nct6796d-s 18 7 7 6+2 0xd801 0xc1 0x5ca3
> + * nct6799d-r 18 7 7 6+2 0xd802 0xc1 0x5ca3
> *
> * #temp lists the number of monitored temperature sources (first value) plus
> * the number of directly connectable temperature sensors (second value).
> diff --git a/drivers/hwmon/nct6775-platform.c b/drivers/hwmon/nct6775-platform.c
> index a409d7a0b813..81bf03dad6bb 100644
> --- a/drivers/hwmon/nct6775-platform.c
> +++ b/drivers/hwmon/nct6775-platform.c
> @@ -35,7 +35,7 @@ static const char * const nct6775_sio_names[] __initconst = {
> "NCT6796D",
> "NCT6797D",
> "NCT6798D",
> - "NCT6799D",
> + "NCT6796D-S/NCT6799D-R",
> };
>
> static unsigned short force_id;
