Change in ...coreboot[master]: mb/google/hatch: Set trackpad wake to GPP_A21

[Shelley Chen (Code Review)]

Shelley Chen has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/33820

Change subject: mb/google/hatch: Set trackpad wake to GPP_A21
......................................................................

mb/google/hatch: Set trackpad wake to GPP_A21

Previously, We had to use GPP_A21 for trackpad wake and GPP_D21 for
trackpad interrupts due to ITSS not honoring the INVERT config.  Now
that's fixed, we can configure trackpad wake and interrupts on GPP_A21
only.

BUG=b:130436471
BRANCH=None
TEST=1. boot a hatch device and make sure we can move the cursor with the trackpad
     2. Run powerd_dbus_suspend and wake by clicking on the trackpad and ensure
        through "mosys eventlog list" that the wake source is the trackpad.

Change-Id: I26a99206c42ba442f91ae577b98366fc2fd6c0ca
Signed-off-by: Shelley Chen 
---
M src/mainboard/google/hatch/variants/baseboard/gpio.c
M src/mainboard/google/hatch/variants/hatch/overridetree.cb
2 files changed, 5 insertions(+), 13 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/20/33820/1

diff --git a/src/mainboard/google/hatch/variants/baseboard/gpio.c b/src/mainboard/google/hatch/variants/baseboard/gpio.c
index a4fb4c9..38e31ba 100644
--- a/src/mainboard/google/hatch/variants/baseboard/gpio.c
+++ b/src/mainboard/google/hatch/variants/baseboard/gpio.c
@@ -54,12 +54,8 @@
    PAD_CFG_GPO(GPP_A19, 1, DEEP),
    /* A20 : WLAN_INT_L */
    PAD_CFG_GPI_APIC(GPP_A20, NONE, PLTRST, LEVEL, INVERT),
-	/*
-	 * A21 : TRACKPAD_INT_ODL (wake)
-	 * TODO Combine into single gpio, when ITSS IPCx configuration
-	 * is fixed in FSP.
-	 */
-	PAD_CFG_GPI_SCI(GPP_A21, NONE, DEEP, EDGE_SINGLE, INVERT),
+	/* A21 : TRACKPAD_INT_ODL */
+	PAD_CFG_GPI_IRQ_WAKE(GPP_A21, NONE, DEEP, LEVEL, INVERT),
    /* A22 : FPMCU_PCH_BOOT0 */
    PAD_CFG_GPO(GPP_A22, 0, DEEP),
    /* A23 : FPMCU_PCH_INT_ODL */
@@ -209,12 +205,8 @@
    PAD_CFG_NF(GPP_D19, NONE, DEEP, NF1),
    /* D20 : DMIC_DATA_0_SNDW4_DATA */
    PAD_CFG_NF(GPP_D20, NONE, DEEP, NF1),
-	/*
-	 * D21 : TRACKPAD_INT_ODL
-	 * TODO Combine into single gpio with invert mode, when ITSS
-	 * IPCx configuration is fixed in FSP.
-	 */
-	PAD_CFG_GPI_APIC(GPP_D21, NONE, PLTRST, LEVEL, NONE),
+	/* D21 : GPP_D22 ==> NC */
+	PAD_NC(GPP_D21, NONE),
    /* D22 : GPP_D22 ==> NC */
    PAD_NC(GPP_D22, NONE),
    /* D23 : SPP_MCLK */
diff --git a/src/mainboard/google/hatch/variants/hatch/overridetree.cb b/src/mainboard/google/hatch/variants/hatch/overridetree.cb
index d676843..2582940 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_D21_IRQ)"
+				register "irq" = "ACPI_IRQ_EDGE_LOW(GPP_A21_IRQ)"
    			register "wake" = "GPE0_DW0_21"
    			device i2c 15 on end
    		end

Change in ...coreboot[master]: mb/google/hatch: Set trackpad irq and wake to GPP_A21

[Shelley Chen (Code Review)]

Hello Paul Fagerburg, Aamir Bohra, Tim Wawrzynczak, Furquan Shaikh,

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

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

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

Change subject: mb/google/hatch: Set trackpad irq and wake to GPP_A21
......................................................................

mb/google/hatch: Set trackpad irq and wake to GPP_A21

