From 53496e69ece91d388d66cf26ccc49a1e0a52f833 Mon Sep 17 00:00:00 2001
From: Angel Pons <th3fanbus@gmail.com>
Date: Fri, 19 Feb 2021 20:38:37 +0100
Subject: soc/intel: Drop `romstage_pch_init()` function
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It only calls `smbus_common_init()`, so just call that directly.

Change-Id: I0237f52bb9b0503e83f5dbf31c4064bd0f5bae28
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/50947
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
Reviewed-by: Michael Niewöhner <foss@mniewoehner.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
 src/soc/intel/jasperlake/include/soc/romstage.h |  1 -
 src/soc/intel/jasperlake/romstage/Makefile.inc  |  1 -
 src/soc/intel/jasperlake/romstage/pch.c         | 10 ----------
 src/soc/intel/jasperlake/romstage/romstage.c    |  5 +++--
 4 files changed, 3 insertions(+), 14 deletions(-)
 delete mode 100644 src/soc/intel/jasperlake/romstage/pch.c

(limited to 'src/soc/intel/jasperlake')

diff --git a/src/soc/intel/jasperlake/include/soc/romstage.h b/src/soc/intel/jasperlake/include/soc/romstage.h
index 3772db4bc1..ba44f2df26 100644
--- a/src/soc/intel/jasperlake/include/soc/romstage.h
+++ b/src/soc/intel/jasperlake/include/soc/romstage.h
@@ -7,7 +7,6 @@
 
 void mainboard_memory_init_params(FSPM_UPD *mupd);
 void systemagent_early_init(void);
-void romstage_pch_init(void);
 
 /* Board type */
 enum board_type {
diff --git a/src/soc/intel/jasperlake/romstage/Makefile.inc b/src/soc/intel/jasperlake/romstage/Makefile.inc
index a1a6c6638d..99c1d2ca25 100644
--- a/src/soc/intel/jasperlake/romstage/Makefile.inc
+++ b/src/soc/intel/jasperlake/romstage/Makefile.inc
@@ -3,5 +3,4 @@
 romstage-y += fsp_params.c
 romstage-y += ../../../../cpu/intel/car/romstage.c
 romstage-y += romstage.c
-romstage-y += pch.c
 romstage-y += systemagent.c
diff --git a/src/soc/intel/jasperlake/romstage/pch.c b/src/soc/intel/jasperlake/romstage/pch.c
deleted file mode 100644
index d3c2554425..0000000000
--- a/src/soc/intel/jasperlake/romstage/pch.c
+++ /dev/null
@@ -1,10 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#include <intelblocks/smbus.h>
-#include <soc/romstage.h>
-
-void romstage_pch_init(void)
-{
-	/* Program SMBUS_BASE_ADDRESS and Enable it */
-	smbus_common_init();
-}
diff --git a/src/soc/intel/jasperlake/romstage/romstage.c b/src/soc/intel/jasperlake/romstage/romstage.c
index 6d34b438cf..f7e6a91b6e 100644
--- a/src/soc/intel/jasperlake/romstage/romstage.c
+++ b/src/soc/intel/jasperlake/romstage/romstage.c
@@ -7,6 +7,7 @@
 #include <intelblocks/cfg.h>
 #include <intelblocks/cse.h>
 #include <intelblocks/pmclib.h>
+#include <intelblocks/smbus.h>
 #include <memory_info.h>
 #include <soc/intel/common/smbios.h>
 #include <soc/iomap.h>
@@ -127,8 +128,8 @@ void mainboard_romstage_entry(void)
 
 	/* Program MCHBAR, DMIBAR, GDXBAR and EDRAMBAR */
 	systemagent_early_init();
-	/* Program PCH init */
-	romstage_pch_init();
+	/* Program SMBus base address and enable it */
+	smbus_common_init();
 	/* initialize Heci interface */
 	heci_init(HECI1_BASE_ADDRESS);
 
-- 
cgit v1.2.3