Change in ...coreboot[master]: mainboard/google/octopus: configure EC_AP_INT_ODL - coreboot-gerrit

9 Jan 2019

Jett Rink has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/30788
Change subject: mainboard/google/octopus: configure EC_AP_INT_ODL
......................................................................
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.
BRANCH=octopus
BUG=b:122552125
TEST=CTS tests with changes
Change-Id: I018864ae5fa400372b5b443e49828e8202b9aa4d
Signed-off-by: Jett Rink jettrink@chromium.org
---
M src/mainboard/google/octopus/variants/ampton/gpio.c
M src/mainboard/google/octopus/variants/ampton/include/variant/ec.h
M src/mainboard/google/octopus/variants/ampton/include/variant/gpio.h
M src/mainboard/google/octopus/variants/bobba/gpio.c
M src/mainboard/google/octopus/variants/casta/gpio.c
M src/mainboard/google/octopus/variants/casta/include/variant/ec.h
M src/mainboard/google/octopus/variants/casta/include/variant/gpio.h
M src/mainboard/google/octopus/variants/fleex/gpio.c
M src/mainboard/google/octopus/variants/fleex/include/variant/ec.h
M src/mainboard/google/octopus/variants/fleex/include/variant/gpio.h
M src/mainboard/google/octopus/variants/meep/gpio.c
M src/mainboard/google/octopus/variants/meep/include/variant/ec.h
M src/mainboard/google/octopus/variants/meep/include/variant/gpio.h
M src/mainboard/google/octopus/variants/phaser/gpio.c
M src/mainboard/google/octopus/variants/phaser/include/variant/ec.h
M src/mainboard/google/octopus/variants/phaser/include/variant/gpio.h
16 files changed, 50 insertions(+), 8 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/88/30788/1

diff --git a/src/mainboard/google/octopus/variants/ampton/gpio.c b/src/mainboard/google/octopus/variants/ampton/gpio.c
index f34645d..f9eb718 100644
--- a/src/mainboard/google/octopus/variants/ampton/gpio.c
+++ b/src/mainboard/google/octopus/variants/ampton/gpio.c
@@ -194,7 +194,10 @@
    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_IOS(GPIO_134, NONE, DEEP, LEVEL, INVERT, TxDRxE,
+			     DISPUPD),
+
    /* 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 16f931b..b75794a 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 1fd1e11..a59bbf4 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/bobba/gpio.c b/src/mainboard/google/octopus/variants/bobba/gpio.c
index acdcf97..f1a3973 100644
--- a/src/mainboard/google/octopus/variants/bobba/gpio.c
+++ b/src/mainboard/google/octopus/variants/bobba/gpio.c
@@ -22,7 +22,7 @@
 static const struct pad_config default_override_table[] = {
    PAD_NC(GPIO_104, UP_20K),
-	/* CAM_SOC_EC_SYNC */
+	/* EC_AP_INT_ODL */
    PAD_CFG_GPI_APIC_IOS(GPIO_134, NONE, DEEP, LEVEL, INVERT, TxDRxE,
    		     DISPUPD),
diff --git a/src/mainboard/google/octopus/variants/casta/gpio.c b/src/mainboard/google/octopus/variants/casta/gpio.c
index ba26e31..bbb8a98 100644
--- a/src/mainboard/google/octopus/variants/casta/gpio.c
+++ b/src/mainboard/google/octopus/variants/casta/gpio.c
@@ -38,8 +38,9 @@
/* 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,
+
+	/* EC_AP_INT_ODL */
+	PAD_CFG_GPI_APIC_IOS(GPIO_134, NONE, DEEP, LEVEL, INVERT, TxDRxE,
    		     DISPUPD),
PAD_NC(GPIO_138, UP_20K), /* PEN_PDCT_ODL -- unused */
diff --git a/src/mainboard/google/octopus/variants/casta/include/variant/ec.h b/src/mainboard/google/octopus/variants/casta/include/variant/ec.h
index 16f931b..b75794a 100644
--- a/src/mainboard/google/octopus/variants/casta/include/variant/ec.h
+++ b/src/mainboard/google/octopus/variants/casta/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/casta/include/variant/gpio.h b/src/mainboard/google/octopus/variants/casta/include/variant/gpio.h
index 1fd1e11..a59bbf4 100644
--- a/src/mainboard/google/octopus/variants/casta/include/variant/gpio.h
+++ b/src/mainboard/google/octopus/variants/casta/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/fleex/gpio.c b/src/mainboard/google/octopus/variants/fleex/gpio.c
index 39d239b..d112a2c 100644
--- a/src/mainboard/google/octopus/variants/fleex/gpio.c
+++ b/src/mainboard/google/octopus/variants/fleex/gpio.c
@@ -28,8 +28,8 @@
    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,