Previously, We had to use GPP_A21 for trackpad wake and GPP_D21 for
trackpad interrupts due to ITSS not honoring the INVERT config.  Now
that's fixed, we can configure trackpad wake and interrupts on GPP_A21
only.

BUG=b:130436471
BRANCH=None
TEST=1. boot a hatch device and make sure we can move the cursor with the trackpad
     2. Run powerd_dbus_suspend and wake by clicking on the trackpad and ensure
        through "mosys eventlog list" that the wake source is the trackpad.

Change-Id: I26a99206c42ba442f91ae577b98366fc2fd6c0ca
Signed-off-by: Shelley Chen 
---
M src/mainboard/google/hatch/variants/baseboard/gpio.c
M src/mainboard/google/hatch/variants/hatch/overridetree.cb
2 files changed, 5 insertions(+), 13 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/20/33820/2

Change in ...coreboot[master]: mb/google/hatch: Set trackpad irq and wake to GPP_A21

[Paul Fagerburg (Code Review)]

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

Change subject: mb/google/hatch: Set trackpad irq and wake to GPP_A21
......................................................................

Patch Set 2: Code-Review+1

Change in ...coreboot[master]: mb/google/hatch: Set trackpad irq and wake to GPP_A21

[Furquan Shaikh (Code Review)]

Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/33820 )

Change subject: mb/google/hatch: Set trackpad irq and wake to GPP_A21
......................................................................

Patch Set 2:

(2 comments)

https://review.coreboot.org/#/c/33820/2//COMMIT_MSG 
Commit Message:

https://review.coreboot.org/#/c/33820/2//COMMIT_MSG@17 
PS2, Line 17: powerd_dbus_suspend
What about wake from S3? Does that work too?

https://review.coreboot.org/#/c/33820/2/src/mainboard/google/hatch/variants/... 
File src/mainboard/google/hatch/variants/baseboard/gpio.c:

https://review.coreboot.org/#/c/33820/2/src/mainboard/google/hatch/variants/... 
PS2, Line 208: D22
D21?

Change in ...coreboot[master]: mb/google/hatch: Set trackpad irq and wake to GPP_A21

[Paul Menzel (Code Review)]

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

Change subject: mb/google/hatch: Set trackpad irq and wake to GPP_A21
......................................................................

Patch Set 2: Code-Review+1

Change in ...coreboot[master]: mb/google/hatch: Set trackpad irq and wake to GPP_A21

[Shelley Chen (Code Review)]

Hello Paul Fagerburg, Aamir Bohra, Paul Menzel, Tim Wawrzynczak, build bot (Jenkins), Furquan Shaikh,

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

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

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

Change subject: mb/google/hatch: Set trackpad irq and wake to GPP_A21
......................................................................

mb/google/hatch: Set trackpad irq and wake to GPP_A21

Previously, We had to use GPP_A21 for trackpad wake and GPP_D21 for
trackpad interrupts due to ITSS not honoring the INVERT config.  Now
that's fixed, we can configure trackpad wake and interrupts on GPP_A21
only.

BUG=b:130436471
BRANCH=None
TEST=1. boot a hatch device and make sure we can move the cursor with the trackpad
     2. Run powerd_dbus_suspend and wake by clicking on the trackpad and ensure
        through "mosys eventlog list" that the wake source is the trackpad.

Change-Id: I26a99206c42ba442f91ae577b98366fc2fd6c0ca
Signed-off-by: Shelley Chen 
---
M src/mainboard/google/hatch/variants/baseboard/gpio.c
M src/mainboard/google/hatch/variants/hatch/overridetree.cb
2 files changed, 5 insertions(+), 13 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/20/33820/3

Change in ...coreboot[master]: mb/google/hatch: Set trackpad irq and wake to GPP_A21

[Shelley Chen (Code Review)]

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

Change subject: mb/google/hatch: Set trackpad irq and wake to GPP_A21
......................................................................

Patch Set 3:

(1 comment)

https://review.coreboot.org/#/c/33820/2/src/mainboard/google/hatch/variants/... 
File src/mainboard/google/hatch/variants/baseboard/gpio.c:

https://review.coreboot.org/#/c/33820/2/src/mainboard/google/hatch/variants/... 
PS2, Line 208: D22
> D21?

