summaryrefslogtreecommitdiff
path: root/src/southbridge/intel/lynxpoint/acpi
diff options
context:
space:
mode:
authorNico Huber <nico.huber@secunet.com>2019-12-13 17:08:49 +0100
committerNico Huber <nico.h@gmx.de>2019-12-14 15:38:16 +0000
commit7176a54c2b4c1a95219c5ab9e7b7b12a8ab6b0e2 (patch)
tree3c66693664456c59e3bdb75a70790fe8b114355d /src/southbridge/intel/lynxpoint/acpi
parent9efc7fc540d3b235274448d986747eab226b999d (diff)
downloadcoreboot-7176a54c2b4c1a95219c5ab9e7b7b12a8ab6b0e2.tar.xz
Revert "{northbridge,soc,southbridge}: Don't use both of _ADR and _HID"
This reverts commit 01787608670adec26fcea48173e18395e51c790e. AMD: Dropping the _HID of PCI root bus doesn't work well and people started to notice the breakage. Intel: These platforms have a devicetree switch to choose between PCI and ACPI modes. In the former case we need _ADR, but in the latter _HID as the PCI devices are hidden. The conflicting use of _ADR and _HID still needs to be fixed before we can bump our IASL version. Change-Id: If7b52b9e8f2f53574849aa3fddfccfa016288179 Signed-off-by: Nico Huber <nico.huber@secunet.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/37710 Reviewed-by: HAOUAS Elyes <ehaouas@noos.fr> Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-by: Angel Pons <th3fanbus@gmail.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/southbridge/intel/lynxpoint/acpi')
-rw-r--r--src/southbridge/intel/lynxpoint/acpi/serialio.asl9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/southbridge/intel/lynxpoint/acpi/serialio.asl b/src/southbridge/intel/lynxpoint/acpi/serialio.asl
index 0eebe32dd6..9323b91cac 100644
--- a/src/southbridge/intel/lynxpoint/acpi/serialio.asl
+++ b/src/southbridge/intel/lynxpoint/acpi/serialio.asl
@@ -123,7 +123,7 @@ Device (SIOR)
Device (SDMA)
{
// Serial IO DMA Controller
- /* Name (_HID, "INTL9C60") */
+ Name (_HID, "INTL9C60")
Name (_UID, 1)
Name (_ADR, 0x00150000)
@@ -163,6 +163,7 @@ Device (I2C0)
Name (_HID, "INT33C2")
Name (_CID, "INT33C2")
Name (_UID, 1)
+ Name (_ADR, 0x00150001)
Name (SSCN, Package () { 432, 507, 30 })
Name (FMCN, Package () { 72, 160, 30 })
@@ -244,6 +245,7 @@ Device (I2C1)
Name (_HID, "INT33C3")
Name (_CID, "INT33C3")
Name (_UID, 1)
+ Name (_ADR, 0x00150002)
Name (SSCN, Package () { 432, 507, 30 })
Name (FMCN, Package () { 72, 160, 30 })
@@ -325,6 +327,7 @@ Device (SPI0)
Name (_HID, "INT33C0")
Name (_CID, "INT33C0")
Name (_UID, 1)
+ Name (_ADR, 0x00150003)
// BAR0 is assigned during PCI enumeration and saved into NVS
Name (RBUF, ResourceTemplate ()
@@ -362,6 +365,7 @@ Device (SPI1)
Name (_HID, "INT33C1")
Name (_CID, "INT33C1")
Name (_UID, 1)
+ Name (_ADR, 0x00150004)
// BAR0 is assigned during PCI enumeration and saved into NVS
Name (RBUF, ResourceTemplate ()
@@ -412,6 +416,7 @@ Device (UAR0)
Name (_HID, "INT33C4")
Name (_CID, "INT33C4")
Name (_UID, 1)
+ Name (_ADR, 0x00150005)
// BAR0 is assigned during PCI enumeration and saved into NVS
Name (RBUF, ResourceTemplate ()
@@ -462,6 +467,7 @@ Device (UAR1)
Name (_HID, "INT33C5")
Name (_CID, "INT33C5")
Name (_UID, 1)
+ Name (_ADR, 0x00150006)
// BAR0 is assigned during PCI enumeration and saved into NVS
Name (RBUF, ResourceTemplate ()
@@ -499,6 +505,7 @@ Device (SDIO)
Name (_HID, "INT33C6")
Name (_CID, "PNP0D40")
Name (_UID, 1)
+ Name (_ADR, 0x00170000)
// BAR0 is assigned during PCI enumeration and saved into NVS
Name (RBUF, ResourceTemplate ()