{northbridge,soc,southbridge}: Don't use both of _ADR and _HID

ACPI Version 6.3 Section 6.1: "A device object must contain either an _HID
object or an _ADR object, but should not contain both."

Change-Id: Ifb777c09aeef09a6a4cbee254b081519f5b6c457
Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/36318
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Martin Roth <martinroth@google.com>
This commit is contained in:
Elyes HAOUAS 2019-10-25 10:53:20 +02:00 committed by Martin Roth
parent 179da7fb5c
commit 0178760867
9 changed files with 9 additions and 25 deletions

View File

@ -16,7 +16,7 @@
/* Note: Only need HID on Primary Bus */ /* Note: Only need HID on Primary Bus */
External (TOM1) External (TOM1)
External (TOM2) External (TOM2)
Name(_HID, EISAID("PNP0A08")) /* PCI Express Root Bridge */ /* Name(_HID, EISAID("PNP0A08")) // PCI Express Root Bridge */
Name(_CID, EISAID("PNP0A03")) /* PCI Root Bridge */ Name(_CID, EISAID("PNP0A03")) /* PCI Root Bridge */
Name(_ADR, 0x00180000) /* Dev# = BSP Dev#, Func# = 0 */ Name(_ADR, 0x00180000) /* Dev# = BSP Dev#, Func# = 0 */
@ -125,7 +125,6 @@ Device(PE23) {
/* Northbridge function 3 */ /* Northbridge function 3 */
Device(NBF3) { Device(NBF3) {
Name(_ADR, 0x00180003)
/* k10temp thermal zone */ /* k10temp thermal zone */
#include "thermal_mixin.asl" #include "thermal_mixin.asl"

View File

@ -16,7 +16,7 @@
/* Note: Only need HID on Primary Bus */ /* Note: Only need HID on Primary Bus */
External (TOM1) External (TOM1)
External (TOM2) External (TOM2)
Name(_HID, EISAID("PNP0A03")) /* PCI Express Root Bridge */ /* Name(_HID, EISAID("PNP0A03")) // PCI Express Root Bridge */
Name(_ADR, 0x00180000) /* Dev# = BSP Dev#, Func# = 0 */ Name(_ADR, 0x00180000) /* Dev# = BSP Dev#, Func# = 0 */
/* Describe the Northbridge devices */ /* Describe the Northbridge devices */

View File

@ -16,7 +16,7 @@
/* Note: Only need HID on Primary Bus */ /* Note: Only need HID on Primary Bus */
External (TOM1) External (TOM1)
External (TOM2) External (TOM2)
Name(_HID, EISAID("PNP0A08")) /* PCI Express Root Bridge */ /* Name(_HID, EISAID("PNP0A08")) // PCI Express Root Bridge */
Name(_CID, EISAID("PNP0A03")) /* PCI Root Bridge */ Name(_CID, EISAID("PNP0A03")) /* PCI Root Bridge */
Name(_ADR, 0x00180000) /* Dev# = BSP Dev#, Func# = 0 */ Name(_ADR, 0x00180000) /* Dev# = BSP Dev#, Func# = 0 */

View File

@ -16,7 +16,7 @@
/* Note: Only need HID on Primary Bus */ /* Note: Only need HID on Primary Bus */
External (TOM1) External (TOM1)
External (TOM2) External (TOM2)
Name(_HID, EISAID("PNP0A03")) /* PCI Express Root Bridge */ /* Name(_HID, EISAID("PNP0A03")) // PCI Express Root Bridge */
Name(_ADR, 0x00180000) /* Dev# = BSP Dev#, Func# = 0 */ Name(_ADR, 0x00180000) /* Dev# = BSP Dev#, Func# = 0 */
/* Describe the Northbridge devices */ /* Describe the Northbridge devices */

View File

@ -16,7 +16,7 @@
/* Note: Only need HID on Primary Bus */ /* Note: Only need HID on Primary Bus */
External (TOM1) External (TOM1)
External (TOM2) External (TOM2)
Name(_HID, EISAID("PNP0A08")) /* PCI Express Root Bridge */ /* Name(_HID, EISAID("PNP0A08")) // PCI Express Root Bridge */
Name(_CID, EISAID("PNP0A03")) /* PCI Root Bridge */ Name(_CID, EISAID("PNP0A03")) /* PCI Root Bridge */
Name(_ADR, 0x00180000) /* Dev# = BSP Dev#, Func# = 0 */ Name(_ADR, 0x00180000) /* Dev# = BSP Dev#, Func# = 0 */

View File

@ -16,10 +16,9 @@
/* Note: Only need HID on Primary Bus */ /* Note: Only need HID on Primary Bus */
External (TOM1) External (TOM1)
External (TOM2) External (TOM2)
Name(_HID, EISAID("PNP0A08")) /* PCI Express Root Bridge */ /* Name(_HID, EISAID("PNP0A08")) // PCI Express Root Bridge */
Name(_CID, EISAID("PNP0A03")) /* PCI Root Bridge */ Name(_CID, EISAID("PNP0A03")) /* PCI Root Bridge */
Name(_ADR, 0x00180000) /* Dev# = BSP Dev#, Func# = 0 */ Name(_ADR, 0x00180000) /* Dev# = BSP Dev#, Func# = 0 */
/* Describe the Northbridge devices */ /* Describe the Northbridge devices */
Method(_BBN, 0, NotSerialized) /* Bus number = 0 */ Method(_BBN, 0, NotSerialized) /* Bus number = 0 */

View File

@ -17,7 +17,7 @@
/* Note: Only need HID on Primary Bus */ /* Note: Only need HID on Primary Bus */
External (TOM1) External (TOM1)
External (TOM2) External (TOM2)
Name(_HID, EISAID("PNP0A08")) /* PCI Express Root Bridge */ /* Name(_HID, EISAID("PNP0A08")) // PCI Express Root Bridge */
Name(_CID, EISAID("PNP0A03")) /* PCI Root Bridge */ Name(_CID, EISAID("PNP0A03")) /* PCI Root Bridge */
Name(_ADR, 0x00180000) /* Dev# = BSP Dev#, Func# = 0 */ Name(_ADR, 0x00180000) /* Dev# = BSP Dev#, Func# = 0 */

View File

@ -157,7 +157,7 @@ Device (SIOR)
Device (SDMA) Device (SDMA)
{ {
// Serial IO DMA Controller // Serial IO DMA Controller
Name (_HID, "INTL9C60") /* Name (_HID, "INTL9C60") */
Name (_UID, 1) Name (_UID, 1)
Name (_ADR, 0x00150000) Name (_ADR, 0x00150000)
@ -205,7 +205,6 @@ Device (I2C0)
Return ("INT33C2") Return ("INT33C2")
} }
Name (_UID, 1) Name (_UID, 1)
Name (_ADR, 0x00150001)
Name (SSCN, Package () { 432, 507, 30 }) Name (SSCN, Package () { 432, 507, 30 })
Name (FMCN, Package () { 72, 160, 30 }) Name (FMCN, Package () { 72, 160, 30 })
@ -276,7 +275,6 @@ Device (I2C1)
Return ("INT33C3") Return ("INT33C3")
} }
Name (_UID, 1) Name (_UID, 1)
Name (_ADR, 0x00150002)
Name (SSCN, Package () { 432, 507, 30 }) Name (SSCN, Package () { 432, 507, 30 })
Name (FMCN, Package () { 72, 160, 30 }) Name (FMCN, Package () { 72, 160, 30 })
@ -347,7 +345,6 @@ Device (SPI0)
Return ("INT33C0") Return ("INT33C0")
} }
Name (_UID, 1) Name (_UID, 1)
Name (_ADR, 0x00150003)
// BAR0 is assigned during PCI enumeration and saved into NVS // BAR0 is assigned during PCI enumeration and saved into NVS
Name (RBUF, ResourceTemplate () Name (RBUF, ResourceTemplate ()
@ -403,7 +400,6 @@ Device (SPI1)
Return ("INT33C1") Return ("INT33C1")
} }
Name (_UID, 1) Name (_UID, 1)
Name (_ADR, 0x00150004)
// BAR0 is assigned during PCI enumeration and saved into NVS // BAR0 is assigned during PCI enumeration and saved into NVS
Name (RBUF, ResourceTemplate () Name (RBUF, ResourceTemplate ()
@ -471,7 +467,6 @@ Device (UAR0)
Return ("INT33C4") Return ("INT33C4")
} }
Name (_UID, 1) Name (_UID, 1)
Name (_ADR, 0x00150005)
// BAR0 is assigned during PCI enumeration and saved into NVS // BAR0 is assigned during PCI enumeration and saved into NVS
Name (RBUF, ResourceTemplate () Name (RBUF, ResourceTemplate ()
@ -539,7 +534,6 @@ Device (UAR1)
Return ("INT33C5") Return ("INT33C5")
} }
Name (_UID, 1) Name (_UID, 1)
Name (_ADR, 0x00150006)
// BAR0 is assigned during PCI enumeration and saved into NVS // BAR0 is assigned during PCI enumeration and saved into NVS
Name (RBUF, ResourceTemplate () Name (RBUF, ResourceTemplate ()
@ -596,7 +590,6 @@ Device (SDIO)
} }
Name (_CID, "PNP0D40") Name (_CID, "PNP0D40")
Name (_UID, 1) Name (_UID, 1)
Name (_ADR, 0x00170000)
// BAR0 is assigned during PCI enumeration and saved into NVS // BAR0 is assigned during PCI enumeration and saved into NVS
Name (RBUF, ResourceTemplate () Name (RBUF, ResourceTemplate ()

View File

@ -123,7 +123,7 @@ Device (SIOR)
Device (SDMA) Device (SDMA)
{ {
// Serial IO DMA Controller // Serial IO DMA Controller
Name (_HID, "INTL9C60") /* Name (_HID, "INTL9C60") */
Name (_UID, 1) Name (_UID, 1)
Name (_ADR, 0x00150000) Name (_ADR, 0x00150000)
@ -163,7 +163,6 @@ Device (I2C0)
Name (_HID, "INT33C2") Name (_HID, "INT33C2")
Name (_CID, "INT33C2") Name (_CID, "INT33C2")
Name (_UID, 1) Name (_UID, 1)
Name (_ADR, 0x00150001)
Name (SSCN, Package () { 432, 507, 30 }) Name (SSCN, Package () { 432, 507, 30 })
Name (FMCN, Package () { 72, 160, 30 }) Name (FMCN, Package () { 72, 160, 30 })
@ -245,7 +244,6 @@ Device (I2C1)
Name (_HID, "INT33C3") Name (_HID, "INT33C3")
Name (_CID, "INT33C3") Name (_CID, "INT33C3")
Name (_UID, 1) Name (_UID, 1)
Name (_ADR, 0x00150002)
Name (SSCN, Package () { 432, 507, 30 }) Name (SSCN, Package () { 432, 507, 30 })
Name (FMCN, Package () { 72, 160, 30 }) Name (FMCN, Package () { 72, 160, 30 })
@ -327,7 +325,6 @@ Device (SPI0)
Name (_HID, "INT33C0") Name (_HID, "INT33C0")
Name (_CID, "INT33C0") Name (_CID, "INT33C0")
Name (_UID, 1) Name (_UID, 1)
Name (_ADR, 0x00150003)
// BAR0 is assigned during PCI enumeration and saved into NVS // BAR0 is assigned during PCI enumeration and saved into NVS
Name (RBUF, ResourceTemplate () Name (RBUF, ResourceTemplate ()
@ -365,7 +362,6 @@ Device (SPI1)
Name (_HID, "INT33C1") Name (_HID, "INT33C1")
Name (_CID, "INT33C1") Name (_CID, "INT33C1")
Name (_UID, 1) Name (_UID, 1)
Name (_ADR, 0x00150004)
// BAR0 is assigned during PCI enumeration and saved into NVS // BAR0 is assigned during PCI enumeration and saved into NVS
Name (RBUF, ResourceTemplate () Name (RBUF, ResourceTemplate ()
@ -416,7 +412,6 @@ Device (UAR0)
Name (_HID, "INT33C4") Name (_HID, "INT33C4")
Name (_CID, "INT33C4") Name (_CID, "INT33C4")
Name (_UID, 1) Name (_UID, 1)
Name (_ADR, 0x00150005)
// BAR0 is assigned during PCI enumeration and saved into NVS // BAR0 is assigned during PCI enumeration and saved into NVS
Name (RBUF, ResourceTemplate () Name (RBUF, ResourceTemplate ()
@ -467,7 +462,6 @@ Device (UAR1)
Name (_HID, "INT33C5") Name (_HID, "INT33C5")
Name (_CID, "INT33C5") Name (_CID, "INT33C5")
Name (_UID, 1) Name (_UID, 1)
Name (_ADR, 0x00150006)
// BAR0 is assigned during PCI enumeration and saved into NVS // BAR0 is assigned during PCI enumeration and saved into NVS
Name (RBUF, ResourceTemplate () Name (RBUF, ResourceTemplate ()
@ -505,7 +499,6 @@ Device (SDIO)
Name (_HID, "INT33C6") Name (_HID, "INT33C6")
Name (_CID, "PNP0D40") Name (_CID, "PNP0D40")
Name (_UID, 1) Name (_UID, 1)
Name (_ADR, 0x00170000)
// BAR0 is assigned during PCI enumeration and saved into NVS // BAR0 is assigned during PCI enumeration and saved into NVS
Name (RBUF, ResourceTemplate () Name (RBUF, ResourceTemplate ()