Change in coreboot[master]: mb/google/poppy/variants/nami: Modify touchscreen enable for EVT build

[Jasper Lee (Code Review)]

Jasper Lee has uploaded this change for review. ( https://review.coreboot.org/25191

Change subject: mb/google/poppy/variants/nami: Modify touchscreen enable for EVT build
......................................................................

mb/google/poppy/variants/nami: Modify touchscreen enable for EVT build

BUG=b:74939077
BRANCH=master
TEST=

Change-Id: I9195fb789e0bf44e5e69a622a0cb7fcfc506e398
Signed-off-by: jasper lee 
---
M src/mainboard/google/poppy/variants/nami/devicetree.cb
M src/mainboard/google/poppy/variants/nami/gpio.c
2 files changed, 5 insertions(+), 5 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/91/25191/1

diff --git a/src/mainboard/google/poppy/variants/nami/devicetree.cb b/src/mainboard/google/poppy/variants/nami/devicetree.cb
index 8e2ebc1..602e41b 100644
--- a/src/mainboard/google/poppy/variants/nami/devicetree.cb
+++ b/src/mainboard/google/poppy/variants/nami/devicetree.cb
@@ -254,7 +254,7 @@
    			register "probed" = "1"
    			register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_B3)"
    			register "reset_delay_ms" = "20"
-				register "enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_C22)"
+				register "enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_B4)"
    			register "enable_delay_ms" = "1"
    			register "has_power_resource" = "1"
    			device i2c 10 on end
diff --git a/src/mainboard/google/poppy/variants/nami/gpio.c b/src/mainboard/google/poppy/variants/nami/gpio.c
index f0cf99f..a10dfd6 100644
--- a/src/mainboard/google/poppy/variants/nami/gpio.c
+++ b/src/mainboard/google/poppy/variants/nami/gpio.c
@@ -70,8 +70,8 @@
    PAD_CFG_NC(GPP_B2),
    /* B3  : CPU_GP2 ==> TOUCHSCREEN_RST# */
    PAD_CFG_GPO(GPP_B3, 0, DEEP),
-	/* B4  : CPU_GP3 ==> NC */
-	PAD_CFG_NC(GPP_B4),
+	/* B4  : CPU_GP3 ==> EN_PP3300_DX_TOUCHSCREEN */
+	PAD_CFG_GPO(GPP_B4, 0, DEEP),
    /* B5  : SRCCLKREQ0# ==> NC */
    PAD_CFG_NC(GPP_B5),
    /* B6  : SRCCLKREQ1# ==> CLKREQ_PCIE#1 */
@@ -155,8 +155,8 @@
    PAD_CFG_NF(GPP_C20, NONE, DEEP, NF1),
    /* C21 : UART2_TXD ==> PCHTX_SERVORX_UART */
    PAD_CFG_NF(GPP_C21, NONE, DEEP, NF1),
-	/* C22 : UART2_RTS# ==> EN_PP3300_DX_TOUCHSCREEN */
-	PAD_CFG_GPO(GPP_C22, 0, DEEP),
+	/* C22 : UART2_RTS# ==> NC(TP926) */
+	PAD_CFG_NC(GPP_C22),
    /* C23 : UART2_CTS# ==> PCH_WP */
    PAD_CFG_GPI_GPIO_DRIVER(GPP_C23, 20K_PU, DEEP),