Change in coreboot[master]: mb/google/hatch: Fix trackpad configuration in overridetree

[Furquan Shaikh (Code Review)]

Furquan Shaikh has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/34248 )

Change subject: mb/google/hatch: Fix trackpad configuration in overridetree
......................................................................

mb/google/hatch: Fix trackpad configuration in overridetree

Hatch and variants use GPP_A21 for trackpad IRQ and wake. Fix
overridetree.cb to advertise the right IRQ.

Change-Id: Ib87c858b89e8726c3bc80f83be0729ef4625268e
Signed-off-by: Furquan Shaikh 
---
M src/mainboard/google/hatch/variants/hatch/overridetree.cb
M src/mainboard/google/hatch/variants/helios/overridetree.cb
M src/mainboard/google/hatch/variants/kindred/overridetree.cb
M src/mainboard/google/hatch/variants/kohaku/overridetree.cb
4 files changed, 6 insertions(+), 8 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/48/34248/1

diff --git a/src/mainboard/google/hatch/variants/hatch/overridetree.cb b/src/mainboard/google/hatch/variants/hatch/overridetree.cb
index 18878ce..e40a5664 100644
--- a/src/mainboard/google/hatch/variants/hatch/overridetree.cb
+++ b/src/mainboard/google/hatch/variants/hatch/overridetree.cb
@@ -63,7 +63,7 @@
    		chip drivers/i2c/generic
    			register "hid" = ""ELAN0000""
    			register "desc" = ""ELAN Touchpad""
-				register "irq" = "ACPI_IRQ_EDGE_LOW(GPP_A21_IRQ)"
+				register "irq" = "ACPI_IRQ_WAKE_EDGE_LOW(GPP_A21_IRQ)"
    			register "wake" = "GPE0_DW0_21"
    			device i2c 15 on end
    		end
diff --git a/src/mainboard/google/hatch/variants/helios/overridetree.cb b/src/mainboard/google/hatch/variants/helios/overridetree.cb
index 3f71c99..1907289 100644
--- a/src/mainboard/google/hatch/variants/helios/overridetree.cb
+++ b/src/mainboard/google/hatch/variants/helios/overridetree.cb
@@ -72,7 +72,7 @@
    		chip drivers/i2c/generic
    			register "hid" = ""ELAN0000""
    			register "desc" = ""ELAN Touchpad""
-				register "irq" = "ACPI_IRQ_EDGE_LOW(GPP_A21_IRQ)"
+				register "irq" = "ACPI_IRQ_WAKE_EDGE_LOW(GPP_A21_IRQ)"
    			register "wake" = "GPE0_DW0_21"
    			device i2c 15 on end
    		end
diff --git a/src/mainboard/google/hatch/variants/kindred/overridetree.cb b/src/mainboard/google/hatch/variants/kindred/overridetree.cb
index 8993706..becfc49 100644
--- a/src/mainboard/google/hatch/variants/kindred/overridetree.cb
+++ b/src/mainboard/google/hatch/variants/kindred/overridetree.cb
@@ -55,7 +55,7 @@
    		chip drivers/i2c/generic
    			register "hid" = ""ELAN0000""
    			register "desc" = ""ELAN Touchpad""
-				register "irq" = "ACPI_IRQ_EDGE_LOW(GPP_A21_IRQ)"
+				register "irq" = "ACPI_IRQ_WAKE_EDGE_LOW(GPP_A21_IRQ)"
    			register "wake" = "GPE0_DW0_21"
    			register "probed" = "1"
    			device i2c 15 on end
@@ -63,7 +63,7 @@
    		chip drivers/i2c/hid
    			register "generic.hid" = ""PNP0C50""
    			register "generic.desc" = ""Synaptics Touchpad""
-				register "generic.irq" = "ACPI_IRQ_EDGE_LOW(GPP_A21_IRQ)"
+				register "generic.irq" = "ACPI_IRQ_WAKE_EDGE_LOW(GPP_A21_IRQ)"
    			register "generic.wake" = "GPE0_DW0_21"
    			register "generic.probed" = "1"
    			register "hid_desc_reg_offset" = "0x20"
diff --git a/src/mainboard/google/hatch/variants/kohaku/overridetree.cb b/src/mainboard/google/hatch/variants/kohaku/overridetree.cb
index cf422ed..18cc1d4 100644
--- a/src/mainboard/google/hatch/variants/kohaku/overridetree.cb
+++ b/src/mainboard/google/hatch/variants/kohaku/overridetree.cb
@@ -64,11 +64,9 @@
    		chip drivers/i2c/hid
    			register "generic.hid" = ""PNP0C50""
    			register "generic.desc" = ""Synaptics Touchpad""
-				# TODO: enable this when b/123967687 is fixed.
-				# register "generic.wake" = "GPE0_DW2_27"
-				# also set next line to ACPI_IRQ_WAKE_EDGE_LOW
-				register "generic.irq" = "ACPI_IRQ_EDGE_LOW(GPP_D21_IRQ)"
+				register "generic.irq" = "ACPI_IRQ_WAKE_EDGE_LOW(GPP_A21_IRQ)"
    			register "generic.probed" = "1"
+				register "generic.wake" = "GPE0_DW0_21"
    			register "hid_desc_reg_offset" = "0x20"
    			device i2c 0x20 on end
    		end

[Philip Chen (Code Review)]

Philip Chen has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34248 )

Change subject: mb/google/hatch: Fix trackpad configuration in overridetree
......................................................................

Patch Set 1: Code-Review+1

[Tim Wawrzynczak (Code Review)]

Tim Wawrzynczak has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34248 )

Change subject: mb/google/hatch: Fix trackpad configuration in overridetree
......................................................................

Patch Set 1: Code-Review+2

