[coreboot-gerrit] Change in coreboot[master]: mainboard/google/kahlee: Update GPIOs

[Martin Roth (Code Review)]

Martin Roth has uploaded this change for review. ( https://review.coreboot.org/22751

Change subject: mainboard/google/kahlee: Update GPIOs
......................................................................

mainboard/google/kahlee: Update GPIOs

- The touchscreen interrupt was moved from the GPIO 3, as originally
suggested to GPIO 11.  This changes the gevent from 2 to 18.
- Set device enables to high.
- Remove Extra SCI comment from GPIO 130.
- Set PCIe reset pins to high.

BUG=b:70234300, b:69681660
TEST=build grunt

Change-Id: Ib591e4278ed23d0963ecb19ad9c326498b4c7796
Signed-off-by: Martin Roth 
---
M src/mainboard/google/kahlee/variants/baseboard/gpio.c
1 file changed, 17 insertions(+), 17 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/51/22751/1

diff --git a/src/mainboard/google/kahlee/variants/baseboard/gpio.c b/src/mainboard/google/kahlee/variants/baseboard/gpio.c
index 34b5cee..9308d69 100644
--- a/src/mainboard/google/kahlee/variants/baseboard/gpio.c
+++ b/src/mainboard/google/kahlee/variants/baseboard/gpio.c
@@ -35,11 +35,11 @@
    /* GPIO_2 - WLAN_PCIE_WAKE_3V3_ODL */
    { GPIO_2, Function0, FCH_GPIO_PULL_UP_ENABLE },

-	/* GPIO_3 - TOUCHSCREEN_INT_3V3_ODL, SCI */
+	/* GPIO_3 - MEM_VOLT_SEL */
    { GPIO_3, Function0, FCH_GPIO_PULL_UP_ENABLE },

/* GPIO_4 - EN_PP3300_WLAN */
-	{ GPIO_4, Function0, FCH_GPIO_OUTPUT_VALUE },
+	{ GPIO_4, Function0, FCH_GPIO_OUTPUT_VALUE | FCH_GPIO_OUTPUT_ENABLE },

/* GPIO_5 - PCH_TRACKPAD_INT_3V3_ODL, SCI */
    { GPIO_5, Function0, FCH_GPIO_PULL_UP_ENABLE },
@@ -59,7 +59,7 @@
    /* GPIO_10 - SLP_S0_L */
    { GPIO_10, Function0, FCH_GPIO_PULL_UP_ENABLE },

-	/* GPIO_11 - Unused (R166) */
+	/* GPIO_11 - TOUCHSCREEN_INT_3V3_ODL, SCI */
    { GPIO_11, Function0, FCH_GPIO_PULL_UP_ENABLE },

/* GPIO_12 - Unused (TP126) */
@@ -103,7 +103,7 @@
    { GPIO_25, Function0, FCH_GPIO_PULL_UP_ENABLE },

/* GPIO_26 - APU_PCIE_RST_L */
-	{ GPIO_26, Function0, FCH_GPIO_OUTPUT_VALUE },
+	{ GPIO_26, Function1, FCH_GPIO_OUTPUT_VALUE | FCH_GPIO_OUTPUT_ENABLE },

/* GPIO_40 - Unused */
    { GPIO_40, Function0, FCH_GPIO_PULL_UP_ENABLE },
@@ -115,7 +115,7 @@
    { GPIO_67, Function0, FCH_GPIO_OUTPUT_VALUE },

/* GPIO_70 - WLAN_PE_RST */
-	{ GPIO_70, Function0, FCH_GPIO_OUTPUT_VALUE },
+	{ GPIO_70, Function0, FCH_GPIO_OUTPUT_VALUE | FCH_GPIO_OUTPUT_ENABLE },

/* GPIO_74 - LPC_CLK0_EC_R */
    { GPIO_74, Function0, FCH_GPIO_PULL_DOWN_ENABLE },
@@ -124,7 +124,7 @@
    { GPIO_75, Function0, FCH_GPIO_PULL_UP_ENABLE },

/* GPIO_76 - EN_PP3300_TOUCHSCREEN */
-	{ GPIO_76, Function0, FCH_GPIO_OUTPUT_VALUE },
+	{ GPIO_76, Function0, FCH_GPIO_OUTPUT_VALUE | FCH_GPIO_OUTPUT_ENABLE },

/* GPIO_84 - HUB_RST */
    { GPIO_84, Function1, FCH_GPIO_OUTPUT_VALUE },
@@ -142,10 +142,10 @@
    { GPIO_88, Function0,  },

/* GPIO_90 - EN_PP3300_CAMERA */
-	{ GPIO_90, Function0, FCH_GPIO_OUTPUT_VALUE },
+	{ GPIO_90, Function0, FCH_GPIO_OUTPUT_VALUE | FCH_GPIO_OUTPUT_ENABLE },

/* GPIO_91 - EN_PP3300_TRACKPAD */
-	{ GPIO_91, Function1, FCH_GPIO_OUTPUT_VALUE },
+	{ GPIO_91, Function1, FCH_GPIO_OUTPUT_VALUE | FCH_GPIO_OUTPUT_ENABLE },

/* GPIO_92 - WLAN_PCIE_CLKREQ_3V3_ODL */
    { GPIO_92, Function0, FCH_GPIO_PULL_UP_ENABLE },
@@ -198,7 +198,7 @@
    /* GPIO_129 - APU_KBRST_L */
    { GPIO_129, Function0, FCH_GPIO_PULL_UP_ENABLE },

-	/* GPIO_130 - Unused, SCI */
+	/* GPIO_130 - Unused */
    { GPIO_130, Function1, FCH_GPIO_PULL_UP_ENABLE },

/* GPIO_131 - CONFIG_STRAP3 */
@@ -266,14 +266,6 @@
  */
 static const struct sci_source gpe_table[] = {

-	/* TOUCHSCREEN_INT_3V3_ODL */
-	{
-		.scimap = 2,
-		.gpe = 2,
-		.direction = SMI_SCI_LVL_HIGH,
-		.level = SMI_SCI_EDG,
-	},
-
    /* PCH_TRACKPAD_INT_3V3_ODL */
    {
    	.scimap = 7,
@@ -298,6 +290,14 @@
    	.level = SMI_SCI_LVL,
    },

+	/* TOUCHSCREEN_INT_3V3_ODL */
+	{
+		.scimap = 18,
+		.gpe = 18,
+		.direction = SMI_SCI_LVL_HIGH,
+		.level = SMI_SCI_EDG,
+	},
+
    /* APU_PEN_PDCT_ODL */
    {
    	.scimap = 21,