Change in ...coreboot[master]: mb/google/hatch: Set up Wake GPIO from EC

[Shelley Chen (Code Review)]

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

Change subject: mb/google/hatch: Set up Wake GPIO from EC
......................................................................

mb/google/hatch: Set up Wake GPIO from EC

BUG=b:123325238
BRANCH=None
TEST=from AP console: powerd_dbus_suspend
     from EC console: gpioset PCH_WAKE_L 0
     Make sure device wakes up

Change-Id: I53d5291a6b9ab9a21e89ccd21f172180ce473bd5
Signed-off-by: Shelley Chen 
---
M src/mainboard/google/hatch/variants/baseboard/devicetree.cb
M src/mainboard/google/hatch/variants/baseboard/gpio.c
2 files changed, 8 insertions(+), 1 deletion(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/00/31100/1

diff --git a/src/mainboard/google/hatch/variants/baseboard/devicetree.cb b/src/mainboard/google/hatch/variants/baseboard/devicetree.cb
index 30a282b..a075647 100644
--- a/src/mainboard/google/hatch/variants/baseboard/devicetree.cb
+++ b/src/mainboard/google/hatch/variants/baseboard/devicetree.cb
@@ -250,7 +250,11 @@
    		end
    	end # GSPI #0
    	device pci 1e.3 off end # GSPI #1
-		device pci 1f.0 on end # LPC/eSPI
+		device pci 1f.0 on
+			chip ec/google/chromeec
+				device pnp 0c09.0 on end
+			end
+		end # LPC Interface
    	device pci 1f.1 on  end # P2SB
    	device pci 1f.2 on  end # Power Management Controller
    	device pci 1f.3 off end # Intel HDA
diff --git a/src/mainboard/google/hatch/variants/baseboard/gpio.c b/src/mainboard/google/hatch/variants/baseboard/gpio.c
index ade9ed2..a078997 100644
--- a/src/mainboard/google/hatch/variants/baseboard/gpio.c
+++ b/src/mainboard/google/hatch/variants/baseboard/gpio.c
@@ -143,6 +143,9 @@
    PAD_CFG_NF(GPP_G6, NONE, DEEP, NF1),
    /* SD_WP => NC */
    PAD_NC(GPP_G7, DN_20K),
+
+	/* GPD2: LAN_WAKE# ==> EC_PCH_WAKE_OD */
+	PAD_CFG_NF(GPD2, NONE, DEEP, NF1),
 };

const struct pad_config *__weak variant_gpio_table(size_t *num)

[Furquan Shaikh (Code Review)]

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

Change subject: mb/google/hatch: Set up Wake GPIO from EC
......................................................................

Patch Set 1:

(2 comments)

https://review.coreboot.org/#/c/31100/1//COMMIT_MSG 
Commit Message:

https://review.coreboot.org/#/c/31100/1//COMMIT_MSG@13 
PS1, Line 13:  Make sure device wakes up
Did lidopen, keyboard press also wake up the AP?

https://review.coreboot.org/#/c/31100/1/src/mainboard/google/hatch/variants/... 
File src/mainboard/google/hatch/variants/baseboard/devicetree.cb:

https://review.coreboot.org/#/c/31100/1/src/mainboard/google/hatch/variants/... 
PS1, Line 257: LPC Interface
Hatch actually uses eSPI.

[Furquan Shaikh (Code Review)]

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

Change subject: mb/google/hatch: Set up Wake GPIO from EC
......................................................................

Patch Set 1:

(1 comment)

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

https://review.coreboot.org/#/c/31100/1/src/mainboard/google/hatch/variants/... 
PS1, Line 22: 	/* SD_1P8_SEL => NC */
Not for this CL, but all the GPIOs should be configured in this table.

[Duncan Laurie (Code Review)]

Duncan Laurie has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31100 )

Change subject: mb/google/hatch: Set up Wake GPIO from EC
......................................................................

Patch Set 1:

