From 51d35cb272c9891c1bca1893c99e09fa7be298d7 Mon Sep 17 00:00:00 2001
From: Tim Crawford <tcrawford@system76.com>
Date: Fri, 5 Jul 2024 09:07:03 -0600
Subject: [PATCH] Remove GPH7 on IT8587E

On IT8587E, pin 3 is VBAT and not a GPIO pin.

Signed-off-by: Tim Crawford <tcrawford@system76.com>
---
 src/board/system76/addw1/gpio.c   | 2 --
 src/board/system76/darp5/gpio.c   | 2 --
 src/board/system76/galp3-c/gpio.c | 2 --
 src/board/system76/oryp5/gpio.c   | 2 --
 src/ec/ite/include/ec/gpio.h      | 2 ++
 5 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/board/system76/addw1/gpio.c b/src/board/system76/addw1/gpio.c
index 5cc27e822..68239e810 100644
--- a/src/board/system76/addw1/gpio.c
+++ b/src/board/system76/addw1/gpio.c
@@ -192,8 +192,6 @@ void gpio_init(void) {
     GPCRH5 = GPIO_OUT | GPIO_UP;
     // SUSB#_PCH
     GPCRH6 = GPIO_IN;
-    // TODO
-    GPCRH7 = GPIO_IN;
     // BAT_DET
     GPCRI0 = GPIO_ALT;
     // BAT_VOLT
diff --git a/src/board/system76/darp5/gpio.c b/src/board/system76/darp5/gpio.c
index 2972a23b2..827c696f3 100644
--- a/src/board/system76/darp5/gpio.c
+++ b/src/board/system76/darp5/gpio.c
@@ -192,8 +192,6 @@ void gpio_init(void) {
     GPCRH5 = GPIO_OUT;
     // SUSB#_PCH
     GPCRH6 = GPIO_IN;
-    // Unknown
-    GPCRH7 = GPIO_IN;
     // BAT_DET
     GPCRI0 = GPIO_ALT;
     // BAT_VOLT
diff --git a/src/board/system76/galp3-c/gpio.c b/src/board/system76/galp3-c/gpio.c
index 6824adbaa..cd8646b31 100644
--- a/src/board/system76/galp3-c/gpio.c
+++ b/src/board/system76/galp3-c/gpio.c
@@ -191,8 +191,6 @@ void gpio_init(void) {
     GPCRH5 = GPIO_OUT;
     // SUSB#_PCH
     GPCRH6 = GPIO_IN;
-    // Unknown
-    GPCRH7 = GPIO_IN;
     // BAT_DET
     GPCRI0 = GPIO_ALT;
     // BAT_VOLT
diff --git a/src/board/system76/oryp5/gpio.c b/src/board/system76/oryp5/gpio.c
index 6d30a99a5..8124f67bf 100644
--- a/src/board/system76/oryp5/gpio.c
+++ b/src/board/system76/oryp5/gpio.c
@@ -194,8 +194,6 @@ void gpio_init(void) {
     GPCRH5 = GPIO_IN | GPIO_UP;
     // SUSB#_PCH
     GPCRH6 = GPIO_IN;
-    // Unknown
-    GPCRH7 = GPIO_IN;
 
     // BAT_DET
     GPCRI0 = GPIO_ALT;
diff --git a/src/ec/ite/include/ec/gpio.h b/src/ec/ite/include/ec/gpio.h
index e618cce58..413cd9e8f 100644
--- a/src/ec/ite/include/ec/gpio.h
+++ b/src/ec/ite/include/ec/gpio.h
@@ -170,7 +170,9 @@ volatile uint8_t __xdata __at(0x164B) GPCRH3;
 volatile uint8_t __xdata __at(0x164C) GPCRH4;
 volatile uint8_t __xdata __at(0x164D) GPCRH5;
 volatile uint8_t __xdata __at(0x164E) GPCRH6;
+#if CONFIG_EC_ITE_IT5570E || CONFIG_EC_ITE_IT5571E
 volatile uint8_t __xdata __at(0x164F) GPCRH7;
+#endif
 
 volatile uint8_t __xdata __at(0x1650) GPCRI0;
 volatile uint8_t __xdata __at(0x1651) GPCRI1;