From a840167ce019b8e897ee91bba630dbdba9150d0b Mon Sep 17 00:00:00 2001 From: Samuel Holland Date: Tue, 6 Jun 2017 20:23:40 -0500 Subject: [PATCH] UPSTREAM: superio/acpi: allow custom HID on generic device Some Super I/O PnP devices are detected by string matching the hardware ID. Allow providing a custom HID to override the default generic one. BUG=none BRANCH=none TEST=none Change-Id: Ide39011430f1fade78505492cbffabc08e3e7618 Signed-off-by: Patrick Georgi Original-Commit-Id: d2a86da6e647b5f69b75a9bc4914c074a27c451c Original-Change-Id: I7793b7d53c9d94667675f9dee63358521ac8c4be Original-Signed-off-by: Samuel Holland Original-Reviewed-on: https://review.coreboot.org/20076 Original-Tested-by: build bot (Jenkins) Original-Reviewed-by: Martin Roth Original-Reviewed-by: Paul Menzel Original-Reviewed-by: Felix Held Reviewed-on: https://chromium-review.googlesource.com/531715 Commit-Ready: Patrick Georgi Tested-by: Patrick Georgi Reviewed-by: Patrick Georgi --- src/superio/acpi/pnp_generic.asl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/superio/acpi/pnp_generic.asl b/src/superio/acpi/pnp_generic.asl index f46fbdaabf..c878827cbd 100644 --- a/src/superio/acpi/pnp_generic.asl +++ b/src/superio/acpi/pnp_generic.asl @@ -21,6 +21,7 @@ * Controlled by the following preprocessor defines: * * SUPERIO_CHIP_NAME The name of the super i/o chip (unique, required) + * SUPERIO_PNP_HID The EisaId string that identifies this device (optional) * SUPERIO_PNP_LDN The logical device number on the super i/o * chip for this device (required) * SUPERIO_PNP_DDN A string literal that identifies the dos device @@ -56,7 +57,11 @@ #endif Device (SUPERIO_ID(PN, SUPERIO_PNP_LDN)) { + #ifdef SUPERIO_PNP_HID + Name (_HID, EisaId (SUPERIO_PNP_HID)) + #else Name (_HID, EisaId ("PNP0c02")) /* TODO: Better fitting EisaId? */ + #endif Name (_UID, SUPERIO_UID(PN, SUPERIO_PNP_LDN)) #ifdef SUPERIO_PNP_DDN Name (_DDN, SUPERIO_PNP_DDN)