Ack

Change in ...coreboot[master]: mb/google/hatch: Set trackpad irq and wake to GPP_A21

[Tim Wawrzynczak (Code Review)]

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

Change subject: mb/google/hatch: Set trackpad irq and wake to GPP_A21
......................................................................

Patch Set 3: Code-Review+2

Change in ...coreboot[master]: mb/google/hatch: Set trackpad irq and wake to GPP_A21

[Paul Fagerburg (Code Review)]

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

Change subject: mb/google/hatch: Set trackpad irq and wake to GPP_A21
......................................................................

Patch Set 3: Code-Review+2

Change in ...coreboot[master]: 1;5200;0cmb/google/hatch: Set trackpad irq and wake to GPP_A21

[Shelley Chen (Code Review)]

Hello Paul Fagerburg, Aamir Bohra, Tim Wawrzynczak, Paul Menzel, build bot (Jenkins), Furquan Shaikh,

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

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

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

Change subject: 1;5200;0cmb/google/hatch: Set trackpad irq and wake to GPP_A21
......................................................................

1;5200;0cmb/google/hatch: Set trackpad irq and wake to GPP_A21

Previously, We had to use GPP_A21 for trackpad wake and GPP_D21 for
trackpad interrupts due to ITSS not honoring the INVERT config.  Now
that's fixed, we can configure trackpad wake and interrupts on GPP_A21
only.

BUG=b:130436471
BRANCH=None
TEST=1. boot a hatch device and make sure we can move the cursor with the trackpad
     2. Run powerd_dbus_suspend and wake by clicking on the trackpad and ensure
        through "mosys eventlog list" that the wake source is the trackpad.\
     3. Run "echo mem > /sys/power/state", wait until device goes into S3,
        click trackpad to ensure device wakes.

Change-Id: I26a99206c42ba442f91ae577b98366fc2fd6c0ca
Signed-off-by: Shelley Chen 
---
M src/mainboard/google/hatch/variants/baseboard/gpio.c
M src/mainboard/google/hatch/variants/hatch/overridetree.cb
2 files changed, 5 insertions(+), 13 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/20/33820/4

Change in ...coreboot[master]: 1;5200;0cmb/google/hatch: Set trackpad irq and wake to GPP_A21

[Shelley Chen (Code Review)]

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

Change subject: 1;5200;0cmb/google/hatch: Set trackpad irq and wake to GPP_A21
......................................................................

Patch Set 4:

(1 comment)

https://review.coreboot.org/#/c/33820/2//COMMIT_MSG 
Commit Message:

https://review.coreboot.org/#/c/33820/2//COMMIT_MSG@17 
PS2, Line 17: powerd_dbus_suspend
> What about wake from S3? Does that work too?

Yes, this works as well.

Change in ...coreboot[master]: mb/google/hatch: Set trackpad irq and wake to GPP_A21

[Shelley Chen (Code Review)]

Hello Paul Fagerburg, Aamir Bohra, Tim Wawrzynczak, Paul Menzel, build bot (Jenkins), Furquan Shaikh,

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

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

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

Change subject: mb/google/hatch: Set trackpad irq and wake to GPP_A21
......................................................................

mb/google/hatch: Set trackpad irq and wake to GPP_A21

Previously, We had to use GPP_A21 for trackpad wake and GPP_D21 for
trackpad interrupts due to ITSS not honoring the INVERT config.  Now
that's fixed, we can configure trackpad wake and interrupts on GPP_A21
only.

BUG=b:130436471
BRANCH=None
TEST=1. boot a hatch device and make sure we can move the cursor with the trackpad
     2. Run powerd_dbus_suspend and wake by clicking on the trackpad and ensure
        through "mosys eventlog list" that the wake source is the trackpad.\
     3. Run "echo mem > /sys/power/state", wait until device goes into S3,
        click trackpad to ensure device wakes.

Change-Id: I26a99206c42ba442f91ae577b98366fc2fd6c0ca
Signed-off-by: Shelley Chen 
---
M src/mainboard/google/hatch/variants/baseboard/gpio.c
M src/mainboard/google/hatch/variants/hatch/overridetree.cb
2 files changed, 5 insertions(+), 13 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/20/33820/5

