hwmon: (nct6775) Sort ASUS board list
PATCH 1/3 hwmon: (nct6775) Sort ASUS board list
Rearrange board list in alphabetical order by: LC_ALL=C sort -u
--- drivers/hwmon/nct6775-platform.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
drivers/hwmon/nct6775-platform.c +11 -11
@@ -1052,14 +1052,6 @@ static int __init nct6775_find(int sioaddr, struct nct6775_sio_data *sio_data)static struct platform_device *pdev[2 ];static const char *const asus_wmi_boards[] = { -"Pro A520M-C" , -"Pro A520M-C II" , -"PRO H410T" , -"ProArt B550-CREATOR" , -"ProArt X570-CREATOR WIFI" , -"ProArt Z490-CREATOR 10G" , -"Pro B550M-C" , -"Pro WS X570-ACE" ,"PRIME A520M-A" ,"PRIME A520M-A II" ,"PRIME A520M-E" ,
@@ -1078,6 +1070,14 @@ static const char * const asus_wmi_boards[] = {"PRIME H410M-R" ,"PRIME X570-P" ,"PRIME X570-PRO" , +"PRO H410T" , +"Pro A520M-C" , +"Pro A520M-C II" , +"Pro B550M-C" , +"Pro WS X570-ACE" , +"ProArt B550-CREATOR" , +"ProArt X570-CREATOR WIFI" , +"ProArt Z490-CREATOR 10G" ,"ROG CROSSHAIR VIII DARK HERO" ,"ROG CROSSHAIR VIII EXTREME" , "ROG CROSSHAIR VIII FORMULA",
@@ -1109,14 +1109,14 @@ static const char * const asus_wmi_boards[] = {"TUF GAMING A520M-PLUS" ,"TUF GAMING A520M-PLUS II" ,"TUF GAMING A520M-PLUS WIFI" , +"TUF GAMING B550-PLUS" , +"TUF GAMING B550-PLUS WIFI II" , +"TUF GAMING B550-PRO" ,"TUF GAMING B550M-E" ,"TUF GAMING B550M-E WIFI" ,"TUF GAMING B550M-PLUS" ,"TUF GAMING B550M-PLUS (WI-FI)" ,"TUF GAMING B550M-PLUS WIFI II" , -"TUF GAMING B550-PLUS" , -"TUF GAMING B550-PLUS WIFI II" , -"TUF GAMING B550-PRO" ,"TUF GAMING X570-PLUS" ,"TUF GAMING X570-PLUS (WI-FI)" , "TUF GAMING X570-PLUS_BR",
Signature · 1 line
2.39.2
PATCH 2/3 hwmon: (nct6775) Fix ROG B550-XE WIFI and Pro B660M-C D4 names
ROG STRIX B550-XE GAMING WIFI motherboard is incorrectly named as ROG STRIX B550-XE GAMING (WI-FI).
Pro B660M-C D4 motherboard is incorrectly named as Pro B660M-C-D4.
Validated by dmidecode output from https://github.com/linuxhw/DMI/
--- drivers/hwmon/nct6775-platform.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/hwmon/nct6775-platform.c +2 -2
@@ -1090,7 +1090,7 @@ static const char * const asus_wmi_boards[] = {"ROG STRIX B550-F GAMING (WI-FI)" ,"ROG STRIX B550-F GAMING WIFI II" ,"ROG STRIX B550-I GAMING" , -"ROG STRIX B550-XE GAMING (WI-FI)" , +"ROG STRIX B550-XE GAMING WIFI" ,"ROG STRIX X570-E GAMING" ,"ROG STRIX X570-E GAMING WIFI II" , "ROG STRIX X570-F GAMING",
@@ -1147,7 +1147,7 @@ static const char * const asus_msi_boards[] = {"PRIME Z590-V" ,"PRIME Z590M-PLUS" ,"Pro B660M-C" , -"Pro B660M-C-D4" , +"Pro B660M-C D4" ,"Pro WS W680-ACE" ,"Pro WS W680-ACE IPMI" , "ProArt B650-CREATOR",
Signature · 1 line
2.39.2
PATCH 3/3 hwmon: (nct6775) update ASUS WMI monitoring list B360/H410/H610/Z390...
In reply to Denis PaukBoards such as
* EX-B460M-V5,
* EX-H410M-V3,
* PRIME B360M-D,
* PRIME B360M-K,
* PRIME H410M-A,
* PRIME H410M-D,
* PRIME H410M-E,
* PRIME H410M-F,
* PRIME H410M-K,
* PRIME H410M-K R2.0,
* PRIME H510M-K R2.0,
* PRIME Z390-A,
* PRIME Z390-A/H10,
* PRIME Z390-P,
* PRIME Z390M-PLUS,
* PRIME Z490-A,
* PRIME Z490-P,
* PRIME Z490-V,
* PRIME Z490M-PLUS,
* PRO B460M-C,
* PRO H410M-C,
* ROG MAXIMUS XI APEX,
* ROG MAXIMUS XI CODE,
* ROG MAXIMUS XI EXTREME,
* ROG MAXIMUS XI FORMULA,
* ROG MAXIMUS XI GENE,
* ROG MAXIMUS XI HERO,
* ROG MAXIMUS XI HERO (WI-FI),
* ROG MAXIMUS XII APEX,
* ROG MAXIMUS XII EXTREME,
* ROG MAXIMUS XII FORMULA,
* ROG MAXIMUS XII HERO (WI-FI),
* ROG STRIX B460-F GAMING,
* ROG STRIX B460-G GAMING,
* ROG STRIX B460-H GAMING,
* ROG STRIX B460-I GAMING,
* TUF GAMING B460-PLUS,
* TUF GAMING B460-PRO (WI-FI),
* TUF GAMING B460M-PLUS,
* TUF GAMING B460M-PLUS (WI-FI),
* TUF GAMING B460M-PRO,
* TUF GAMING B550-PLUS (WI-FI),
* TUF GAMING B550M ZAKU (WI-FI),
* TUF Z390-PLUS GAMING,
* TUF Z390-PLUS GAMING (WI-FI),
* TUF Z390-PRO GAMING,
* TUF Z390M-PRO GAMING,
* TUF Z390M-PRO GAMING (WI-FI),
* WS Z390 PRO,
* B560M-P,
* EX-B560M-V5,
* EX-H510M-V3,
* EX-H610M-V3 D4,
* PRIME B560-PLUS,
* PRIME B560-PLUS AC-HES,
* PRIME B560M-A,
* PRIME B560M-A AC,
* PRIME B560M-K,
* PRIME B660-PLUS D4,
* PRIME H510M-A,
* PRIME H510M-A WIFI,
* PRIME H510M-D,
* PRIME H510M-E,
* PRIME H510M-F,
* PRIME H510M-K,
* PRIME H610I-PLUS D4,
* PRIME H610M-A D4,
* PRIME H610M-A WIFI D4,
* PRIME H610M-D D4,
* PRIME H610M-E D4,
* PRIME H610M-F D4,
* PRIME H610M-K D4,
* PRIME Z690-A,
* PRIME Z690-P,
* PRIME Z690-P D4,
* PRIME Z690-P WIFI,
* PRIME Z690-P WIFI D4,
* PRIME Z690M-PLUS D4,
* PRIME Z790-A WIFI,
* PRIME Z790-P,
* PRIME Z790-P D4,
* PRIME Z790-P WIFI,
* PRIME Z790-P WIFI D4,
* PRIME Z790M-PLUS,
* PRIME Z790M-PLUS D4,
* Pro B560M-C,
* Pro B560M-CT,
* Pro H510M-C,
* Pro H510M-CT,
* Pro H610M-C,
* Pro H610M-C D4,
* Pro H610M-CT D4,
* Pro H610T D4,
* ProArt Z690-CREATOR WIFI,
* ROG MAXIMUS Z690 HERO EVA,
* ROG MAXIMUS Z790 APEX,
* ROG MAXIMUS Z790 HERO,
* ROG STRIX B560-A GAMING WIFI,
* ROG STRIX B560-E GAMING WIFI,
* ROG STRIX B560-F GAMING WIFI,
* ROG STRIX B560-G GAMING WIFI,
* ROG STRIX B560-I GAMING WIFI,
* ROG STRIX Z690-A GAMING WIFI,
* ROG STRIX Z690-I GAMING WIFI,
* ROG STRIX Z790-A GAMING WIFI,
* ROG STRIX Z790-A GAMING WIFI D4,
* ROG STRIX Z790-E GAMING WIFI,
* ROG STRIX Z790-F GAMING WIFI,
* ROG STRIX Z790-H GAMING WIFI,
* ROG STRIX Z790-I GAMING WIFI,
* TUF GAMING B560-PLUS WIFI,
* TUF GAMING B560M-E,
* TUF GAMING B560M-PLUS,
* TUF GAMING B560M-PLUS WIFI,
* TUF GAMING Z690-PLUS,
* TUF GAMING Z690-PLUS D4,
* TUF GAMING Z690-PLUS WIFI,
* TUF GAMING Z690-PLUS WIFI D4,
* TUF GAMING Z790-PLUS D4,
* TUF GAMING Z790-PLUS WIFI,
* TUF GAMING Z790-PLUS WIFI D4,
have got a nct6775 chip, but by default there's no use of it because of resource conflict with WMI method.
This commit adds such boards to the WMI monitoring list.
--- drivers/hwmon/nct6775-platform.c | 121 +++++++++++++++++++++++++++++++ 1 file changed, 121 insertions(+)
drivers/hwmon/nct6775-platform.c +121 -0
@@ -1052,6 +1052,8 @@ static int __init nct6775_find(int sioaddr, struct nct6775_sio_data *sio_data)static struct platform_device *pdev[2 ];static const char *const asus_wmi_boards[] = { +"EX-B460M-V5" , +"EX-H410M-V3" ,"PRIME A520M-A" ,"PRIME A520M-A II" ,"PRIME A520M-E" ,
@@ -1059,6 +1061,8 @@ static const char * const asus_wmi_boards[] = {"PRIME B360-PLUS" ,"PRIME B360M-A" ,"PRIME B360M-C" , +"PRIME B360M-D" , +"PRIME B360M-K" ,"PRIME B460-PLUS" ,"PRIME B460M-A R2.0" , "PRIME B550-PLUS",
@@ -1067,9 +1071,26 @@ static const char * const asus_wmi_boards[] = {"PRIME B550M-A AC" ,"PRIME B550M-A WIFI II" ,"PRIME B550M-K" , +"PRIME H410M-A" , +"PRIME H410M-D" , +"PRIME H410M-E" , +"PRIME H410M-F" , +"PRIME H410M-K" , +"PRIME H410M-K R2.0" ,"PRIME H410M-R" , +"PRIME H510M-K R2.0" ,"PRIME X570-P" ,"PRIME X570-PRO" , +"PRIME Z390-A" , +"PRIME Z390-A/H10" , +"PRIME Z390-P" , +"PRIME Z390M-PLUS" , +"PRIME Z490-A" , +"PRIME Z490-P" , +"PRIME Z490-V" , +"PRIME Z490M-PLUS" , +"PRO B460M-C" , +"PRO H410M-C" ,"PRO H410T" ,"Pro A520M-C" , "Pro A520M-C II",
@@ -1084,6 +1105,21 @@ static const char * const asus_wmi_boards[] = {"ROG CROSSHAIR VIII HERO" ,"ROG CROSSHAIR VIII HERO (WI-FI)" ,"ROG CROSSHAIR VIII IMPACT" , +"ROG MAXIMUS XI APEX" , +"ROG MAXIMUS XI CODE" , +"ROG MAXIMUS XI EXTREME" , +"ROG MAXIMUS XI FORMULA" , +"ROG MAXIMUS XI GENE" , +"ROG MAXIMUS XI HERO" , +"ROG MAXIMUS XI HERO (WI-FI)" , +"ROG MAXIMUS XII APEX" , +"ROG MAXIMUS XII EXTREME" , +"ROG MAXIMUS XII FORMULA" , +"ROG MAXIMUS XII HERO (WI-FI)" , +"ROG STRIX B460-F GAMING" , +"ROG STRIX B460-G GAMING" , +"ROG STRIX B460-H GAMING" , +"ROG STRIX B460-I GAMING" ,"ROG STRIX B550-A GAMING" ,"ROG STRIX B550-E GAMING" , "ROG STRIX B550-F GAMING",
@@ -1109,9 +1145,16 @@ static const char * const asus_wmi_boards[] = {"TUF GAMING A520M-PLUS" ,"TUF GAMING A520M-PLUS II" ,"TUF GAMING A520M-PLUS WIFI" , +"TUF GAMING B460-PLUS" , +"TUF GAMING B460-PRO (WI-FI)" , +"TUF GAMING B460M-PLUS" , +"TUF GAMING B460M-PLUS (WI-FI)" , +"TUF GAMING B460M-PRO" ,"TUF GAMING B550-PLUS" , +"TUF GAMING B550-PLUS (WI-FI)" ,"TUF GAMING B550-PLUS WIFI II" ,"TUF GAMING B550-PRO" , +"TUF GAMING B550M ZAKU (WI-FI)" ,"TUF GAMING B550M-E" ,"TUF GAMING B550M-E WIFI" , "TUF GAMING B550M-PLUS",
@@ -1123,12 +1166,27 @@ static const char * const asus_wmi_boards[] = {"TUF GAMING X570-PRO (WI-FI)" ,"TUF GAMING Z490-PLUS" ,"TUF GAMING Z490-PLUS (WI-FI)" , +"TUF Z390-PLUS GAMING" , +"TUF Z390-PLUS GAMING (WI-FI)" , +"TUF Z390-PRO GAMING" , +"TUF Z390M-PRO GAMING" , +"TUF Z390M-PRO GAMING (WI-FI)" , +"WS Z390 PRO" , "Z490-GUNDAM (WI-FI)", };static const char *const asus_msi_boards[] = { +"B560M-P" , +"EX-B560M-V5" ,"EX-B660M-V5 D4" ,"EX-B660M-V5 PRO D4" , +"EX-H510M-V3" , +"EX-H610M-V3 D4" , +"PRIME B560-PLUS" , +"PRIME B560-PLUS AC-HES" , +"PRIME B560M-A" , +"PRIME B560M-A AC" , +"PRIME B560M-K" ,"PRIME B650-PLUS" ,"PRIME B650M-A" , "PRIME B650M-A AX",
@@ -1136,8 +1194,22 @@ static const char * const asus_msi_boards[] = {"PRIME B650M-A II" ,"PRIME B650M-A WIFI" ,"PRIME B650M-A WIFI II" , +"PRIME B660-PLUS D4" ,"PRIME B660M-A D4" ,"PRIME B660M-A WIFI D4" , +"PRIME H510M-A" , +"PRIME H510M-A WIFI" , +"PRIME H510M-D" , +"PRIME H510M-E" , +"PRIME H510M-F" , +"PRIME H510M-K" , +"PRIME H610I-PLUS D4" , +"PRIME H610M-A D4" , +"PRIME H610M-A WIFI D4" , +"PRIME H610M-D D4" , +"PRIME H610M-E D4" , +"PRIME H610M-F D4" , +"PRIME H610M-K D4" ,"PRIME X670-P" ,"PRIME X670-P WIFI" , "PRIME X670E-PRO WIFI",
@@ -1146,13 +1218,35 @@ static const char * const asus_msi_boards[] = {"PRIME Z590-P WIFI" ,"PRIME Z590-V" ,"PRIME Z590M-PLUS" , +"PRIME Z690-A" , +"PRIME Z690-P" , +"PRIME Z690-P D4" , +"PRIME Z690-P WIFI" , +"PRIME Z690-P WIFI D4" , +"PRIME Z690M-PLUS D4" , +"PRIME Z790-A WIFI" , +"PRIME Z790-P" , +"PRIME Z790-P D4" , +"PRIME Z790-P WIFI" , +"PRIME Z790-P WIFI D4" , +"PRIME Z790M-PLUS" , +"PRIME Z790M-PLUS D4" , +"Pro B560M-C" , +"Pro B560M-CT" ,"Pro B660M-C" ,"Pro B660M-C D4" , +"Pro H510M-C" , +"Pro H510M-CT" , +"Pro H610M-C" , +"Pro H610M-C D4" , +"Pro H610M-CT D4" , +"Pro H610T D4" ,"Pro WS W680-ACE" ,"Pro WS W680-ACE IPMI" ,"ProArt B650-CREATOR" ,"ProArt B660-CREATOR D4" ,"ProArt X670E-CREATOR WIFI" , +"ProArt Z690-CREATOR WIFI" ,"ProArt Z790-CREATOR WIFI" ,"ROG CROSSHAIR X670E EXTREME" , "ROG CROSSHAIR X670E GENE",
@@ -1164,7 +1258,15 @@ static const char * const asus_msi_boards[] = {"ROG MAXIMUS Z690 APEX" ,"ROG MAXIMUS Z690 EXTREME" ,"ROG MAXIMUS Z690 EXTREME GLACIAL" , +"ROG MAXIMUS Z690 HERO EVA" , +"ROG MAXIMUS Z790 APEX" ,"ROG MAXIMUS Z790 EXTREME" , +"ROG MAXIMUS Z790 HERO" , +"ROG STRIX B560-A GAMING WIFI" , +"ROG STRIX B560-E GAMING WIFI" , +"ROG STRIX B560-F GAMING WIFI" , +"ROG STRIX B560-G GAMING WIFI" , +"ROG STRIX B560-I GAMING WIFI" ,"ROG STRIX B650-A GAMING WIFI" ,"ROG STRIX B650E-E GAMING WIFI" , "ROG STRIX B650E-F GAMING WIFI",
@@ -1183,7 +1285,19 @@ static const char * const asus_msi_boards[] = {"ROG STRIX Z590-E GAMING WIFI" ,"ROG STRIX Z590-F GAMING WIFI" ,"ROG STRIX Z590-I GAMING WIFI" , +"ROG STRIX Z690-A GAMING WIFI" ,"ROG STRIX Z690-A GAMING WIFI D4" , +"ROG STRIX Z690-I GAMING WIFI" , +"ROG STRIX Z790-A GAMING WIFI" , +"ROG STRIX Z790-A GAMING WIFI D4" , +"ROG STRIX Z790-E GAMING WIFI" , +"ROG STRIX Z790-F GAMING WIFI" , +"ROG STRIX Z790-H GAMING WIFI" , +"ROG STRIX Z790-I GAMING WIFI" , +"TUF GAMING B560-PLUS WIFI" , +"TUF GAMING B560M-E" , +"TUF GAMING B560M-PLUS" , +"TUF GAMING B560M-PLUS WIFI" ,"TUF GAMING B650-PLUS" ,"TUF GAMING B650-PLUS WIFI" , "TUF GAMING B650M-PLUS",
@@ -1195,6 +1309,13 @@ static const char * const asus_msi_boards[] = {"TUF GAMING X670E-PLUS WIFI" ,"TUF GAMING Z590-PLUS" ,"TUF GAMING Z590-PLUS WIFI" , +"TUF GAMING Z690-PLUS" , +"TUF GAMING Z690-PLUS D4" , +"TUF GAMING Z690-PLUS WIFI" , +"TUF GAMING Z690-PLUS WIFI D4" , +"TUF GAMING Z790-PLUS D4" , +"TUF GAMING Z790-PLUS WIFI" , +"TUF GAMING Z790-PLUS WIFI D4" , "Z590 WIFI GUNDAM EDITION", };
Signature · 1 line
2.39.2