[src/trunk]: src/sys/arch/amd64/conf Update amdzentemp(4) attachment info. A...

[pgoyette <pgoyette%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e312bd73d91c
branches:  trunk
changeset: 359074:e312bd73d91c
user:      pgoyette <pgoyette%NetBSD.org@localhost>
date:      Sat Jan 27 21:46:54 2018 +0000

description:
Update amdzentemp(4) attachment info.  Also for ALL, remove duplicate
entry for amdtemp(4).

diffstat:

 sys/arch/amd64/conf/ALL       |  15 ++++++---------
 sys/arch/amd64/conf/GENERIC   |   6 +++---
 sys/arch/amd64/conf/XEN3_DOM0 |   6 +++---
 3 files changed, 12 insertions(+), 15 deletions(-)

diffs (97 lines):

diff -r f3bce83ae99a -r e312bd73d91c sys/arch/amd64/conf/ALL
--- a/sys/arch/amd64/conf/ALL   Sat Jan 27 21:41:50 2018 +0000
+++ b/sys/arch/amd64/conf/ALL   Sat Jan 27 21:46:54 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.79 2018/01/25 01:21:40 christos Exp $
+# $NetBSD: ALL,v 1.80 2018/01/27 21:46:54 pgoyette Exp $
 # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
 #
 # ALL machine description file
@@ -17,7 +17,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident         "ALL-$Revision: 1.79 $"
+#ident         "ALL-$Revision: 1.80 $"
 
 maxusers       64              # estimated number of users
 
@@ -423,13 +423,6 @@
                                        # on anything else.
 #options       PCIINTR_DEBUG           # super-verbose PCI interrupt fixup
 
-# Temperatures
-amdnb_misc* at pci?                    # AMD NB Misc Configuration
-amdtemp* at amdnb_misc?                # AMD CPU Temperature sensors
-
-amdsmn* at pci?                                # AMD SMN Configuration
-amdzentemp* at amdsmn?                 # AMD Ryzen Family 17h CPU temp sensors
-
 # PCI bridges
 rdcpcib* at pci? dev ? function ?      # RDC Vortex86/PMX-1000 PCI-ISA w/
 pchb*  at pci? dev ? function ?        # PCI-Host bridges
@@ -589,6 +582,10 @@
 
 # Hardware monitors
 
+# Temperatures
+amdsmn* at pci?                                # AMD SMN Configuration
+amdzentemp* at amdsmnbus?              # AMD Ryzen Family 17h CPU temp sensors
+
 amdnb_misc* at pci?                    # AMD NB Misc Configuration
 amdtemp* at amdnb_misc?                # AMD CPU Temperature sensors
 
diff -r f3bce83ae99a -r e312bd73d91c sys/arch/amd64/conf/GENERIC
--- a/sys/arch/amd64/conf/GENERIC       Sat Jan 27 21:41:50 2018 +0000
+++ b/sys/arch/amd64/conf/GENERIC       Sat Jan 27 21:46:54 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.483 2018/01/26 14:41:22 maxv Exp $
+# $NetBSD: GENERIC,v 1.484 2018/01/27 21:46:54 pgoyette Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident         "GENERIC-$Revision: 1.483 $"
+#ident         "GENERIC-$Revision: 1.484 $"
 
 maxusers       64              # estimated number of users
 
@@ -476,7 +476,7 @@
 amdtemp* at amdnb_misc?                # AMD CPU Temperature sensors
 
 amdsmn* at pci?                                # AMD SMN Configuration
-amdzentemp* at amdsmn?                 # AMD Ryzen Family 17h CPU temp sensors
+amdzentemp* at amdsmnbus?              # AMD Ryzen Family 17h CPU temp sensors
 
 # Winbond LPC Super I/O
 #wbsio*        at isa? port 0x2e
diff -r f3bce83ae99a -r e312bd73d91c sys/arch/amd64/conf/XEN3_DOM0
--- a/sys/arch/amd64/conf/XEN3_DOM0     Sat Jan 27 21:41:50 2018 +0000
+++ b/sys/arch/amd64/conf/XEN3_DOM0     Sat Jan 27 21:46:54 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.146 2018/01/25 01:21:40 christos Exp $
+# $NetBSD: XEN3_DOM0,v 1.147 2018/01/27 21:46:54 pgoyette Exp $
 
 include        "arch/amd64/conf/std.xen"
 
@@ -10,7 +10,7 @@
 #options       UVMHIST_PRINT
 #options       SYSCALL_DEBUG
 
-#ident         "XEN3_DOM0-$Revision: 1.146 $"
+#ident         "XEN3_DOM0-$Revision: 1.147 $"
 
 maxusers       32              # estimated number of users
 
@@ -299,7 +299,7 @@
 amdtemp* at amdnb_misc?                # AMD CPU Temperature sensors
 
 amdsmn* at pci?                                # AMD SMN Configuration
-amdzentemp* at amdsmn?                 # AMD Ryzen Family 17h CPU temp sensors
+amdzentemp* at amdsmnbus?              # AMD Ryzen Family 17h CPU temp sensors
 
 # AMD 768 and 8111 power/ACPI controllers
 amdpm* at pci? dev ? function ?        # RNG and SMBus 1.0 interface