summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/soc/intel/alderlake/espi.c4
-rw-r--r--src/soc/intel/cannonlake/lpc.c4
-rw-r--r--src/soc/intel/common/block/include/intelblocks/lpc_lib.h3
-rw-r--r--src/soc/intel/common/block/lpc/lpc_lib.c8
-rw-r--r--src/soc/intel/elkhartlake/espi.c4
-rw-r--r--src/soc/intel/icelake/espi.c4
-rw-r--r--src/soc/intel/jasperlake/espi.c4
-rw-r--r--src/soc/intel/skylake/lpc.c4
-rw-r--r--src/soc/intel/tigerlake/espi.c4
-rw-r--r--src/soc/intel/xeon_sp/lpc.c4
10 files changed, 18 insertions, 25 deletions
diff --git a/src/soc/intel/alderlake/espi.c b/src/soc/intel/alderlake/espi.c
index c909030167..b2377274e5 100644
--- a/src/soc/intel/alderlake/espi.c
+++ b/src/soc/intel/alderlake/espi.c
@@ -35,9 +35,9 @@ const struct lpc_mmio_range *soc_get_fixed_mmio_ranges()
return lpc_fixed_mmio_ranges;
}
-void soc_get_gen_io_dec_range(const struct device *dev, uint32_t *gen_io_dec)
+void soc_get_gen_io_dec_range(uint32_t *gen_io_dec)
{
- const config_t *config = config_of(dev);
+ const config_t *config = config_of_soc();
gen_io_dec[0] = config->gen1_dec;
gen_io_dec[1] = config->gen2_dec;
diff --git a/src/soc/intel/cannonlake/lpc.c b/src/soc/intel/cannonlake/lpc.c
index b21c117df0..c8e35c4d55 100644
--- a/src/soc/intel/cannonlake/lpc.c
+++ b/src/soc/intel/cannonlake/lpc.c
@@ -33,9 +33,9 @@ const struct lpc_mmio_range *soc_get_fixed_mmio_ranges()
return cnl_lpc_fixed_mmio_ranges;
}
-void soc_get_gen_io_dec_range(const struct device *dev, uint32_t *gen_io_dec)
+void soc_get_gen_io_dec_range(uint32_t *gen_io_dec)
{
- const config_t *config = config_of(dev);
+ const config_t *config = config_of_soc();
gen_io_dec[0] = config->gen1_dec;
gen_io_dec[1] = config->gen2_dec;
diff --git a/src/soc/intel/common/block/include/intelblocks/lpc_lib.h b/src/soc/intel/common/block/include/intelblocks/lpc_lib.h
index 2fdcdef3e6..82cba8ec7f 100644
--- a/src/soc/intel/common/block/include/intelblocks/lpc_lib.h
+++ b/src/soc/intel/common/block/include/intelblocks/lpc_lib.h
@@ -98,8 +98,7 @@ void lpc_io_setup_comm_a_b(void);
/* Enable PCH LPC by setting up generic decode range registers. */
void pch_enable_lpc(void);
/* Get SoC's generic IO decoder range register settings. */
-void soc_get_gen_io_dec_range(const struct device *dev,
- uint32_t gen_io_dec[LPC_NUM_GENERIC_IO_RANGES]);
+void soc_get_gen_io_dec_range(uint32_t gen_io_dec[LPC_NUM_GENERIC_IO_RANGES]);
/* Mirror generic IO decoder range register settings into DMI PCR. */
void soc_setup_dmi_pcr_io_dec(uint32_t gen_io_dec[LPC_NUM_GENERIC_IO_RANGES]);
/* Add resource into LPC PCI device space */
diff --git a/src/soc/intel/common/block/lpc/lpc_lib.c b/src/soc/intel/common/block/lpc/lpc_lib.c
index 67dd661460..d050ee36e5 100644
--- a/src/soc/intel/common/block/lpc/lpc_lib.c
+++ b/src/soc/intel/common/block/lpc/lpc_lib.c
@@ -270,15 +270,9 @@ static void lpc_set_gen_decode_range(
void pch_enable_lpc(void)
{
- /* Lookup device tree in romstage */
- const struct device *dev;
uint32_t gen_io_dec[LPC_NUM_GENERIC_IO_RANGES];
- dev = pcidev_on_root(PCH_DEV_SLOT_LPC, 0);
- if (!dev)
- return;
-
- soc_get_gen_io_dec_range(dev, gen_io_dec);
+ soc_get_gen_io_dec_range(gen_io_dec);
lpc_set_gen_decode_range(gen_io_dec);
soc_setup_dmi_pcr_io_dec(gen_io_dec);
if (ENV_PAYLOAD_LOADER)
diff --git a/src/soc/intel/elkhartlake/espi.c b/src/soc/intel/elkhartlake/espi.c
index a531fccbb0..8f82755e55 100644
--- a/src/soc/intel/elkhartlake/espi.c
+++ b/src/soc/intel/elkhartlake/espi.c
@@ -31,9 +31,9 @@ const struct lpc_mmio_range *soc_get_fixed_mmio_ranges()
return ehl_lpc_fixed_mmio_ranges;
}
-void soc_get_gen_io_dec_range(const struct device *dev, uint32_t *gen_io_dec)
+void soc_get_gen_io_dec_range(uint32_t *gen_io_dec)
{
- const config_t *config = config_of(dev);
+ const config_t *config = config_of_soc();
gen_io_dec[0] = config->gen1_dec;
gen_io_dec[1] = config->gen2_dec;
diff --git a/src/soc/intel/icelake/espi.c b/src/soc/intel/icelake/espi.c
index 7f9ff2fee2..4107d7e274 100644
--- a/src/soc/intel/icelake/espi.c
+++ b/src/soc/intel/icelake/espi.c
@@ -32,9 +32,9 @@ const struct lpc_mmio_range *soc_get_fixed_mmio_ranges()
return icl_lpc_fixed_mmio_ranges;
}
-void soc_get_gen_io_dec_range(const struct device *dev, uint32_t *gen_io_dec)
+void soc_get_gen_io_dec_range(uint32_t *gen_io_dec)
{
- const config_t *config = config_of(dev);
+ const config_t *config = config_of_soc();
gen_io_dec[0] = config->gen1_dec;
gen_io_dec[1] = config->gen2_dec;
diff --git a/src/soc/intel/jasperlake/espi.c b/src/soc/intel/jasperlake/espi.c
index 0977857684..11299a9552 100644
--- a/src/soc/intel/jasperlake/espi.c
+++ b/src/soc/intel/jasperlake/espi.c
@@ -32,9 +32,9 @@ const struct lpc_mmio_range *soc_get_fixed_mmio_ranges()
return jsl_lpc_fixed_mmio_ranges;
}
-void soc_get_gen_io_dec_range(const struct device *dev, uint32_t *gen_io_dec)
+void soc_get_gen_io_dec_range(uint32_t *gen_io_dec)
{
- const config_t *config = config_of(dev);
+ const config_t *config = config_of_soc();
gen_io_dec[0] = config->gen1_dec;
gen_io_dec[1] = config->gen2_dec;
diff --git a/src/soc/intel/skylake/lpc.c b/src/soc/intel/skylake/lpc.c
index f9c663980e..b83fadd223 100644
--- a/src/soc/intel/skylake/lpc.c
+++ b/src/soc/intel/skylake/lpc.c
@@ -29,9 +29,9 @@ const struct lpc_mmio_range *soc_get_fixed_mmio_ranges(void)
return skl_lpc_fixed_mmio_ranges;
}
-void soc_get_gen_io_dec_range(const struct device *dev, uint32_t *gen_io_dec)
+void soc_get_gen_io_dec_range(uint32_t *gen_io_dec)
{
- const config_t *config = config_of(dev);
+ const config_t *config = config_of_soc();
gen_io_dec[0] = config->gen1_dec;
gen_io_dec[1] = config->gen2_dec;
diff --git a/src/soc/intel/tigerlake/espi.c b/src/soc/intel/tigerlake/espi.c
index acd3b12244..8602b0dc59 100644
--- a/src/soc/intel/tigerlake/espi.c
+++ b/src/soc/intel/tigerlake/espi.c
@@ -38,9 +38,9 @@ const struct lpc_mmio_range *soc_get_fixed_mmio_ranges()
return tgl_lpc_fixed_mmio_ranges;
}
-void soc_get_gen_io_dec_range(const struct device *dev, uint32_t *gen_io_dec)
+void soc_get_gen_io_dec_range(uint32_t *gen_io_dec)
{
- const config_t *config = config_of(dev);
+ const config_t *config = config_of_soc();
gen_io_dec[0] = config->gen1_dec;
gen_io_dec[1] = config->gen2_dec;
diff --git a/src/soc/intel/xeon_sp/lpc.c b/src/soc/intel/xeon_sp/lpc.c
index 3169545bd4..dee99b70ac 100644
--- a/src/soc/intel/xeon_sp/lpc.c
+++ b/src/soc/intel/xeon_sp/lpc.c
@@ -18,9 +18,9 @@ const struct lpc_mmio_range *soc_get_fixed_mmio_ranges(void)
return xeon_lpc_fixed_mmio_ranges;
}
-void soc_get_gen_io_dec_range(const struct device *dev, uint32_t *gen_io_dec)
+void soc_get_gen_io_dec_range(uint32_t *gen_io_dec)
{
- const config_t *config = config_of(dev);
+ const config_t *config = config_of_soc();
gen_io_dec[0] = config->gen1_dec;
gen_io_dec[1] = config->gen2_dec;