Jonas Moehle has uploaded this change for review.
src/*.asl: Remove _HID / _ADR objects
A device object must contain either a _HID object or an _ADR object, but should not contain both. _HID objects are enumerated and have their drivers loaded by ACPI, whereas _ADR objects typically perform most functions without involving ACPI.
Untested.
Signed-off-by: Jonas Moehle <ad-min@mailbox.org>
Change-Id: I949393558f5af66689c167b2e593a1461f641962
---
M src/mainboard/aopen/dxplplusu/acpi/p64h2.asl
M src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/audio.asl
M src/mainboard/intel/strago/acpi/mainboard.asl
M src/soc/intel/broadwell/acpi/serialio.asl
M src/southbridge/intel/lynxpoint/acpi/serialio.asl
5 files changed, 17 insertions(+), 20 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/35/37935/1
diff --git a/src/mainboard/aopen/dxplplusu/acpi/p64h2.asl b/src/mainboard/aopen/dxplplusu/acpi/p64h2.asl
index e3f2e5f..ccaa6e3 100644
--- a/src/mainboard/aopen/dxplplusu/acpi/p64h2.asl
+++ b/src/mainboard/aopen/dxplplusu/acpi/p64h2.asl
@@ -18,7 +18,6 @@
/* I/O APIC id 0x3 */
Device(PBIO)
{
- Name (_HID, "ACPI000A")
Name (_ADR, 0x001c0000)
}
@@ -59,7 +58,6 @@
/* I/O APIC id 0x4 */
Device(PAIO)
{
- Name (_HID, "ACPI000A")
Name (_ADR, 0x001e0000)
}
diff --git a/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/audio.asl b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/audio.asl
index 01942dc..9b88cdd 100644
--- a/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/audio.asl
+++ b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/acpi/audio.asl
@@ -18,7 +18,6 @@
/* Grunt specific I2S machine driver */
Device (I2S)
{
- Name (_ADR, 1)
Name (_HID, "AMD7219")
Name (_CID, "AMD7219")
diff --git a/src/mainboard/intel/strago/acpi/mainboard.asl b/src/mainboard/intel/strago/acpi/mainboard.asl
index 1d5437b..caaae86 100644
--- a/src/mainboard/intel/strago/acpi/mainboard.asl
+++ b/src/mainboard/intel/strago/acpi/mainboard.asl
@@ -114,7 +114,7 @@
/* Realtek Audio Codec */
Device (RTEK) /* Audio Codec driver I2C */
{
- Name (_ADR, 0)
+
Name (_HID, AUDIO_CODEC_HID)
Name (_CID, AUDIO_CODEC_CID)
Name (_DDN, AUDIO_CODEC_DDN)
diff --git a/src/soc/intel/broadwell/acpi/serialio.asl b/src/soc/intel/broadwell/acpi/serialio.asl
index 1b44e95..08311aa 100644
--- a/src/soc/intel/broadwell/acpi/serialio.asl
+++ b/src/soc/intel/broadwell/acpi/serialio.asl
@@ -157,9 +157,9 @@
Device (SDMA)
{
// Serial IO DMA Controller
+
Name (_HID, "INTL9C60")
Name (_UID, 1)
- Name (_ADR, 0x00150000)
// BAR0 is assigned during PCI enumeration and saved into NVS
Name (RBUF, ResourceTemplate ()
@@ -194,6 +194,7 @@
Device (I2C0)
{
// Serial IO I2C0 Controller
+
Method (_HID)
{
If (\ISWP ()) {
@@ -205,7 +206,6 @@
Return ("INT33C2")
}
Name (_UID, 1)
- Name (_ADR, 0x00150001)
Name (SSCN, Package () { 432, 507, 30 })
Name (FMCN, Package () { 72, 160, 30 })
@@ -265,6 +265,7 @@
Device (I2C1)
{
// Serial IO I2C1 Controller
+
Method (_HID)
{
If (\ISWP ()) {
@@ -276,7 +277,6 @@
Return ("INT33C3")
}
Name (_UID, 1)
- Name (_ADR, 0x00150002)
Name (SSCN, Package () { 432, 507, 30 })
Name (FMCN, Package () { 72, 160, 30 })
@@ -336,6 +336,7 @@
Device (SPI0)
{
// Serial IO SPI0 Controller
+
Method (_HID)
{
If (\ISWP ()) {
@@ -347,7 +348,6 @@
Return ("INT33C0")
}
Name (_UID, 1)
- Name (_ADR, 0x00150003)
// BAR0 is assigned during PCI enumeration and saved into NVS
Name (RBUF, ResourceTemplate ()
@@ -392,6 +392,7 @@
Device (SPI1)
{
// Serial IO SPI1 Controller
+
Method (_HID)
{
If (\ISWP ()) {
@@ -403,7 +404,6 @@
Return ("INT33C1")
}
Name (_UID, 1)
- Name (_ADR, 0x00150004)
// BAR0 is assigned during PCI enumeration and saved into NVS
Name (RBUF, ResourceTemplate ()
@@ -460,6 +460,7 @@
Device (UAR0)
{
// Serial IO UART0 Controller
+
Method (_HID)
{
If (\ISWP ()) {
@@ -471,7 +472,6 @@
Return ("INT33C4")
}
Name (_UID, 1)
- Name (_ADR, 0x00150005)
// BAR0 is assigned during PCI enumeration and saved into NVS
Name (RBUF, ResourceTemplate ()
@@ -528,6 +528,7 @@
Device (UAR1)
{
// Serial IO UART1 Controller
+
Method (_HID)
{
If (\ISWP ()) {
@@ -539,7 +540,6 @@
Return ("INT33C5")
}
Name (_UID, 1)
- Name (_ADR, 0x00150006)
// BAR0 is assigned during PCI enumeration and saved into NVS
Name (RBUF, ResourceTemplate ()
@@ -584,6 +584,7 @@
Device (SDIO)
{
// Serial IO SDIO Controller
+
Method (_HID)
{
If (\ISWP ()) {
@@ -596,7 +597,6 @@
}
Name (_CID, "PNP0D40")
Name (_UID, 1)
- Name (_ADR, 0x00170000)
// BAR0 is assigned during PCI enumeration and saved into NVS
Name (RBUF, ResourceTemplate ()
diff --git a/src/southbridge/intel/lynxpoint/acpi/serialio.asl b/src/southbridge/intel/lynxpoint/acpi/serialio.asl
index 9323b91..e33f048 100644
--- a/src/southbridge/intel/lynxpoint/acpi/serialio.asl
+++ b/src/southbridge/intel/lynxpoint/acpi/serialio.asl
@@ -123,9 +123,9 @@
Device (SDMA)
{
// Serial IO DMA Controller
+
Name (_HID, "INTL9C60")
Name (_UID, 1)
- Name (_ADR, 0x00150000)
// BAR0 is assigned during PCI enumeration and saved into NVS
Name (RBUF, ResourceTemplate ()
@@ -160,10 +160,10 @@
Device (I2C0)
{
// Serial IO I2C0 Controller
+
Name (_HID, "INT33C2")
Name (_CID, "INT33C2")
Name (_UID, 1)
- Name (_ADR, 0x00150001)
Name (SSCN, Package () { 432, 507, 30 })
Name (FMCN, Package () { 72, 160, 30 })
@@ -242,10 +242,10 @@
Device (I2C1)
{
// Serial IO I2C1 Controller
+
Name (_HID, "INT33C3")
Name (_CID, "INT33C3")
Name (_UID, 1)
- Name (_ADR, 0x00150002)
Name (SSCN, Package () { 432, 507, 30 })
Name (FMCN, Package () { 72, 160, 30 })
@@ -324,10 +324,10 @@
Device (SPI0)
{
// Serial IO SPI0 Controller
+
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,10 +362,10 @@
Device (SPI1)
{
// Serial IO SPI1 Controller
+
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 ()
@@ -413,10 +413,10 @@
Device (UAR0)
{
// Serial IO UART0 Controller
+
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 ()
@@ -464,10 +464,10 @@
Device (UAR1)
{
// Serial IO UART1 Controller
+
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 ()
@@ -502,10 +502,10 @@
Device (SDIO)
{
// Serial IO SDIO Controller
+
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 ()
To view, visit change 37935. To unsubscribe, or for help writing mail filters, visit settings.