summaryrefslogtreecommitdiff
path: root/src/soc/intel/apollolake
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2019-07-13 22:16:25 +0300
committerKyösti Mälkki <kyosti.malkki@gmail.com>2019-07-18 15:25:35 +0000
commit8950cfb66f8f1fd4b047fbef2347134be0aeacec (patch)
tree57943bfb4f8d74c2d1a4bfbd2a9813ac27e510dd /src/soc/intel/apollolake
parent4af4e7f06eddad71f86eda3e401967e79d3a9ddb (diff)
downloadcoreboot-8950cfb66f8f1fd4b047fbef2347134be0aeacec.tar.xz
soc/intel: Use config_of()
Change-Id: I0727a6b327410197cf32f598d1312737744386b3 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/34328 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Furquan Shaikh <furquan@google.com> Reviewed-by: David Guckian
Diffstat (limited to 'src/soc/intel/apollolake')
-rw-r--r--src/soc/intel/apollolake/lpc.c7
-rw-r--r--src/soc/intel/apollolake/memmap.c9
-rw-r--r--src/soc/intel/apollolake/pmc.c2
-rw-r--r--src/soc/intel/apollolake/romstage.c6
-rw-r--r--src/soc/intel/apollolake/sd.c2
5 files changed, 5 insertions, 21 deletions
diff --git a/src/soc/intel/apollolake/lpc.c b/src/soc/intel/apollolake/lpc.c
index ceed8f268f..2d59f7de22 100644
--- a/src/soc/intel/apollolake/lpc.c
+++ b/src/soc/intel/apollolake/lpc.c
@@ -91,12 +91,7 @@ void lpc_configure_pads(void)
void lpc_soc_init(struct device *dev)
{
const struct soc_intel_apollolake_config *cfg;
-
- cfg = dev->chip_info;
- if (!cfg) {
- printk(BIOS_ERR, "BUG! Could not find SOC devicetree config\n");
- return;
- }
+ cfg = config_of(dev);
/* Set LPC Serial IRQ mode */
lpc_set_serirq_mode(cfg->serirq_mode);
diff --git a/src/soc/intel/apollolake/memmap.c b/src/soc/intel/apollolake/memmap.c
index 3436364b64..66f4dda02d 100644
--- a/src/soc/intel/apollolake/memmap.c
+++ b/src/soc/intel/apollolake/memmap.c
@@ -28,20 +28,13 @@
void *cbmem_top(void)
{
- const struct device *dev;
const config_t *config;
void *tolum = (void *)sa_get_tseg_base();
if (!CONFIG(SOC_INTEL_GLK))
return tolum;
- dev = pcidev_path_on_root(PCH_DEVFN_LPC);
- assert(dev != NULL);
- config = dev->chip_info;
-
- if (!config)
- die_with_post_code(POST_HW_INIT_FAILURE,
- "Failed to get chip_info\n");
+ config = config_of_path(PCH_DEVFN_LPC);
/* FSP allocates 2x PRMRR Size Memory for alignment */
if (config->sgx_enable)
diff --git a/src/soc/intel/apollolake/pmc.c b/src/soc/intel/apollolake/pmc.c
index 0400a9df85..33fc45728f 100644
--- a/src/soc/intel/apollolake/pmc.c
+++ b/src/soc/intel/apollolake/pmc.c
@@ -94,7 +94,7 @@ static void set_slp_s3_assertion_width(int width_usecs)
void pmc_soc_init(struct device *dev)
{
- const struct soc_intel_apollolake_config *cfg = dev->chip_info;
+ const struct soc_intel_apollolake_config *cfg = config_of(dev);
/* Set up GPE configuration */
pmc_gpe_init();
diff --git a/src/soc/intel/apollolake/romstage.c b/src/soc/intel/apollolake/romstage.c
index 6d3b346582..7b10222b4b 100644
--- a/src/soc/intel/apollolake/romstage.c
+++ b/src/soc/intel/apollolake/romstage.c
@@ -311,13 +311,9 @@ static void soc_memory_init_params(FSPM_UPD *mupd)
{
#if CONFIG(SOC_INTEL_GLK)
/* Only for GLK */
- const struct device *dev = pcidev_path_on_root(PCH_DEVFN_LPC);
- assert(dev != NULL);
- const config_t *config = dev->chip_info;
FSP_M_CONFIG *m_cfg = &mupd->FspmConfig;
- if (!config)
- die("Can not find SoC devicetree\n");
+ const config_t *config = config_of_path(PCH_DEVFN_LPC);
m_cfg->PrmrrSize = config->PrmrrSize;
diff --git a/src/soc/intel/apollolake/sd.c b/src/soc/intel/apollolake/sd.c
index 35db8040a0..e34d53ed21 100644
--- a/src/soc/intel/apollolake/sd.c
+++ b/src/soc/intel/apollolake/sd.c
@@ -18,7 +18,7 @@
int sd_fill_soc_gpio_info(struct acpi_gpio* gpio, struct device *dev)
{
- config_t *config = dev->chip_info;
+ config_t *config = config_of(dev);
if (!config->sdcard_cd_gpio)
return -1;