HAOUAS Elyes has uploaded this change for review.

View Change

{sb,lynxpoint,soc/broadwell}: Drop _HID and _UID

A device object must contain either a _HID object or an _ADR object,
but should not contain both.
If the adress is correct, _HID and _UID are not needed

Change-Id: I687b77e93ed52ad4d909a176277a4f23d700cf06
Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr>
---
M src/soc/intel/broadwell/acpi/serialio.asl
M src/southbridge/intel/lynxpoint/acpi/serialio.asl
2 files changed, 14 insertions(+), 42 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/52/38052/1

diff --git a/src/soc/intel/broadwell/acpi/serialio.asl b/src/soc/intel/broadwell/acpi/serialio.asl
index 1b44e95..ed47284 100644
--- a/src/soc/intel/broadwell/acpi/serialio.asl
+++ b/src/soc/intel/broadwell/acpi/serialio.asl
@@ -156,9 +156,7 @@
 
 Device (SDMA)
 {
-	// Serial IO DMA Controller
-	Name (_HID, "INTL9C60")
-	Name (_UID, 1)
+	Name (_DDN, "Serial IO DMA Controller")
 	Name (_ADR, 0x00150000)
 
 	// BAR0 is assigned during PCI enumeration and saved into NVS
@@ -193,8 +191,7 @@
 
 Device (I2C0)
 {
-	// Serial IO I2C0 Controller
-	Method (_HID)
+	Name (_DDN, "Serial IO I2C0 Controller")
 	{
 		If (\ISWP ()) {
 			// WildcatPoint
@@ -204,7 +201,6 @@
 		// LynxPoint-LP
 		Return ("INT33C2")
 	}
-	Name (_UID, 1)
 	Name (_ADR, 0x00150001)
 
 	Name (SSCN, Package () { 432, 507, 30 })
@@ -264,8 +260,7 @@
 
 Device (I2C1)
 {
-	// Serial IO I2C1 Controller
-	Method (_HID)
+	Name (_DDN, "Serial IO I2C1 Controller")
 	{
 		If (\ISWP ()) {
 			// WildcatPoint
@@ -275,7 +270,6 @@
 		// LynxPoint-LP
 		Return ("INT33C3")
 	}
-	Name (_UID, 1)
 	Name (_ADR, 0x00150002)
 
 	Name (SSCN, Package () { 432, 507, 30 })
@@ -335,8 +329,7 @@
 
 Device (SPI0)
 {
-	// Serial IO SPI0 Controller
-	Method (_HID)
+	Name (_DDN, "Serial IO SPI0 Controller")
 	{
 		If (\ISWP ()) {
 			// WildcatPoint
@@ -346,7 +339,6 @@
 		// LynxPoint-LP
 		Return ("INT33C0")
 	}
-	Name (_UID, 1)
 	Name (_ADR, 0x00150003)
 
 	// BAR0 is assigned during PCI enumeration and saved into NVS
@@ -391,8 +383,7 @@
 
 Device (SPI1)
 {
-	// Serial IO SPI1 Controller
-	Method (_HID)
+	Name (_DDN, "Serial IO SPI1 Controller")
 	{
 		If (\ISWP ()) {
 			// WildcatPoint
@@ -402,7 +393,6 @@
 		// LynxPoint-LP
 		Return ("INT33C1")
 	}
-	Name (_UID, 1)
 	Name (_ADR, 0x00150004)
 
 	// BAR0 is assigned during PCI enumeration and saved into NVS
@@ -459,8 +449,7 @@
 
 Device (UAR0)
 {
-	// Serial IO UART0 Controller
-	Method (_HID)
+	Name (_DDN, "Serial IO UART0 Controller")
 	{
 		If (\ISWP ()) {
 			// WildcatPoint
@@ -470,7 +459,6 @@
 		// LynxPoint-LP
 		Return ("INT33C4")
 	}
-	Name (_UID, 1)
 	Name (_ADR, 0x00150005)
 
 	// BAR0 is assigned during PCI enumeration and saved into NVS
@@ -527,8 +515,7 @@
 
 Device (UAR1)
 {
-	// Serial IO UART1 Controller
-	Method (_HID)
+	Name (_DDN, "Serial IO UART1 Controller")
 	{
 		If (\ISWP ()) {
 			// WildcatPoint
@@ -538,7 +525,6 @@
 		// LynxPoint-LP
 		Return ("INT33C5")
 	}
-	Name (_UID, 1)
 	Name (_ADR, 0x00150006)
 
 	// BAR0 is assigned during PCI enumeration and saved into NVS
diff --git a/src/southbridge/intel/lynxpoint/acpi/serialio.asl b/src/southbridge/intel/lynxpoint/acpi/serialio.asl
index 9323b91..970e777 100644
--- a/src/southbridge/intel/lynxpoint/acpi/serialio.asl
+++ b/src/southbridge/intel/lynxpoint/acpi/serialio.asl
@@ -122,9 +122,7 @@
 
 Device (SDMA)
 {
-	// Serial IO DMA Controller
-	Name (_HID, "INTL9C60")
-	Name (_UID, 1)
+	Name (_DDN, "Serial IO DMA Controller")
 	Name (_ADR, 0x00150000)
 
 	// BAR0 is assigned during PCI enumeration and saved into NVS
@@ -159,10 +157,8 @@
 
 Device (I2C0)
 {
-	// Serial IO I2C0 Controller
-	Name (_HID, "INT33C2")
+	Name (_DDN, "Serial IO I2C0 Controller")
 	Name (_CID, "INT33C2")
-	Name (_UID, 1)
 	Name (_ADR, 0x00150001)
 
 	Name (SSCN, Package () { 432, 507, 30 })
@@ -241,10 +237,8 @@
 
 Device (I2C1)
 {
-	// Serial IO I2C1 Controller
-	Name (_HID, "INT33C3")
+	Name (_DDN, "Serial IO I2C1 Controller")
 	Name (_CID, "INT33C3")
-	Name (_UID, 1)
 	Name (_ADR, 0x00150002)
 
 	Name (SSCN, Package () { 432, 507, 30 })
@@ -323,10 +317,8 @@
 
 Device (SPI0)
 {
-	// Serial IO SPI0 Controller
-	Name (_HID, "INT33C0")
+	Name (_DDN, "Serial IO SPI0 Controller")
 	Name (_CID, "INT33C0")
-	Name (_UID, 1)
 	Name (_ADR, 0x00150003)
 
 	// BAR0 is assigned during PCI enumeration and saved into NVS
@@ -361,10 +353,8 @@
 
 Device (SPI1)
 {
-	// Serial IO SPI1 Controller
-	Name (_HID, "INT33C1")
+	Name (_DDN, "Serial IO SPI1 Controller")
 	Name (_CID, "INT33C1")
-	Name (_UID, 1)
 	Name (_ADR, 0x00150004)
 
 	// BAR0 is assigned during PCI enumeration and saved into NVS
@@ -412,10 +402,8 @@
 
 Device (UAR0)
 {
-	// Serial IO UART0 Controller
-	Name (_HID, "INT33C4")
+	Name (_DDN, "Serial IO UART0 Controller")
 	Name (_CID, "INT33C4")
-	Name (_UID, 1)
 	Name (_ADR, 0x00150005)
 
 	// BAR0 is assigned during PCI enumeration and saved into NVS
@@ -463,10 +451,8 @@
 
 Device (UAR1)
 {
-	// Serial IO UART1 Controller
-	Name (_HID, "INT33C5")
+	Name (_DDN, "Serial IO UART1 Controller")
 	Name (_CID, "INT33C5")
-	Name (_UID, 1)
 	Name (_ADR, 0x00150006)
 
 	// BAR0 is assigned during PCI enumeration and saved into NVS

To view, visit change 38052. To unsubscribe, or for help writing mail filters, visit settings.