Module Name: src
Committed By: jruoho
Date: Mon Mar 22 11:13:23 UTC 2010
Modified Files:
src/sys/dev/acpi: acpi.c acpidevs
Log Message:
Add IFX0102 and PNP0C15. Fix INT0800.
Observed from the dmesg of nojoly@'s Sony VAIO VGN-BZ12VN.
To generate a diff of this commit:
cvs rdiff -u -r1.161 -r1.162 src/sys/dev/acpi/acpi.c
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/acpi/acpidevs
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/acpi/acpi.c
diff -u src/sys/dev/acpi/acpi.c:1.161 src/sys/dev/acpi/acpi.c:1.162
--- src/sys/dev/acpi/acpi.c:1.161 Tue Mar 16 08:02:01 2010
+++ src/sys/dev/acpi/acpi.c Mon Mar 22 11:13:23 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi.c,v 1.161 2010/03/16 08:02:01 jruoho Exp $ */
+/* $NetBSD: acpi.c,v 1.162 2010/03/22 11:13:23 jruoho Exp $ */
/*-
* Copyright (c) 2003, 2007 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.161 2010/03/16 08:02:01 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.162 2010/03/22 11:13:23 jruoho Exp $");
#include "opt_acpi.h"
#include "opt_pcifixup.h"
@@ -173,7 +173,8 @@
"PNP0C02", /* No "PnP motherboard register resources" driver */
"PNP0C0B", /* No need for "ACPI fan" driver */
"PNP0C0F", /* ACPI PCI link devices are handled internally */
- "INT0800", /* Intel HW RNG is handled internally */
+ "IFX0102", /* No driver for Infineon TPM */
+ "INT0800", /* No driver for Intel Firmware Hub device */
#endif
#if defined(x86_64)
"PNP0C04", /* FPU is handled internally */
Index: src/sys/dev/acpi/acpidevs
diff -u src/sys/dev/acpi/acpidevs:1.14 src/sys/dev/acpi/acpidevs:1.15
--- src/sys/dev/acpi/acpidevs:1.14 Mon Jan 18 16:34:47 2010
+++ src/sys/dev/acpi/acpidevs Mon Mar 22 11:13:23 2010
@@ -1,4 +1,4 @@
-# $NetBSD: acpidevs,v 1.14 2010/01/18 16:34:47 jruoho Exp $
+# $NetBSD: acpidevs,v 1.15 2010/03/22 11:13:23 jruoho Exp $
#
# Extracted from:
# http://download.microsoft.com/download/1/6/1/161ba512-40e2-4cc9-843a-923143f3456c/devids.txt
@@ -136,6 +136,7 @@
PNP0C12 Device Bay Controller
PNP0C13 Plug and Play BIOS (used when ACPI mode cannot be used)
PNP0C14 WMI mapper device
+PNP0C15 ACPI docking station
PNP0C80 Memory Device
#--PCMCIA Controller Chipsets--
PNP0E00 Intel 82365-Compatible PCMCIA Controller
@@ -363,4 +364,5 @@
ACPI000D Power Meter
ACPI000E Wake Alarm Device
# **** Others ****
-INT0800 Intel FWH Random Number Generator
+IFX0102 Infineon Trusted Platform Module
+INT0800 Intel Firmware Hub Device
\ No newline at end of file
