From 825092a621af7b80d6289dd2d28ee03591e9e314 Mon Sep 17 00:00:00 2001
From: Subrata Banik <subratabanik@google.com>
Date: Tue, 16 Jul 2024 13:30:28 +0000
Subject: soc/intel/meteorlake: Switch to common eSPI header

This patch updates Meteor Lake code to use the common eSPI header
file(`intelpch/espi.h`) instead of the SoC-specific one.

BUG=none
TEST=Builds successfully for google/rex.

Change-Id: Ibb37413bb6c925650f55b0dcf70e7483bf257888
Signed-off-by: Subrata Banik <subratabanik@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/83487
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Eric Lai <ericllai@google.com>
---
 src/soc/intel/meteorlake/bootblock/soc_die.c |  2 +-
 src/soc/intel/meteorlake/espi.c              |  2 +-
 src/soc/intel/meteorlake/include/soc/espi.h  | 27 ---------------------------
 src/soc/intel/meteorlake/pmutil.c            |  2 +-
 4 files changed, 3 insertions(+), 30 deletions(-)
 delete mode 100644 src/soc/intel/meteorlake/include/soc/espi.h

(limited to 'src')

diff --git a/src/soc/intel/meteorlake/bootblock/soc_die.c b/src/soc/intel/meteorlake/bootblock/soc_die.c
index f5a3c9188b..cfbc22cbb3 100644
--- a/src/soc/intel/meteorlake/bootblock/soc_die.c
+++ b/src/soc/intel/meteorlake/bootblock/soc_die.c
@@ -13,8 +13,8 @@
 #include <intelblocks/systemagent.h>
 #include <intelblocks/tco.h>
 #include <intelblocks/uart.h>
+#include <intelpch/espi.h>
 #include <soc/bootblock.h>
-#include <soc/espi.h>
 #include <soc/iomap.h>
 #include <soc/p2sb.h>
 #include <soc/pci_devs.h>
diff --git a/src/soc/intel/meteorlake/espi.c b/src/soc/intel/meteorlake/espi.c
index 4928f1782a..d29a117aba 100644
--- a/src/soc/intel/meteorlake/espi.c
+++ b/src/soc/intel/meteorlake/espi.c
@@ -7,7 +7,7 @@
 #include <intelblocks/itss.h>
 #include <intelblocks/lpc_lib.h>
 #include <intelblocks/pcr.h>
-#include <soc/espi.h>
+#include <intelpch/espi.h>
 #include <soc/iomap.h>
 #include <soc/irq.h>
 #include <soc/pci_devs.h>
diff --git a/src/soc/intel/meteorlake/include/soc/espi.h b/src/soc/intel/meteorlake/include/soc/espi.h
deleted file mode 100644
index 0b03cbaa75..0000000000
--- a/src/soc/intel/meteorlake/include/soc/espi.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#ifndef _SOC_METEORLAKE_ESPI_H_
-#define _SOC_METEORLAKE_ESPI_H_
-
-/* PCI Configuration Space (D31:F0): ESPI */
-#define SCI_IRQ_SEL		(7 << 0)
-#define SCIS_IRQ9		0
-#define SCIS_IRQ10		1
-#define SCIS_IRQ11		2
-#define SCIS_IRQ20		4
-#define SCIS_IRQ21		5
-#define SCIS_IRQ22		6
-#define SCIS_IRQ23		7
-#define SERIRQ_CNTL		0x64
-#define ESPI_IO_DEC		0x80 /* IO Decode Ranges Register */
-#define   COMA_RANGE		0x0 /* 0x3F8 - 0x3FF COM1 */
-#define   COMB_RANGE		0x1 /* 0x2F8 - 0x2FF COM2 */
-#define ESPI_GEN1_DEC		0x84 /* ESPI IF Generic Decode Range 1 */
-#define ESPI_GEN2_DEC		0x88 /* ESPI IF Generic Decode Range 2 */
-#define ESPI_GEN3_DEC		0x8c /* ESPI IF Generic Decode Range 3 */
-#define ESPI_GEN4_DEC		0x90 /* ESPI IF Generic Decode Range 4 */
-#define LGMR			0x98 /* ESPI Generic Memory Range */
-#define PCCTL			0xE0 /* PCI Clock Control */
-#define   CLKRUN_EN		(1 << 0)
-
-#endif
diff --git a/src/soc/intel/meteorlake/pmutil.c b/src/soc/intel/meteorlake/pmutil.c
index abe95509cd..09fb46be1e 100644
--- a/src/soc/intel/meteorlake/pmutil.c
+++ b/src/soc/intel/meteorlake/pmutil.c
@@ -16,8 +16,8 @@
 #include <intelblocks/pmclib.h>
 #include <intelblocks/rtc.h>
 #include <intelblocks/tco.h>
+#include <intelpch/espi.h>
 #include <security/vboot/vbnv.h>
-#include <soc/espi.h>
 #include <soc/gpe.h>
 #include <soc/iomap.h>
 #include <soc/pci_devs.h>
-- 
cgit v1.2.3