Module Name: src
Committed By: nonaka
Date: Fri Mar 2 19:26:42 UTC 2012
Modified Files:
src/sys/arch/x86/pci: amdtemp.c
Log Message:
Added Family 12h support.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/x86/pci/amdtemp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/pci/amdtemp.c
diff -u src/sys/arch/x86/pci/amdtemp.c:1.12 src/sys/arch/x86/pci/amdtemp.c:1.13
--- src/sys/arch/x86/pci/amdtemp.c:1.12 Sun Jul 31 22:04:07 2011
+++ src/sys/arch/x86/pci/amdtemp.c Fri Mar 2 19:26:41 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: amdtemp.c,v 1.12 2011/07/31 22:04:07 jmcneill Exp $ */
+/* $NetBSD: amdtemp.c,v 1.13 2012/03/02 19:26:41 nonaka Exp $ */
/* $OpenBSD: kate.c,v 1.2 2008/03/27 04:52:03 cnst Exp $ */
/*
@@ -48,7 +48,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdtemp.c,v 1.12 2011/07/31 22:04:07 jmcneill Exp $ ");
+__KERNEL_RCSID(0, "$NetBSD: amdtemp.c,v 1.13 2012/03/02 19:26:41 nonaka Exp $ ");
#include <sys/param.h>
#include <sys/bus.h>
@@ -196,7 +196,7 @@ amdtemp_match(device_t parent, cfdata_t
case PCI_PRODUCT_AMD_AMD64_MISC:
case PCI_PRODUCT_AMD_AMD64_F10_MISC:
case PCI_PRODUCT_AMD_AMD64_F11_MISC:
- case PCI_PRODUCT_AMD_F14_NB:
+ case PCI_PRODUCT_AMD_F14_NB: /* Family12h too */
break;
default:
return 0;
@@ -268,7 +268,8 @@ amdtemp_attach(device_t parent, device_t
case 0x10: /* AMD Barcelona/Phenom */
case 0x11: /* AMD Griffin */
- case 0x14: /* AMD Fusion */
+ case 0x12: /* AMD Lynx/Sabine (Llano) */
+ case 0x14: /* AMD Brazos (Ontario/Zacate/Desna) */
amdtemp_family10_init(sc);
break;
@@ -296,6 +297,7 @@ amdtemp_attach(device_t parent, device_t
break;
case 0x10:
case 0x11:
+ case 0x12:
case 0x14:
amdtemp_family10_setup_sensors(sc, device_unit(self));
break;
@@ -322,6 +324,7 @@ amdtemp_attach(device_t parent, device_t
break;
case 0x10:
case 0x11:
+ case 0x12:
case 0x14:
sc->sc_sme->sme_refresh = amdtemp_family10_refresh;
break;