Change in ...coreboot[master]: mb/google/hatch: Set trackpad irq and wake to GPP_A21

[Furquan Shaikh (Code Review)]

Furquan Shaikh has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/33820 )

Change subject: mb/google/hatch: Set trackpad irq and wake to GPP_A21
......................................................................

mb/google/hatch: Set trackpad irq and wake to GPP_A21

Previously, We had to use GPP_A21 for trackpad wake and GPP_D21 for
trackpad interrupts due to ITSS not honoring the INVERT config.  Now
that's fixed, we can configure trackpad wake and interrupts on GPP_A21
only.

BUG=b:130436471
BRANCH=None
TEST=1. boot a hatch device and make sure we can move the cursor with the trackpad
     2. Run powerd_dbus_suspend and wake by clicking on the trackpad and ensure
        through "mosys eventlog list" that the wake source is the trackpad.\
     3. Run "echo mem > /sys/power/state", wait until device goes into S3,
        click trackpad to ensure device wakes.

Change-Id: I26a99206c42ba442f91ae577b98366fc2fd6c0ca
Signed-off-by: Shelley Chen 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/33820
Tested-by: build bot (Jenkins) 
Reviewed-by: Tim Wawrzynczak 
Reviewed-by: Paul Fagerburg 
---
M src/mainboard/google/hatch/variants/baseboard/gpio.c
M src/mainboard/google/hatch/variants/hatch/overridetree.cb
2 files changed, 5 insertions(+), 13 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Tim Wawrzynczak: Looks good to me, approved
  Paul Fagerburg: Looks good to me, approved

diff --git a/src/mainboard/google/hatch/variants/baseboard/gpio.c b/src/mainboard/google/hatch/variants/baseboard/gpio.c
index a4fb4c9..56ae601 100644
--- a/src/mainboard/google/hatch/variants/baseboard/gpio.c
+++ b/src/mainboard/google/hatch/variants/baseboard/gpio.c
@@ -54,12 +54,8 @@
    PAD_CFG_GPO(GPP_A19, 1, DEEP),
    /* A20 : WLAN_INT_L */
    PAD_CFG_GPI_APIC(GPP_A20, NONE, PLTRST, LEVEL, INVERT),
-	/*
-	 * A21 : TRACKPAD_INT_ODL (wake)
-	 * TODO Combine into single gpio, when ITSS IPCx configuration
-	 * is fixed in FSP.
-	 */
-	PAD_CFG_GPI_SCI(GPP_A21, NONE, DEEP, EDGE_SINGLE, INVERT),
+	/* A21 : TRACKPAD_INT_ODL */
+	PAD_CFG_GPI_IRQ_WAKE(GPP_A21, NONE, DEEP, LEVEL, INVERT),
    /* A22 : FPMCU_PCH_BOOT0 */
    PAD_CFG_GPO(GPP_A22, 0, DEEP),
    /* A23 : FPMCU_PCH_INT_ODL */
@@ -209,12 +205,8 @@
    PAD_CFG_NF(GPP_D19, NONE, DEEP, NF1),
    /* D20 : DMIC_DATA_0_SNDW4_DATA */
    PAD_CFG_NF(GPP_D20, NONE, DEEP, NF1),
-	/*
-	 * D21 : TRACKPAD_INT_ODL
-	 * TODO Combine into single gpio with invert mode, when ITSS
-	 * IPCx configuration is fixed in FSP.
-	 */
-	PAD_CFG_GPI_APIC(GPP_D21, NONE, PLTRST, LEVEL, NONE),
+	/* D21 : GPP_D21 ==> NC */
+	PAD_NC(GPP_D21, NONE),
    /* D22 : GPP_D22 ==> NC */
    PAD_NC(GPP_D22, NONE),
    /* D23 : SPP_MCLK */
diff --git a/src/mainboard/google/hatch/variants/hatch/overridetree.cb b/src/mainboard/google/hatch/variants/hatch/overridetree.cb
index d676843..2582940 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_D21_IRQ)"
+				register "irq" = "ACPI_IRQ_EDGE_LOW(GPP_A21_IRQ)"
    			register "wake" = "GPE0_DW0_21"
    			device i2c 15 on end
    		end