mainboard/google/octopus: configure EC_AP_INT_ODL

Enable the EC_AP_INT_ODL interrupt on GPIO_134 for all octopus boards
that support it. Also removing unnecessary IO standby support since we
don't use this pin to wake up the SoC.

BRANCH=octopus
BUG=b:122552125,b:120679547
TEST=CTS tests with changes

Change-Id: I018864ae5fa400372b5b443e49828e8202b9aa4d
Signed-off-by: Jett Rink <jettrink@chromium.org>
Reviewed-on: https://review.coreboot.org/c/30788
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-by: Justin TerAvest <teravest@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

12 files changed, 18 insertions, 23 deletions

diff --git a/src/mainboard/google/octopus/variants/ampton/gpio.c b/src/mainboard/google/octopus/variants/ampton/gpio.c
index f34645d0650d..edc61d77d103 100644
--- a/src/mainboard/google/octopus/variants/ampton/gpio.c
+++ b/src/mainboard/google/octopus/variants/ampton/gpio.c
@@ -194,7 +194,9 @@ static const struct pad_config gpio_table[] = {
 	PAD_CFG_NF_IOSSTATE_IOSTERM(GPIO_132, NONE, DEEP, NF1, HIZCRx1, DISPUPD),/* HV_DDI1_HPD */
 	PAD_CFG_NF_IOSSTATE_IOSTERM(GPIO_133, NONE, DEEP, NF1, HIZCRx1, DISPUPD),/* HV_EDP_HPD */
 
-	PAD_NC(GPIO_134, NONE),/* GPIO_134 -- EC_AP_INT_ODL */
+	/* EC_AP_INT_ODL */
+	PAD_CFG_GPI_APIC_LOW(GPIO_134, NONE, DEEP),
+
 	/* GPIO_135 -- TRACKPAD_INT1_1V8_ODL */
 	PAD_CFG_GPI_IRQ_WAKE(GPIO_135, NONE, DEEP, LEVEL, INVERT),
 	PAD_CFG_GPI_APIC_IOS(GPIO_136, NONE, DEEP, LEVEL, INVERT, TxDRxE, DISPUPD),/* GPIO_136 -- PMIC_PCH_INT_ODL */
diff --git a/src/mainboard/google/octopus/variants/ampton/include/variant/ec.h b/src/mainboard/google/octopus/variants/ampton/include/variant/ec.h
index 16f931b6cdf5..b75794a12415 100644
--- a/src/mainboard/google/octopus/variants/ampton/include/variant/ec.h
+++ b/src/mainboard/google/octopus/variants/ampton/include/variant/ec.h
@@ -18,4 +18,7 @@
 
 #include <baseboard/ec.h>
 
+/* Enable EC sync interrupt, EC_SYNC_IRQ is defined in variant/gpio.h */
+#define EC_ENABLE_SYNC_IRQ
+
 #endif
diff --git a/src/mainboard/google/octopus/variants/ampton/include/variant/gpio.h b/src/mainboard/google/octopus/variants/ampton/include/variant/gpio.h
index 1fd1e11716cb..a59bbf4a9eb4 100644
--- a/src/mainboard/google/octopus/variants/ampton/include/variant/gpio.h
+++ b/src/mainboard/google/octopus/variants/ampton/include/variant/gpio.h
@@ -18,4 +18,7 @@
 
 #include <baseboard/gpio.h>
 
+/* EC sync irq is GPP_134_IRQ */
+#define EC_SYNC_IRQ	GPIO_134_IRQ
+
 #endif /* MAINBOARD_GPIO_H */
diff --git a/src/mainboard/google/octopus/variants/baseboard/gpio.c b/src/mainboard/google/octopus/variants/baseboard/gpio.c
index 566422d39037..3828ae9d208f 100644
--- a/src/mainboard/google/octopus/variants/baseboard/gpio.c
+++ b/src/mainboard/google/octopus/variants/baseboard/gpio.c
@@ -195,7 +195,9 @@ static const struct pad_config gpio_table[] = {
 	PAD_CFG_NF_IOSSTATE_IOSTERM(GPIO_132, NONE, DEEP, NF1, HIZCRx1, DISPUPD),/* HV_DDI1_HPD */
 	PAD_CFG_NF_IOSSTATE_IOSTERM(GPIO_133, NONE, DEEP, NF1, HIZCRx1, DISPUPD),/* HV_EDP_HPD */
 
-	PAD_NC(GPIO_134, NONE),/* GPIO_134 -- unused */
+	/* EC_AP_INT_ODL */
+	PAD_CFG_GPI_APIC_LOW(GPIO_134, NONE, DEEP),
+
 	PAD_CFG_GPI_IRQ_WAKE(GPIO_135, NONE, DEEP, LEVEL, INVERT),/* GPIO_135 -- TRACKPAD_INT1_1V8_ODL */
 	PAD_CFG_GPI_APIC_IOS(GPIO_136, NONE, DEEP, LEVEL, INVERT, TxDRxE, DISPUPD),/* GPIO_136 -- PMIC_PCH_INT_ODL */
 	PAD_CFG_GPI_APIC_IOS(GPIO_137, NONE, DEEP, LEVEL, INVERT, HIZCRx1, DISPUPD),/* GPIO_137 -- HP_INT_ODL */
diff --git a/src/mainboard/google/octopus/variants/baseboard/include/baseboard/ec.h b/src/mainboard/google/octopus/variants/baseboard/include/baseboard/ec.h
index d416673eb53e..e86dc2db8053 100644
--- a/src/mainboard/google/octopus/variants/baseboard/include/baseboard/ec.h
+++ b/src/mainboard/google/octopus/variants/baseboard/include/baseboard/ec.h
@@ -84,4 +84,7 @@
 #define SIO_EC_HOST_ENABLE       /* EC Host Interface Resources */
 #define SIO_EC_ENABLE_PS2K       /* Enable PS/2 Keyboard */
 
+/* Enable EC sync interrupt, EC_SYNC_IRQ is defined in baseboard/gpio.h */
+#define EC_ENABLE_SYNC_IRQ
+
 #endif
diff --git a/src/mainboard/google/octopus/variants/baseboard/include/baseboard/gpio.h b/src/mainboard/google/octopus/variants/baseboard/include/baseboard/gpio.h
index b29ec38b1c6f..b40840377fa7 100644
--- a/src/mainboard/google/octopus/variants/baseboard/include/baseboard/gpio.h
+++ b/src/mainboard/google/octopus/variants/baseboard/include/baseboard/gpio.h
@@ -39,4 +39,7 @@
 #define MEM_CONFIG2	GPIO_70
 #define MEM_CONFIG3	GPIO_71
 
+/* EC sync irq is GPP_134_IRQ */
+#define EC_SYNC_IRQ	GPIO_134_IRQ
+
 #endif /* BASEBOARD_GPIO_H */
diff --git a/src/mainboard/google/octopus/variants/bobba/gpio.c b/src/mainboard/google/octopus/variants/bobba/gpio.c
index acdcf975e440..e11f6cf34196 100644
--- a/src/mainboard/google/octopus/variants/bobba/gpio.c
+++ b/src/mainboard/google/octopus/variants/bobba/gpio.c
@@ -22,10 +22,6 @@
 static const struct pad_config default_override_table[] = {
 	PAD_NC(GPIO_104, UP_20K),
 
-	/* CAM_SOC_EC_SYNC */
-	PAD_CFG_GPI_APIC_IOS(GPIO_134, NONE, DEEP, LEVEL, INVERT, TxDRxE,
-			     DISPUPD),
-
 	/* EN_PP3300_TOUCHSCREEN */
 	PAD_CFG_GPO_IOSSTATE_IOSTERM(GPIO_146, 0, DEEP, NONE, Tx0RxDCRx0,
 				     DISPUPD),
diff --git a/src/mainboard/google/octopus/variants/bobba/include/variant/ec.h b/src/mainboard/google/octopus/variants/bobba/include/variant/ec.h
index b75794a12415..16f931b6cdf5 100644
--- a/src/mainboard/google/octopus/variants/bobba/include/variant/ec.h
+++ b/src/mainboard/google/octopus/variants/bobba/include/variant/ec.h
@@ -18,7 +18,4 @@
 
 #include <baseboard/ec.h>
 
-/* Enable EC sync interrupt, EC_SYNC_IRQ is defined in variant/gpio.h */
-#define EC_ENABLE_SYNC_IRQ
-
 #endif
diff --git a/src/mainboard/google/octopus/variants/bobba/include/variant/gpio.h b/src/mainboard/google/octopus/variants/bobba/include/variant/gpio.h
index a59bbf4a9eb4..1fd1e11716cb 100644
--- a/src/mainboard/google/octopus/variants/bobba/include/variant/gpio.h
+++ b/src/mainboard/google/octopus/variants/bobba/include/variant/gpio.h
@@ -18,7 +18,4 @@
 
 #include <baseboard/gpio.h>
 
-/* EC sync irq is GPP_134_IRQ */
-#define EC_SYNC_IRQ	GPIO_134_IRQ
-
 #endif /* MAINBOARD_GPIO_H */
diff --git a/src/mainboard/google/octopus/variants/casta/gpio.c b/src/mainboard/google/octopus/variants/casta/gpio.c
index ba26e31d2fe3..1746e4ff6ba3 100644
--- a/src/mainboard/google/octopus/variants/casta/gpio.c
+++ b/src/mainboard/google/octopus/variants/casta/gpio.c
@@ -38,9 +38,6 @@ static const struct pad_config default_override_table[] = {
 
 	/* PCIE_CLKREQ3_B -- unused */
 	PAD_CFG_NF_IOSSTATE_IOSTERM(GPIO_122, UP_20K, DEEP, NF1, HIZCRx1, ENPU),
-	/* CAM_SOC_EC_SYNC */
-	PAD_CFG_GPI_APIC_IOS(GPIO_134, NONE, DEEP, EDGE_SINGLE, INVERT, TxDRxE,
-			     DISPUPD),
 
 	PAD_NC(GPIO_138, UP_20K), /* PEN_PDCT_ODL -- unused */
 	PAD_NC(GPIO_139, UP_20K), /* PEN_INT_ODL -- unused */
diff --git a/src/mainboard/google/octopus/variants/fleex/gpio.c b/src/mainboard/google/octopus/variants/fleex/gpio.c
index 39d239b91f00..b1f377b32bf1 100644
--- a/src/mainboard/google/octopus/variants/fleex/gpio.c
+++ b/src/mainboard/google/octopus/variants/fleex/gpio.c
@@ -28,10 +28,6 @@ static const struct pad_config default_override_table[] = {
 	PAD_NC(GPIO_67, UP_20K),
 	PAD_NC(GPIO_117, UP_20K),
 
-	/* CAM_SOC_EC_SYNC */
-	PAD_CFG_GPI_APIC_IOS(GPIO_134, NONE, DEEP, EDGE_SINGLE, INVERT, TxDRxE,
-			     DISPUPD),
-
 	PAD_NC(GPIO_138, DN_20K),
 	PAD_NC(GPIO_139, DN_20K),
 	PAD_NC(GPIO_140, UP_20K),
diff --git a/src/mainboard/google/octopus/variants/meep/gpio.c b/src/mainboard/google/octopus/variants/meep/gpio.c
index 7e572875c326..001a48856c48 100644
--- a/src/mainboard/google/octopus/variants/meep/gpio.c
+++ b/src/mainboard/google/octopus/variants/meep/gpio.c
@@ -21,10 +21,6 @@
 static const struct pad_config default_override_table[] = {
 	PAD_NC(GPIO_104, UP_20K),
 
-	/* CAM_SOC_EC_SYNC */
-	PAD_CFG_GPI_APIC_IOS(GPIO_134, NONE, DEEP, EDGE_SINGLE, INVERT, TxDRxE,
-			     DISPUPD),
-
 	/* EN_PP3300_TOUCHSCREEN */
 	PAD_CFG_GPO_IOSSTATE_IOSTERM(GPIO_146, 0, DEEP, NONE, Tx0RxDCRx0,
 				     DISPUPD),