I think you need to define EC_ENABLE_WAKE_PIN as well in order to get the ACPI _PRW method filled out.

[Shelley Chen (Code Review)]

Hello Aaron Durbin, Aamir Bohra, Duncan Laurie, Scott Collyer, build bot (Jenkins), Furquan Shaikh,

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

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

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

Change subject: mb/google/hatch: Set up Wake GPIO from EC
......................................................................

mb/google/hatch: Set up Wake GPIO from EC

BUG=b:123325238
BRANCH=None
TEST=from AP console: powerd_dbus_suspend
     from EC console: gpioset PCH_WAKE_L 0
     Make sure device wakes up

Change-Id: I53d5291a6b9ab9a21e89ccd21f172180ce473bd5
Signed-off-by: Shelley Chen 
---
M src/mainboard/google/hatch/variants/baseboard/devicetree.cb
M src/mainboard/google/hatch/variants/baseboard/gpio.c
2 files changed, 8 insertions(+), 1 deletion(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/00/31100/2

[Furquan Shaikh (Code Review)]

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

Change subject: mb/google/hatch: Set up Wake GPIO from EC
......................................................................

Patch Set 2:
> Patch Set 1:
>
> I think you need to define EC_ENABLE_WAKE_PIN as well in order to get the ACPI _PRW method filled out.

That is already done here: https://review.coreboot.org/cgit/coreboot.git/tree/src/mainboard/google/hatc...

[Shelley Chen (Code Review)]

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

Change subject: mb/google/hatch: Set up Wake GPIO from EC
......................................................................

Patch Set 2:

(1 comment)

https://review.coreboot.org/#/c/31100/1//COMMIT_MSG 
Commit Message:

https://review.coreboot.org/#/c/31100/1//COMMIT_MSG@13 
PS1, Line 13:  Make sure device wakes up
> Did lidopen, keyboard press also wake up the AP?

No, but I couldn't see any hostevents set for either of those, so I thought that it was because the EC wasn't actually setting PCH_WAKE_L (I didn't see it set when I did a gpioget PCH_WAKE_L).  So, I tested it by gpiosetting PCH_WAKE_L to 0 and the device did indeed wake up as a result.

[Shelley Chen (Code Review)]

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

Change subject: mb/google/hatch: Set up Wake GPIO from EC
......................................................................

Patch Set 2:
> Patch Set 1:
>
> I think you need to define EC_ENABLE_WAKE_PIN as well in order to get the ACPI _PRW method filled out.

That's done here: https://cs.corp.google.com/chromeos_public/src/third_party/coreboot/src/main...

Do we need anything else?

[Duncan Laurie (Code Review)]

Duncan Laurie has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31100 )

Change subject: mb/google/hatch: Set up Wake GPIO from EC
......................................................................

Patch Set 2:
> Patch Set 2:
> > Patch Set 1:
> >
> > I think you need to define EC_ENABLE_WAKE_PIN as well in order to get the ACPI _PRW method filled out.
>
> That's done here: https://cs.corp.google.com/chromeos_public/src/third_party/coreboot/src/main...
>
> Do we need anything else?

No sorry I just had a very old tree I was looking at which had only half the patches merged.

[Furquan Shaikh (Code Review)]

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

Change subject: mb/google/hatch: Set up Wake GPIO from EC
......................................................................

Patch Set 2:

(1 comment)

https://review.coreboot.org/#/c/31100/1//COMMIT_MSG 
Commit Message:

https://review.coreboot.org/#/c/31100/1//COMMIT_MSG@13 
PS1, Line 13:  Make sure device wakes up
> No, but I couldn't see any hostevents set for either of those, so I thought that it was because the  […]

Is the AP setting the masks correctly? i.e. SCI, wake, etc.

[Shelley Chen (Code Review)]

Hello Aaron Durbin, Aamir Bohra, Duncan Laurie, Scott Collyer, build bot (Jenkins), Furquan Shaikh,

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

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

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

Change subject: mb/google/hatch: Set up Wake GPIO from EC
......................................................................

mb/google/hatch: Set up Wake GPIO from EC

Initialized EC_PCH_WAKE_ODL GPIO to make sure that ec events will wake
the AP from suspend.  Also created a task to initialize the hostevent
wake mask properly.

BUG=b:123325238
BRANCH=None
TEST=from AP console: powerd_dbus_suspend
     from EC console: hostevent (make sure wake mask set)
     from EC console: gpioset PCH_WAKE_L 0
     Make sure device wakes up
     Also, checked to make sure keyboard press wakes up
     device from S3.

Change-Id: I53d5291a6b9ab9a21e89ccd21f172180ce473bd5
Signed-off-by: Shelley Chen 
---
M src/mainboard/google/hatch/Makefile.inc
A src/mainboard/google/hatch/ec.c
A src/mainboard/google/hatch/ec.h
M src/mainboard/google/hatch/ramstage.c
M src/mainboard/google/hatch/variants/baseboard/devicetree.cb
M src/mainboard/google/hatch/variants/baseboard/gpio.c
6 files changed, 129 insertions(+), 1 deletion(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/00/31100/3

[Shelley Chen (Code Review)]

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

Change subject: mb/google/hatch: Set up Wake GPIO from EC
......................................................................

Patch Set 3:

(1 comment)

https://review.coreboot.org/#/c/31100/1//COMMIT_MSG 
Commit Message:

https://review.coreboot.org/#/c/31100/1//COMMIT_MSG@13 
PS1, Line 13:  Make sure device wakes up
> Is the AP setting the masks correctly? i.e. SCI, wake, etc.

I added a task to set the hostevent wake masks in the latest patchset.

[Furquan Shaikh (Code Review)]

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

Change subject: mb/google/hatch: Set up Wake GPIO from EC
......................................................................

Patch Set 3:

(5 comments)

https://review.coreboot.org/#/c/31100/3/src/mainboard/google/hatch/Makefile.... 
File src/mainboard/google/hatch/Makefile.inc:

https://review.coreboot.org/#/c/31100/3/src/mainboard/google/hatch/Makefile.... 
PS3, Line 28: smm-$(CONFIG_EC_GOOGLE_CHROMEEC) += ec.c
Why is this required?

https://review.coreboot.org/#/c/31100/3/src/mainboard/google/hatch/ec.h 
File src/mainboard/google/hatch/ec.h:

PS3: 
This file is already present here: https://review.coreboot.org/cgit/coreboot.git/tree/src/mainboard/google/hatc...

https://review.coreboot.org/#/c/31100/3/src/mainboard/google/hatch/ec.c 
File src/mainboard/google/hatch/ec.c:

https://review.coreboot.org/#/c/31100/3/src/mainboard/google/hatch/ec.c@18 
PS3, Line 18: "ec.h"
<variant/ec.h>

https://review.coreboot.org/#/c/31100/3/src/mainboard/google/hatch/ec.c@26 
PS3, Line 26: .s3_device_events = MAINBOARD_EC_S3_DEVICE_EVENTS,
Not required.

https://review.coreboot.org/#/c/31100/3/src/mainboard/google/hatch/ec.c@27 
PS3, Line 27: 		.s5_wake_events = MAINBOARD_EC_S5_WAKE_EVENTS,
.s0ix_wake_events =

[Furquan Shaikh (Code Review)]

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

Change subject: mb/google/hatch: Set up Wake GPIO from EC
......................................................................

Patch Set 3:

(1 comment)

https://review.coreboot.org/#/c/31100/3//COMMIT_MSG 
Commit Message:

https://review.coreboot.org/#/c/31100/3//COMMIT_MSG@7 
PS3, Line 7: Set up Wake GPIO from EC
This CL is now doing more than just enable wake gpio.

[Paul Menzel (Code Review)]

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

Change subject: mb/google/hatch: Set up Wake GPIO from EC
......................................................................

Patch Set 3:

(2 comments)

https://review.coreboot.org/#/c/31100/3//COMMIT_MSG 
Commit Message:

https://review.coreboot.org/#/c/31100/3//COMMIT_MSG@9 
PS3, Line 9: Initialized
Initialize

https://review.coreboot.org/#/c/31100/3//COMMIT_MSG@10 
PS3, Line 10: created
create

Change in ...coreboot[master]: mb/google/hatch: Enable AP Wake from EC

[Shelley Chen (Code Review)]

Hello Aaron Durbin, Aamir Bohra, Duncan Laurie, Scott Collyer, build bot (Jenkins), Furquan Shaikh, Patrick Georgi, Martin Roth,

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

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

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

Change subject: mb/google/hatch: Enable AP Wake from EC
......................................................................

mb/google/hatch: Enable AP Wake from EC

Initialize EC_PCH_WAKE_ODL GPIO to make sure that ec events will wake
the AP from suspend.  Also create a task to initialize the hostevent
wake mask properly.

BUG=b:123325238
BRANCH=None
TEST=from AP console: powerd_dbus_suspend
     from EC console: hostevent (make sure wake mask set)
     from EC console: gpioset PCH_WAKE_L 0
     Make sure device wakes up
     Also, checked to make sure keyboard press wakes up
     device from S3.

Change-Id: I53d5291a6b9ab9a21e89ccd21f172180ce473bd5
Signed-off-by: Shelley Chen 
---
M src/mainboard/google/hatch/Makefile.inc
A src/mainboard/google/hatch/ec.c
M src/mainboard/google/hatch/ramstage.c
M src/mainboard/google/hatch/variants/baseboard/devicetree.cb
M src/mainboard/google/hatch/variants/baseboard/gpio.c
M src/mainboard/google/hatch/variants/baseboard/include/baseboard/ec.h
6 files changed, 46 insertions(+), 1 deletion(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/00/31100/4

Change in ...coreboot[master]: mb/google/hatch: Enable AP Wake from EC

[Furquan Shaikh (Code Review)]

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

Change subject: mb/google/hatch: Enable AP Wake from EC
......................................................................

Patch Set 4: Code-Review+2

(1 comment)

https://review.coreboot.org/#/c/31100/4//COMMIT_MSG 
Commit Message:

https://review.coreboot.org/#/c/31100/4//COMMIT_MSG@20 
PS4, Line 20:      device from S3.
I am guessing wake from lidopen works too?

Change in ...coreboot[master]: mb/google/hatch: Enable AP Wake from EC

[Shelley Chen (Code Review)]

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

Change subject: mb/google/hatch: Enable AP Wake from EC
......................................................................

Patch Set 4:

(1 comment)

https://review.coreboot.org/#/c/31100/4//COMMIT_MSG 
Commit Message:

https://review.coreboot.org/#/c/31100/4//COMMIT_MSG@20 
PS4, Line 20:      device from S3.
> I am guessing wake from lidopen works too?

Yes, that is working as well.

Change in ...coreboot[master]: mb/google/hatch: Enable AP Wake from EC

[Furquan Shaikh (Code Review)]

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

Change subject: mb/google/hatch: Enable AP Wake from EC
......................................................................

Patch Set 4:

(1 comment)

https://review.coreboot.org/#/c/31100/4//COMMIT_MSG 
Commit Message:

https://review.coreboot.org/#/c/31100/4//COMMIT_MSG@20 
PS4, Line 20:      device from S3.
> Yes, that is working as well.

Can you please add b:123325720 as well?

Change in ...coreboot[master]: mb/google/hatch: Enable AP Wake from EC

[Shelley Chen (Code Review)]

Hello Aaron Durbin, Aamir Bohra, Duncan Laurie, Scott Collyer, build bot (Jenkins), Furquan Shaikh, Patrick Georgi, Martin Roth,

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

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

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

Change subject: mb/google/hatch: Enable AP Wake from EC
......................................................................

mb/google/hatch: Enable AP Wake from EC

Initialize EC_PCH_WAKE_ODL GPIO to make sure that ec events will wake
the AP from suspend.  Also create a task to initialize the hostevent
wake mask properly.

BUG=b:123325238,b:123325720
BRANCH=None
TEST=from AP console: powerd_dbus_suspend
     from EC console: hostevent (make sure wake mask set)
     from EC console: gpioset PCH_WAKE_L 0
     Make sure device wakes up
     Also, checked to make sure keyboard press wakes up
     device from S3.

Change-Id: I53d5291a6b9ab9a21e89ccd21f172180ce473bd5
Signed-off-by: Shelley Chen 
---
M src/mainboard/google/hatch/Makefile.inc
A src/mainboard/google/hatch/ec.c
M src/mainboard/google/hatch/ramstage.c
M src/mainboard/google/hatch/variants/baseboard/devicetree.cb
M src/mainboard/google/hatch/variants/baseboard/gpio.c
M src/mainboard/google/hatch/variants/baseboard/include/baseboard/ec.h
6 files changed, 46 insertions(+), 1 deletion(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/00/31100/5

Change in ...coreboot[master]: mb/google/hatch: Enable AP Wake from EC

[Furquan Shaikh (Code Review)]

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

Change subject: mb/google/hatch: Enable AP Wake from EC
......................................................................

mb/google/hatch: Enable AP Wake from EC

Initialize EC_PCH_WAKE_ODL GPIO to make sure that ec events will wake
the AP from suspend.  Also create a task to initialize the hostevent
wake mask properly.

BUG=b:123325238,b:123325720
BRANCH=None
TEST=from AP console: powerd_dbus_suspend
     from EC console: hostevent (make sure wake mask set)
     from EC console: gpioset PCH_WAKE_L 0
     Make sure device wakes up
     Also, checked to make sure keyboard press wakes up
     device from S3.

Change-Id: I53d5291a6b9ab9a21e89ccd21f172180ce473bd5
Signed-off-by: Shelley Chen 
Reviewed-on: https://review.coreboot.org/c/31100
Tested-by: build bot (Jenkins) 
Reviewed-by: Furquan Shaikh 
---
M src/mainboard/google/hatch/Makefile.inc
A src/mainboard/google/hatch/ec.c
M src/mainboard/google/hatch/ramstage.c
M src/mainboard/google/hatch/variants/baseboard/devicetree.cb
M src/mainboard/google/hatch/variants/baseboard/gpio.c
M src/mainboard/google/hatch/variants/baseboard/include/baseboard/ec.h
6 files changed, 46 insertions(+), 1 deletion(-)

Approvals:
  build bot (Jenkins): Verified
  Furquan Shaikh: Looks good to me, approved

diff --git a/src/mainboard/google/hatch/Makefile.inc b/src/mainboard/google/hatch/Makefile.inc
index ca8c7f2..3f35f82 100644
--- a/src/mainboard/google/hatch/Makefile.inc
+++ b/src/mainboard/google/hatch/Makefile.inc
@@ -18,6 +18,7 @@

ramstage-y += ramstage.c
 ramstage-$(CONFIG_CHROMEOS) += chromeos.c
+ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC) += ec.c

romstage-y += romstage.c
 romstage-$(CONFIG_CHROMEOS) += chromeos.c
diff --git a/src/mainboard/google/hatch/ec.c b/src/mainboard/google/hatch/ec.c
new file mode 100644
index 0000000..9fb3d80
--- /dev/null
+++ b/src/mainboard/google/hatch/ec.c
@@ -0,0 +1,32 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright 2019 Google LLC
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <arch/acpi.h>
+#include <ec/ec.h>
+#include <ec/google/chromeec/ec.h>
+#include <variant/ec.h>
+
+void mainboard_ec_init(void)
+{
+	const struct google_chromeec_event_info info = {
+		.log_events = MAINBOARD_EC_LOG_EVENTS,
+		.sci_events = MAINBOARD_EC_SCI_EVENTS,
+		.s3_wake_events = MAINBOARD_EC_S3_WAKE_EVENTS,
+		.s5_wake_events = MAINBOARD_EC_S5_WAKE_EVENTS,
+		.s0ix_wake_events = MAINBOARD_EC_S0IX_WAKE_EVENTS,
+	};
+
+	google_chromeec_events_init(&info, acpi_is_wakeup_s3());
+}
diff --git a/src/mainboard/google/hatch/ramstage.c b/src/mainboard/google/hatch/ramstage.c
index d139eff..b8e80e7 100644
--- a/src/mainboard/google/hatch/ramstage.c
+++ b/src/mainboard/google/hatch/ramstage.c
@@ -15,6 +15,7 @@

#include <arch/acpi.h>
 #include <baseboard/variants.h>
+#include <ec/ec.h>
 #include <soc/ramstage.h>
 #include <variant/gpio.h>
 #include <vendorcode/google/chromeos/chromeos.h>
@@ -30,6 +31,8 @@

static void mainboard_enable(struct device *dev)
 {
+	mainboard_ec_init();
+
    dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
 }

diff --git a/src/mainboard/google/hatch/variants/baseboard/devicetree.cb b/src/mainboard/google/hatch/variants/baseboard/devicetree.cb
index 30a282b..cea64e4 100644
--- a/src/mainboard/google/hatch/variants/baseboard/devicetree.cb
+++ b/src/mainboard/google/hatch/variants/baseboard/devicetree.cb
@@ -250,7 +250,11 @@
    		end
    	end # GSPI #0
    	device pci 1e.3 off end # GSPI #1
-		device pci 1f.0 on end # LPC/eSPI
+		device pci 1f.0 on
+			chip ec/google/chromeec
+				device pnp 0c09.0 on end
+			end
+		end # eSPI Interface
    	device pci 1f.1 on  end # P2SB
    	device pci 1f.2 on  end # Power Management Controller
    	device pci 1f.3 off end # Intel HDA
diff --git a/src/mainboard/google/hatch/variants/baseboard/gpio.c b/src/mainboard/google/hatch/variants/baseboard/gpio.c
index ade9ed2..a078997 100644
--- a/src/mainboard/google/hatch/variants/baseboard/gpio.c
+++ b/src/mainboard/google/hatch/variants/baseboard/gpio.c
@@ -143,6 +143,9 @@
    PAD_CFG_NF(GPP_G6, NONE, DEEP, NF1),
    /* SD_WP => NC */
    PAD_NC(GPP_G7, DN_20K),
+
+	/* GPD2: LAN_WAKE# ==> EC_PCH_WAKE_OD */
+	PAD_CFG_NF(GPD2, NONE, DEEP, NF1),
 };

const struct pad_config *__weak variant_gpio_table(size_t *num)
diff --git a/src/mainboard/google/hatch/variants/baseboard/include/baseboard/ec.h b/src/mainboard/google/hatch/variants/baseboard/include/baseboard/ec.h
index c60699e..f9cebd7 100644
--- a/src/mainboard/google/hatch/variants/baseboard/include/baseboard/ec.h
+++ b/src/mainboard/google/hatch/variants/baseboard/include/baseboard/ec.h
@@ -52,6 +52,8 @@
     EC_HOST_EVENT_MASK(EC_HOST_EVENT_KEY_PRESSED) |\
     EC_HOST_EVENT_MASK(EC_HOST_EVENT_MODE_CHANGE))

+#define MAINBOARD_EC_S0IX_WAKE_EVENTS   (MAINBOARD_EC_S3_WAKE_EVENTS)
+
 /* Log EC wake events plus EC shutdown events */
 #define MAINBOARD_EC_LOG_EVENTS \
    (EC_HOST_EVENT_MASK(EC_HOST_EVENT_THERMAL_SHUTDOWN) |\