soc/intel: Drop pmc_get_mainboard_power_failure_state_choice()

It's not needed anymore.

Change-Id: I273acb2bf1675dc947927e3e6d2ebb78aa94518a
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/c/29681
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: HAOUAS Elyes <ehaouas@noos.fr>

5 files changed, 6 insertions, 27 deletions

diff --git a/src/soc/intel/cannonlake/pmc.c b/src/soc/intel/cannonlake/pmc.c
index ecd47e0593..aebcfc9482 100644
--- a/src/soc/intel/cannonlake/pmc.c
+++ b/src/soc/intel/cannonlake/pmc.c
@@ -57,8 +57,7 @@ static void pmc_set_afterg3(struct device *dev, int s5pwr)
  */
 void pmc_soc_restore_power_failure(void)
 {
-	pmc_set_afterg3(PCH_DEV_PMC,
-		pmc_get_mainboard_power_failure_state_choice());
+	pmc_set_afterg3(PCH_DEV_PMC, CONFIG_MAINBOARD_POWER_FAILURE_STATE);
 }
 
 static void config_deep_sX(uint32_t offset, uint32_t mask, int sx, int enable)
@@ -106,8 +105,7 @@ static void pch_power_options(struct device *dev)
 {
 	const char *state;
 
-	/* Get the chip configuration */
-	int pwr_on = pmc_get_mainboard_power_failure_state_choice();
+	const int pwr_on = CONFIG_MAINBOARD_POWER_FAILURE_STATE;
 
 	/*
 	 * Which state do we want to goto after g3 (power restored)?
diff --git a/src/soc/intel/common/block/include/intelblocks/pmclib.h b/src/soc/intel/common/block/include/intelblocks/pmclib.h
index 45695252f4..e1c29be1ad 100644
--- a/src/soc/intel/common/block/include/intelblocks/pmclib.h
+++ b/src/soc/intel/common/block/include/intelblocks/pmclib.h
@@ -221,10 +221,4 @@ enum {
 	MAINBOARD_POWER_STATE_PREVIOUS,
 };
 
-/*
- * Determines what state to go to when power is reapplied
- * after a power failure (G3 State)
- */
-int pmc_get_mainboard_power_failure_state_choice(void);
-
 #endif /* SOC_INTEL_COMMON_BLOCK_PMCLIB_H */
diff --git a/src/soc/intel/common/block/pmc/pmclib.c b/src/soc/intel/common/block/pmc/pmclib.c
index dcc7cc9a4b..4a1da9ecb9 100644
--- a/src/soc/intel/common/block/pmc/pmclib.c
+++ b/src/soc/intel/common/block/pmc/pmclib.c
@@ -580,12 +580,3 @@ void pmc_gpe_init(void)
 	/* Set the routes in the GPIO communities as well. */
 	gpio_route_gpe(dw0, dw1, dw2);
 }
-
-/*
- * Determines what state to go to when power is reapplied
- * after a power failure (G3 State)
- */
-int pmc_get_mainboard_power_failure_state_choice(void)
-{
-	return CONFIG_MAINBOARD_POWER_FAILURE_STATE;
-}
diff --git a/src/soc/intel/icelake/pmc.c b/src/soc/intel/icelake/pmc.c
index 24532104d8..754aa5055d 100644
--- a/src/soc/intel/icelake/pmc.c
+++ b/src/soc/intel/icelake/pmc.c
@@ -55,8 +55,7 @@ static void pmc_set_afterg3(struct device *dev, int s5pwr)
  */
 void pmc_soc_restore_power_failure(void)
 {
-	pmc_set_afterg3(PCH_DEV_PMC,
-		pmc_get_mainboard_power_failure_state_choice());
+	pmc_set_afterg3(PCH_DEV_PMC, CONFIG_MAINBOARD_POWER_FAILURE_STATE);
 }
 
 static void config_deep_sX(uint32_t offset, uint32_t mask, int sx, int enable)
@@ -104,8 +103,7 @@ static void pch_power_options(struct device *dev)
 {
 	const char *state;
 
-	/* Get the chip configuration */
-	int pwr_on = pmc_get_mainboard_power_failure_state_choice();
+	const int pwr_on = CONFIG_MAINBOARD_POWER_FAILURE_STATE;
 
 	/*
 	 * Which state do we want to goto after g3 (power restored)?
diff --git a/src/soc/intel/skylake/pmc.c b/src/soc/intel/skylake/pmc.c
index 6b673bebd9..5b823923ef 100644
--- a/src/soc/intel/skylake/pmc.c
+++ b/src/soc/intel/skylake/pmc.c
@@ -108,8 +108,7 @@ static void pch_power_options(struct device *dev)
 {
 	const char *state;
 
-	/* Get the chip configuration */
-	int pwr_on = pmc_get_mainboard_power_failure_state_choice();
+	const int pwr_on = CONFIG_MAINBOARD_POWER_FAILURE_STATE;
 
 	/*
 	 * Which state do we want to goto after g3 (power restored)?
@@ -206,8 +205,7 @@ void pmc_soc_init(struct device *dev)
  */
 void pmc_soc_restore_power_failure(void)
 {
-	pmc_set_afterg3(PCH_DEV_PMC,
-		pmc_get_mainboard_power_failure_state_choice());
+	pmc_set_afterg3(PCH_DEV_PMC, CONFIG_MAINBOARD_POWER_FAILURE_STATE);
 }
 
 static void pm1_enable_pwrbtn_smi(void *unused)