Change in coreboot[master]: sb/intel/lynxpoint: Add WildcatPoint SerialIO HIDs

[Angel Pons (Code Review)]

Angel Pons has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/46975 )

Change subject: sb/intel/lynxpoint: Add WildcatPoint SerialIO HIDs
......................................................................

sb/intel/lynxpoint: Add WildcatPoint SerialIO HIDs

This is merely to allow reusing the same SerialIO code for both.

Change-Id: I6ddb01a9fdadbffe48324ff60f3d70e27513d775
Signed-off-by: Angel Pons 
---
M src/southbridge/intel/lynxpoint/acpi/serialio.asl
1 file changed, 16 insertions(+), 7 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/75/46975/1

diff --git a/src/southbridge/intel/lynxpoint/acpi/serialio.asl b/src/southbridge/intel/lynxpoint/acpi/serialio.asl
index 0e246f7..dd364bc 100644
--- a/src/southbridge/intel/lynxpoint/acpi/serialio.asl
+++ b/src/southbridge/intel/lynxpoint/acpi/serialio.asl
@@ -16,6 +16,15 @@
 External (\S6EN)
 External (\S7EN)

+// Generate a method object that returns different values for LPT and WPT
+#define DYNAMIC_NAME(obj_name, lpt_id, wpt_id)	\
+	Method (obj_name) {			\
+		If (\ISWP ()) {			\
+			Return (wpt_id)		\
+		}				\
+		Return (lpt_id)			\
+	}
+
 // Put SerialIO device in D0 state
 // Arg0 - Ref to offset 0x84 of device's PCI config space
 Method (LPD0, 1, Serialized)
@@ -167,7 +176,7 @@
 Device (I2C0)
 {
    // Serial IO I2C0 Controller
-	Name (_HID, "INT33C2")
+	DYNAMIC_NAME (_HID, "INT33C2", "INT3432")
    Name (_CID, "INT33C2")
    Name (_UID, 1)

@@ -235,7 +244,7 @@
 Device (I2C1)
 {
    // Serial IO I2C1 Controller
-	Name (_HID, "INT33C3")
+	DYNAMIC_NAME (_HID, "INT33C3", "INT3433")
    Name (_CID, "INT33C3")
    Name (_UID, 1)

@@ -303,7 +312,7 @@
 Device (SPI0)
 {
    // Serial IO SPI0 Controller
-	Name (_HID, "INT33C0")
+	DYNAMIC_NAME (_HID, "INT33C0", "INT3430")
    Name (_CID, "INT33C0")
    Name (_UID, 1)

@@ -356,7 +365,7 @@
 Device (SPI1)
 {
    // Serial IO SPI1 Controller
-	Name (_HID, "INT33C1")
+	DYNAMIC_NAME (_HID, "INT33C1", "INT3431")
    Name (_CID, "INT33C1")
    Name (_UID, 1)

@@ -421,7 +430,7 @@
 Device (UAR0)
 {
    // Serial IO UART0 Controller
-	Name (_HID, "INT33C4")
+	DYNAMIC_NAME (_HID, "INT33C4", "INT3434")
    Name (_CID, "INT33C4")
    Name (_UID, 1)

@@ -486,7 +495,7 @@
 Device (UAR1)
 {
    // Serial IO UART1 Controller
-	Name (_HID, "INT33C5")
+	DYNAMIC_NAME (_HID, "INT33C5", "INT3435")
    Name (_CID, "INT33C5")
    Name (_UID, 1)

@@ -539,7 +548,7 @@
 Device (SDIO)
 {
    // Serial IO SDIO Controller
-	Name (_HID, "INT33C6")
+	DYNAMIC_NAME (_HID, "INT33C6", "INT3436")
    Name (_CID, "PNP0D40")
    Name (_UID, 1)

[Angel Pons (Code Review)]

Hello build bot (Jenkins), Patrick Rudolph,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/46975

to look at the new patch set (#4).

Change subject: sb/intel/lynxpoint: Add WildcatPoint SerialIO HIDs
......................................................................

sb/intel/lynxpoint: Add WildcatPoint SerialIO HIDs

This is merely to allow reusing the same SerialIO code for both.

Change-Id: I6ddb01a9fdadbffe48324ff60f3d70e27513d775
Signed-off-by: Angel Pons 
---
M src/southbridge/intel/lynxpoint/acpi/serialio.asl
1 file changed, 16 insertions(+), 7 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/75/46975/4