diff options
Diffstat (limited to 'src/soc/intel/xeon_sp')
| -rw-r--r-- | src/soc/intel/xeon_sp/cpx/acpi.c | 2 | ||||
| -rw-r--r-- | src/soc/intel/xeon_sp/cpx/chip.h | 6 | ||||
| -rw-r--r-- | src/soc/intel/xeon_sp/cpx/soc_acpi.c | 2 | ||||
| -rw-r--r-- | src/soc/intel/xeon_sp/include/soc/acpi.h | 5 | ||||
| -rw-r--r-- | src/soc/intel/xeon_sp/skx/acpi.c | 2 | ||||
| -rw-r--r-- | src/soc/intel/xeon_sp/skx/chip.h | 4 | ||||
| -rw-r--r-- | src/soc/intel/xeon_sp/skx/soc_acpi.c | 2 |
7 files changed, 5 insertions, 18 deletions
diff --git a/src/soc/intel/xeon_sp/cpx/acpi.c b/src/soc/intel/xeon_sp/cpx/acpi.c index 8d3e86a10b..658c951648 100644 --- a/src/soc/intel/xeon_sp/cpx/acpi.c +++ b/src/soc/intel/xeon_sp/cpx/acpi.c @@ -23,8 +23,6 @@ #include <soc/pm.h> #include <soc/soc_util.h> -#include "chip.h" - static int acpi_sci_irq(void) { int sci_irq = 9; diff --git a/src/soc/intel/xeon_sp/cpx/chip.h b/src/soc/intel/xeon_sp/cpx/chip.h index e7c146c291..434b343bb2 100644 --- a/src/soc/intel/xeon_sp/cpx/chip.h +++ b/src/soc/intel/xeon_sp/cpx/chip.h @@ -99,10 +99,4 @@ struct soc_intel_xeon_sp_cpx_config { typedef struct soc_intel_xeon_sp_cpx_config config_t; -/* soc acpi function prototypes. To be removed when acpi.c is replaced by common/acpi.c */ -void cpx_generate_p_state_entries(int core, int cores_per_package); -int calculate_power(int tdp, int p1_ratio, int ratio); -void uncore_inject_dsdt(void); -unsigned long xeonsp_acpi_create_madt_lapics(unsigned long current); - #endif diff --git a/src/soc/intel/xeon_sp/cpx/soc_acpi.c b/src/soc/intel/xeon_sp/cpx/soc_acpi.c index fab221166c..cf84334449 100644 --- a/src/soc/intel/xeon_sp/cpx/soc_acpi.c +++ b/src/soc/intel/xeon_sp/cpx/soc_acpi.c @@ -17,8 +17,6 @@ #include <soc/pm.h> #include <soc/soc_util.h> -#include "chip.h" - /* TODO: Check if the common/acpi weak function can be used */ unsigned long acpi_fill_mcfg(unsigned long current) { diff --git a/src/soc/intel/xeon_sp/include/soc/acpi.h b/src/soc/intel/xeon_sp/include/soc/acpi.h index 6a76ef222b..b46914dbde 100644 --- a/src/soc/intel/xeon_sp/include/soc/acpi.h +++ b/src/soc/intel/xeon_sp/include/soc/acpi.h @@ -22,4 +22,9 @@ unsigned long northbridge_write_acpi_tables(const struct device *device, void motherboard_fill_fadt(acpi_fadt_t *fadt); +void cpx_generate_p_state_entries(int core, int cores_per_package); +int calculate_power(int tdp, int p1_ratio, int ratio); +void uncore_inject_dsdt(void); +unsigned long xeonsp_acpi_create_madt_lapics(unsigned long current); + #endif /* _SOC_ACPI_H_ */ diff --git a/src/soc/intel/xeon_sp/skx/acpi.c b/src/soc/intel/xeon_sp/skx/acpi.c index cbafbdb07b..c446a51f8c 100644 --- a/src/soc/intel/xeon_sp/skx/acpi.c +++ b/src/soc/intel/xeon_sp/skx/acpi.c @@ -15,8 +15,6 @@ #include <soc/pm.h> #include <string.h> -#include "chip.h" - acpi_cstate_t *soc_get_cstate_map(size_t *entries) { *entries = 0; diff --git a/src/soc/intel/xeon_sp/skx/chip.h b/src/soc/intel/xeon_sp/skx/chip.h index adb70e58d0..08608997b3 100644 --- a/src/soc/intel/xeon_sp/skx/chip.h +++ b/src/soc/intel/xeon_sp/skx/chip.h @@ -76,8 +76,4 @@ struct soc_intel_xeon_sp_skx_config { typedef struct soc_intel_xeon_sp_skx_config config_t; -/* soc acpi function prototypes. To be removed when acpi.c is replaced by common/acpi.c */ -void uncore_inject_dsdt(void); -unsigned long xeonsp_acpi_create_madt_lapics(unsigned long current); - #endif diff --git a/src/soc/intel/xeon_sp/skx/soc_acpi.c b/src/soc/intel/xeon_sp/skx/soc_acpi.c index b6b39f2989..afbcf840bd 100644 --- a/src/soc/intel/xeon_sp/skx/soc_acpi.c +++ b/src/soc/intel/xeon_sp/skx/soc_acpi.c @@ -18,8 +18,6 @@ #include <soc/pm.h> #include <soc/soc_util.h> -#include "chip.h" - /* TODO: Check if the common/acpi weak function can be used */ unsigned long acpi_fill_mcfg(unsigned long current) { |