Move GCTRL init from common to SoC code

crawfxrd · crawfxrd · commit af11194256ee · 2025-12-09T11:53:03.000-07:00
GCTRL is an ITE system block. Move it out of common code. Boards have not needed the header since 1fc832c ("Enable POST codes in EC init instead of per-board"). Signed-off-by: Tim Crawford <tcrawford@system76.com>
diff --git a/src/board/system76/addw2/board.c b/src/board/system76/addw2/board.c
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
 #include <board/board.h>
-#include <board/gctrl.h>
 #include <board/gpio.h>
 #include <board/kbc.h>
 #include <common/debug.h>
diff --git a/src/board/system76/addw3/board.c b/src/board/system76/addw3/board.c
@@ -3,7 +3,6 @@
 #include <board/battery.h>
 #include <board/board.h>
 #include <board/espi.h>
-#include <board/gctrl.h>
 #include <board/gpio.h>
 #include <common/debug.h>
 #include <ec/ec.h>
diff --git a/src/board/system76/addw4/board.c b/src/board/system76/addw4/board.c
@@ -3,7 +3,6 @@
 #include <board/battery.h>
 #include <board/board.h>
 #include <board/espi.h>
-#include <board/gctrl.h>
 #include <board/gpio.h>
 #include <common/debug.h>
 #include <ec/ec.h>
diff --git a/src/board/system76/bonw14/board.c b/src/board/system76/bonw14/board.c
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
 #include <board/board.h>
-#include <board/gctrl.h>
 #include <board/gpio.h>
 #include <common/debug.h>
 #include <ec/ec.h>
diff --git a/src/board/system76/common/common.mk b/src/board/system76/common/common.mk
@@ -7,7 +7,6 @@ board-common-$(CONFIG_HAVE_DGPU) += dgpu.c
 board-common-y += ecpm.c
 board-common-$(CONFIG_BUS_ESPI) += espi.c
 board-common-y += fan.c
-board-common-y += gctrl.c
 board-common-y += kbc.c
 board-common-y += kbscan.c
 board-common-y += keymap.c
diff --git a/src/board/system76/common/espi.c b/src/board/system76/common/espi.c
@@ -7,7 +7,6 @@
 #include <common/debug.h>
 #include <common/macro.h>
 #include <ec/ecpm.h>
-#include <ec/gctrl.h>
 #include <ec/gpio.h>
 
 #include <8051.h>
diff --git a/src/board/system76/common/gctrl.c b/src/board/system76/common/gctrl.c
diff --git a/src/board/system76/common/include/board/gctrl.h b/src/board/system76/common/include/board/gctrl.h
diff --git a/src/board/system76/common/main.c b/src/board/system76/common/main.c
@@ -9,7 +9,6 @@
 #include <board/ecpm.h>
 #include <board/fan.h>
 #include <board/gpio.h>
-#include <board/gctrl.h>
 #include <board/kbc.h>
 #include <board/kbled.h>
 #include <board/kbscan.h>
@@ -55,7 +54,6 @@ uint8_t main_cycle = 0;
 void init(void) {
     // Must happen first
     ec_init();
-    gctrl_init();
     gpio_init();
 
     // Can happen in any order
diff --git a/src/board/system76/darp7/board.c b/src/board/system76/darp7/board.c
@@ -2,7 +2,6 @@
 
 #include <board/board.h>
 #include <board/espi.h>
-#include <board/gctrl.h>
 #include <board/gpio.h>
 #include <common/debug.h>
 #include <ec/ec.h>
diff --git a/src/board/system76/galp5/board.c b/src/board/system76/galp5/board.c
@@ -3,7 +3,6 @@
 #include <board/battery.h>
 #include <board/board.h>
 #include <board/espi.h>
-#include <board/gctrl.h>
 #include <board/gpio.h>
 #include <common/debug.h>
 #include <ec/ec.h>
diff --git a/src/board/system76/gaze15/board.c b/src/board/system76/gaze15/board.c
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
 #include <board/board.h>
-#include <board/gctrl.h>
 #include <board/gpio.h>
 #include <common/debug.h>
 #include <ec/ec.h>
diff --git a/src/board/system76/gaze16-3050/board.c b/src/board/system76/gaze16-3050/board.c
@@ -3,7 +3,6 @@
 #include <board/battery.h>
 #include <board/board.h>
 #include <board/espi.h>
-#include <board/gctrl.h>
 #include <board/gpio.h>
 #include <common/debug.h>
 #include <ec/ec.h>
diff --git a/src/board/system76/gaze16-3060/board.c b/src/board/system76/gaze16-3060/board.c
@@ -3,7 +3,6 @@
 #include <board/battery.h>
 #include <board/board.h>
 #include <board/espi.h>
-#include <board/gctrl.h>
 #include <board/gpio.h>
 #include <common/debug.h>
 #include <ec/ec.h>
diff --git a/src/board/system76/gaze17-3050/board.c b/src/board/system76/gaze17-3050/board.c
@@ -3,7 +3,6 @@
 #include <board/battery.h>
 #include <board/board.h>
 #include <board/espi.h>
-#include <board/gctrl.h>
 #include <board/gpio.h>
 #include <common/debug.h>
 #include <ec/ec.h>
diff --git a/src/board/system76/gaze17-3060/board.c b/src/board/system76/gaze17-3060/board.c
@@ -3,7 +3,6 @@
 #include <board/battery.h>
 #include <board/board.h>
 #include <board/espi.h>
-#include <board/gctrl.h>
 #include <board/gpio.h>
 #include <common/debug.h>
 #include <ec/ec.h>
diff --git a/src/board/system76/lemp10/board.c b/src/board/system76/lemp10/board.c
@@ -2,7 +2,6 @@
 
 #include <board/board.h>
 #include <board/espi.h>
-#include <board/gctrl.h>
 #include <board/gpio.h>
 #include <common/debug.h>
 #include <ec/ec.h>
diff --git a/src/board/system76/oryp6/board.c b/src/board/system76/oryp6/board.c
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
 #include <board/board.h>
-#include <board/gctrl.h>
 #include <board/gpio.h>
 #include <common/debug.h>
 #include <ec/ec.h>
diff --git a/src/board/system76/oryp7/board.c b/src/board/system76/oryp7/board.c
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
 #include <board/board.h>
-#include <board/gctrl.h>
 #include <board/gpio.h>
 #include <common/debug.h>
 #include <ec/ec.h>
diff --git a/src/board/system76/oryp8/board.c b/src/board/system76/oryp8/board.c
@@ -2,7 +2,6 @@
 
 #include <board/board.h>
 #include <board/espi.h>
-#include <board/gctrl.h>
 #include <board/gpio.h>
 #include <common/debug.h>
 #include <ec/ec.h>
diff --git a/src/ec/ite/ec.c b/src/ec/ite/ec.c
@@ -6,6 +6,13 @@
 #include <common/debug.h>
 #include <common/macro.h>
 
+static void gctrl_init(void) {
+    // Set I2EC as R/W
+    SPCTRL1 |= 0x03;
+    // Set PNPCFG base address
+    BADRSEL = 0;
+}
+
 void ec_init(void) {
     arch_init();
 
@@ -17,6 +24,8 @@ void ec_init(void) {
     // Enable POST codes
     SPCTRL1 |= BIT(7) | BIT(6) | BIT(3);
 #endif
+
+    gctrl_init();
 }
 
 void ec_read_post_codes(void) {
