Move GCTRL,ECPM init from common to SoC code

GCTRL and ECPM are ITE system blocks. Move them out of common code.

Signed-off-by: Tim Crawford <tcrawford@system76.com>

Author: crawfxrd

src/app/main/Makefile.mk

@@ -4,10 +4,8 @@ app-y += acpi.c
 app-y += battery.c
 app-y += config.c
 app-$(CONFIG_HAVE_DGPU) += dgpu.c
-app-y += ecpm.c
 app-$(CONFIG_BUS_ESPI) += espi.c
 app-y += fan.c
-app-y += gctrl.c
 app-y += kbc.c
 app-y += kbscan.c
 app-y += keymap.c

src/app/main/ecpm.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>

src/app/main/espi.c

@@ -3,9 +3,7 @@
 #include <app/battery.h>
 #include <app/board.h>
 #include <app/dgpu.h>
-#include <app/ecpm.h>
 #include <app/fan.h>
-#include <app/gctrl.h>
 #include <app/kbc.h>
 #include <app/kbled.h>
 #include <app/kbscan.h>
@@ -56,14 +54,12 @@ uint8_t main_cycle = 0;
 void init(void) {
     // Must happen first
     ec_init();
-    gctrl_init();
     gpio_init();
 
     // Can happen in any order
 #if CONFIG_HAVE_DGPU
     dgpu_init();
 #endif
-    ecpm_init();
     kbc_init();
     kbled_init();
 #ifdef PARALLEL_DEBUG

src/app/main/gctrl.c

@@ -2,6 +2,7 @@
 
 #include <ec/ec.h>
 #include <arch/arch.h>
+#include <ec/ecpm.h>
 #include <ec/gctrl.h>
 #include <common/debug.h>
 #include <common/macro.h>
@@ -18,6 +19,22 @@ void ec_read_post_codes(void) {
 #endif
 }
 
+static void gctrl_init(void) {
+    // Set I2EC as R/W
+    SPCTRL1 |= 0x03;
+    // Set PNPCFG base address
+    BADRSEL = 0;
+}
+
+static void ecpm_init(void) {
+    // Clock gate EGPC, CIR, and SWUC
+    CGCTRL2 |= BIT(6) | BIT(5) | BIT(4);
+    // Clock gate UART, SSPI, and DBGR
+    CGCTRL3 |= BIT(2) | BIT(1) | BIT(0);
+    // Clock gate CEC
+    CGCTRL4 |= BIT(0);
+}
+
 void ec_init(void) {
     arch_init();
 
@@ -29,4 +46,7 @@ void ec_init(void) {
     // Enable POST codes
     SPCTRL1 |= BIT(7) | BIT(6) | BIT(3);
 #endif
+
+    gctrl_init();
+    ecpm_init();
 }