[Paul Fagerburg (Code Review)]

Paul Fagerburg has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34248 )

Change subject: mb/google/hatch: Fix trackpad configuration in overridetree
......................................................................

Patch Set 1: Code-Review+2

[Martin Roth (Code Review)]

Martin Roth has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/34248 )

Change subject: mb/google/hatch: Fix trackpad configuration in overridetree
......................................................................

mb/google/hatch: Fix trackpad configuration in overridetree

Hatch and variants use GPP_A21 for trackpad IRQ and wake. Fix
overridetree.cb to advertise the right IRQ.

Change-Id: Ib87c858b89e8726c3bc80f83be0729ef4625268e
Signed-off-by: Furquan Shaikh 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/34248
Reviewed-by: Philip Chen 
Reviewed-by: Tim Wawrzynczak 
Reviewed-by: Paul Fagerburg 
Tested-by: build bot (Jenkins) 
---
M src/mainboard/google/hatch/variants/hatch/overridetree.cb
M src/mainboard/google/hatch/variants/helios/overridetree.cb
M src/mainboard/google/hatch/variants/kindred/overridetree.cb
M src/mainboard/google/hatch/variants/kohaku/overridetree.cb
4 files changed, 6 insertions(+), 8 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Philip Chen: Looks good to me, but someone else must approve
  Tim Wawrzynczak: Looks good to me, approved
  Paul Fagerburg: Looks good to me, approved

diff --git a/src/mainboard/google/hatch/variants/hatch/overridetree.cb b/src/mainboard/google/hatch/variants/hatch/overridetree.cb
index 18878ce..e40a5664 100644
--- a/src/mainboard/google/hatch/variants/hatch/overridetree.cb
+++ b/src/mainboard/google/hatch/variants/hatch/overridetree.cb
@@ -63,7 +63,7 @@
    		chip drivers/i2c/generic
    			register "hid" = ""ELAN0000""
    			register "desc" = ""ELAN Touchpad""
-				register "irq" = "ACPI_IRQ_EDGE_LOW(GPP_A21_IRQ)"
+				register "irq" = "ACPI_IRQ_WAKE_EDGE_LOW(GPP_A21_IRQ)"
    			register "wake" = "GPE0_DW0_21"
    			device i2c 15 on end
    		end
diff --git a/src/mainboard/google/hatch/variants/helios/overridetree.cb b/src/mainboard/google/hatch/variants/helios/overridetree.cb
index 3f71c99..1907289 100644
--- a/src/mainboard/google/hatch/variants/helios/overridetree.cb
+++ b/src/mainboard/google/hatch/variants/helios/overridetree.cb
@@ -72,7 +72,7 @@
    		chip drivers/i2c/generic
    			register "hid" = ""ELAN0000""
    			register "desc" = ""ELAN Touchpad""
-				register "irq" = "ACPI_IRQ_EDGE_LOW(GPP_A21_IRQ)"
+				register "irq" = "ACPI_IRQ_WAKE_EDGE_LOW(GPP_A21_IRQ)"
    			register "wake" = "GPE0_DW0_21"
    			device i2c 15 on end
    		end
diff --git a/src/mainboard/google/hatch/variants/kindred/overridetree.cb b/src/mainboard/google/hatch/variants/kindred/overridetree.cb
index 8993706..becfc49 100644
--- a/src/mainboard/google/hatch/variants/kindred/overridetree.cb
+++ b/src/mainboard/google/hatch/variants/kindred/overridetree.cb
@@ -55,7 +55,7 @@
    		chip drivers/i2c/generic
    			register "hid" = ""ELAN0000""
    			register "desc" = ""ELAN Touchpad""
-				register "irq" = "ACPI_IRQ_EDGE_LOW(GPP_A21_IRQ)"
+				register "irq" = "ACPI_IRQ_WAKE_EDGE_LOW(GPP_A21_IRQ)"
    			register "wake" = "GPE0_DW0_21"
    			register "probed" = "1"
    			device i2c 15 on end
@@ -63,7 +63,7 @@
    		chip drivers/i2c/hid
    			register "generic.hid" = ""PNP0C50""
    			register "generic.desc" = ""Synaptics Touchpad""
-				register "generic.irq" = "ACPI_IRQ_EDGE_LOW(GPP_A21_IRQ)"
+				register "generic.irq" = "ACPI_IRQ_WAKE_EDGE_LOW(GPP_A21_IRQ)"
    			register "generic.wake" = "GPE0_DW0_21"
    			register "generic.probed" = "1"
    			register "hid_desc_reg_offset" = "0x20"
diff --git a/src/mainboard/google/hatch/variants/kohaku/overridetree.cb b/src/mainboard/google/hatch/variants/kohaku/overridetree.cb
index cf422ed..18cc1d4 100644
--- a/src/mainboard/google/hatch/variants/kohaku/overridetree.cb
+++ b/src/mainboard/google/hatch/variants/kohaku/overridetree.cb
@@ -64,11 +64,9 @@
    		chip drivers/i2c/hid
    			register "generic.hid" = ""PNP0C50""
    			register "generic.desc" = ""Synaptics Touchpad""
-				# TODO: enable this when b/123967687 is fixed.
-				# register "generic.wake" = "GPE0_DW2_27"
-				# also set next line to ACPI_IRQ_WAKE_EDGE_LOW
-				register "generic.irq" = "ACPI_IRQ_EDGE_LOW(GPP_D21_IRQ)"
+				register "generic.irq" = "ACPI_IRQ_WAKE_EDGE_LOW(GPP_A21_IRQ)"
    			register "generic.probed" = "1"
+				register "generic.wake" = "GPE0_DW0_21"
    			register "hid_desc_reg_offset" = "0x20"
    			device i2c 0x20 on end
    		end