+	/* EC_AP_INT_ODL */
+	PAD_CFG_GPI_APIC_IOS(GPIO_134, NONE, DEEP, LEVEL, INVERT, TxDRxE,
    		     DISPUPD),
PAD_NC(GPIO_138, DN_20K),
diff --git a/src/mainboard/google/octopus/variants/fleex/include/variant/ec.h b/src/mainboard/google/octopus/variants/fleex/include/variant/ec.h
index 16f931b..b75794a 100644
--- a/src/mainboard/google/octopus/variants/fleex/include/variant/ec.h
+++ b/src/mainboard/google/octopus/variants/fleex/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/fleex/include/variant/gpio.h b/src/mainboard/google/octopus/variants/fleex/include/variant/gpio.h
index 1fd1e11..a59bbf4 100644
--- a/src/mainboard/google/octopus/variants/fleex/include/variant/gpio.h
+++ b/src/mainboard/google/octopus/variants/fleex/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/meep/gpio.c b/src/mainboard/google/octopus/variants/meep/gpio.c
index 7e57287..29733e8 100644
--- a/src/mainboard/google/octopus/variants/meep/gpio.c
+++ b/src/mainboard/google/octopus/variants/meep/gpio.c
@@ -21,8 +21,8 @@
 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,
+	/* EC_AP_INT_ODL */
+	PAD_CFG_GPI_APIC_IOS(GPIO_134, NONE, DEEP, LEVEL, INVERT, TxDRxE,
    		     DISPUPD),
/* EN_PP3300_TOUCHSCREEN */
diff --git a/src/mainboard/google/octopus/variants/meep/include/variant/ec.h b/src/mainboard/google/octopus/variants/meep/include/variant/ec.h
index 16f931b..b75794a 100644
--- a/src/mainboard/google/octopus/variants/meep/include/variant/ec.h
+++ b/src/mainboard/google/octopus/variants/meep/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/meep/include/variant/gpio.h b/src/mainboard/google/octopus/variants/meep/include/variant/gpio.h
index 1fd1e11..a59bbf4 100644
--- a/src/mainboard/google/octopus/variants/meep/include/variant/gpio.h
+++ b/src/mainboard/google/octopus/variants/meep/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/phaser/gpio.c b/src/mainboard/google/octopus/variants/phaser/gpio.c
index 322b44b..c4e1e69 100644
--- a/src/mainboard/google/octopus/variants/phaser/gpio.c
+++ b/src/mainboard/google/octopus/variants/phaser/gpio.c
@@ -30,6 +30,10 @@
    PAD_NC(GPIO_117, UP_20K),
    PAD_NC(GPIO_143, UP_20K),
+	/* EC_AP_INT_ODL */
+	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),
@@ -54,6 +58,10 @@
    PAD_NC(GPIO_117, UP_20K),
    PAD_NC(GPIO_143, UP_20K),
+	/* EC_AP_INT_ODL */
+	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/phaser/include/variant/ec.h b/src/mainboard/google/octopus/variants/phaser/include/variant/ec.h
index 16f931b..b75794a 100644
--- a/src/mainboard/google/octopus/variants/phaser/include/variant/ec.h
+++ b/src/mainboard/google/octopus/variants/phaser/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/phaser/include/variant/gpio.h b/src/mainboard/google/octopus/variants/phaser/include/variant/gpio.h
index 1fd1e11..a59bbf4 100644
--- a/src/mainboard/google/octopus/variants/phaser/include/variant/gpio.h
+++ b/src/mainboard/google/octopus/variants/phaser/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 */
-- 
To view, visit https://review.coreboot.org/c/coreboot/+/30788
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I018864ae5fa400372b5b443e49828e8202b9aa4d
Gerrit-Change-Number: 30788
Gerrit-PatchSet: 1
Gerrit-Owner: Jett Rink jettrink@chromium.org
Gerrit-MessageType: newchange



    