summaryrefslogtreecommitdiff
path: root/src/soc/amd
diff options
context:
space:
mode:
authorFelix Held <felix.held@amd.corp-partner.google.com>2020-04-07 15:25:16 +0200
committerFelix Held <felix-coreboot@felixheld.de>2020-04-08 17:15:23 +0000
commit72e987d540e9eb8f9b50454be880c3aa4a5bff51 (patch)
tree50e112b60c7541897b2a41953533ed08dddc6a43 /src/soc/amd
parente0b41fd12eb985a16219deb1baa280fd2a346131 (diff)
downloadcoreboot-72e987d540e9eb8f9b50454be880c3aa4a5bff51.tar.xz
soc/amd/stoneyridge: replace get_soc_config with config_of_soc
get_soc_config was a reimplementation of config_of_soc. Change-Id: I73c6a84703e22d6778b830f4bb82419361c85ff7 Signed-off-by: Felix Held <felix-coreboot@felixheld.de> Reviewed-on: https://review.coreboot.org/c/coreboot/+/40257 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com>
Diffstat (limited to 'src/soc/amd')
-rw-r--r--src/soc/amd/stoneyridge/i2c.c25
1 files changed, 5 insertions, 20 deletions
diff --git a/src/soc/amd/stoneyridge/i2c.c b/src/soc/amd/stoneyridge/i2c.c
index bd8fd5b842..3f95be73c3 100644
--- a/src/soc/amd/stoneyridge/i2c.c
+++ b/src/soc/amd/stoneyridge/i2c.c
@@ -5,6 +5,7 @@
#include <arch/acpi.h>
#include <console/console.h>
#include <delay.h>
+#include <device/device.h>
#include <drivers/i2c/designware/dw_i2c.h>
#include <amdblocks/acpimmio.h>
#include <soc/iomap.h>
@@ -34,19 +35,6 @@ uintptr_t dw_i2c_base_address(unsigned int bus)
return bus < I2C_DEVICE_COUNT ? i2c_bus_address[bus] : 0;
}
-static const struct soc_amd_stoneyridge_config *get_soc_config(void)
-{
- const struct device *dev = pcidev_path_on_root(GNB_DEVFN);
-
- if (!dev || !dev->chip_info) {
- printk(BIOS_ERR, "%s: Could not find SoC devicetree config!\n",
- __func__);
- return NULL;
- }
-
- return dev->chip_info;
-}
-
const struct dw_i2c_bus_config *dw_i2c_get_soc_cfg(unsigned int bus)
{
const struct soc_amd_stoneyridge_config *config;
@@ -54,9 +42,8 @@ const struct dw_i2c_bus_config *dw_i2c_get_soc_cfg(unsigned int bus)
if (bus >= ARRAY_SIZE(i2c_bus_address))
return NULL;
- config = get_soc_config();
- if (config == NULL)
- return NULL;
+ /* config is not NULL; if it was, config_of_soc calls die() internally */
+ config = config_of_soc();
return &config->i2c[bus];
}
@@ -97,10 +84,8 @@ static void dw_i2c_soc_init(bool is_early_init)
size_t i;
const struct soc_amd_stoneyridge_config *config;
- config = get_soc_config();
-
- if (config == NULL)
- return;
+ /* config is not NULL; if it was, config_of_soc calls die() internally */
+ config = config_of_soc();
for (i = 0; i < ARRAY_SIZE(config->i2c); i++) {
const struct dw_i2c_bus_config *cfg = &config->i2c[i];