diff options
| author | Peter Lemenkov <lemenkov@gmail.com> | 2019-10-21 21:42:17 +0200 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2019-12-27 09:09:02 +0000 |
| commit | 6c2c018e15a1c4d3ae394333263e6c7c3eb30415 (patch) | |
| tree | 832792ac36f7b5ce890e001fee96639cbbecd6c3 /src/mainboard/intel | |
| parent | 1fe7dcb047d157de79acafedaab0fe98408aeafc (diff) | |
mb/*/*/acpi_tables: Remove unnecessary function call
Remove acpi_update_thermal_table local function.
Change-Id: I4857348088feb8eaf1dd7f553c4efb29da8943cf
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/36212
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'src/mainboard/intel')
| -rw-r--r-- | src/mainboard/intel/baskingridge/acpi_tables.c | 47 | ||||
| -rw-r--r-- | src/mainboard/intel/emeraldlake2/acpi_tables.c | 34 |
2 files changed, 35 insertions, 46 deletions
diff --git a/src/mainboard/intel/baskingridge/acpi_tables.c b/src/mainboard/intel/baskingridge/acpi_tables.c index 60f9c463bc..26d555008f 100644 --- a/src/mainboard/intel/baskingridge/acpi_tables.c +++ b/src/mainboard/intel/baskingridge/acpi_tables.c @@ -23,8 +23,28 @@ #include "thermal.h" -static void acpi_update_thermal_table(global_nvs_t *gnvs) +void acpi_create_gnvs(global_nvs_t *gnvs) { + /* Enable USB ports in S3 */ + gnvs->s3u0 = 1; + gnvs->s3u1 = 1; + + /* + * Enable Front USB ports in S5 by default + * to be consistent with back port behavior + */ + gnvs->s5u0 = 1; + gnvs->s5u1 = 1; + + /* TPM Present */ + gnvs->tpmp = 1; + + +#if CONFIG(CHROMEOS) + /* Emerald Lake has no EC (?) */ + gnvs->chromeos.vbt2 = ACTIVE_ECFW_RO; +#endif + gnvs->f4of = FAN4_THRESHOLD_OFF; gnvs->f4on = FAN4_THRESHOLD_ON; gnvs->f4pw = FAN4_PWM; @@ -49,28 +69,3 @@ static void acpi_update_thermal_table(global_nvs_t *gnvs) gnvs->tpsv = PASSIVE_TEMPERATURE; gnvs->tmax = MAX_TEMPERATURE; } - -void acpi_create_gnvs(global_nvs_t *gnvs) -{ - /* Enable USB ports in S3 */ - gnvs->s3u0 = 1; - gnvs->s3u1 = 1; - - /* - * Enable Front USB ports in S5 by default - * to be consistent with back port behavior - */ - gnvs->s5u0 = 1; - gnvs->s5u1 = 1; - - /* TPM Present */ - gnvs->tpmp = 1; - - -#if CONFIG(CHROMEOS) - /* Emerald Lake has no EC (?) */ - gnvs->chromeos.vbt2 = ACTIVE_ECFW_RO; -#endif - - acpi_update_thermal_table(gnvs); -} diff --git a/src/mainboard/intel/emeraldlake2/acpi_tables.c b/src/mainboard/intel/emeraldlake2/acpi_tables.c index 9d15eb6548..f9681ddf32 100644 --- a/src/mainboard/intel/emeraldlake2/acpi_tables.c +++ b/src/mainboard/intel/emeraldlake2/acpi_tables.c @@ -24,8 +24,21 @@ static global_nvs_t *gnvs_; -static void acpi_update_thermal_table(global_nvs_t *gnvs) +void acpi_create_gnvs(global_nvs_t *gnvs) { + gnvs_ = gnvs; + + /* Enable USB ports in S3 */ + gnvs->s3u0 = 1; + gnvs->s3u1 = 1; + + /* + * Enable Front USB ports in S5 by default + * to be consistent with back port behavior + */ + gnvs->s5u0 = 1; + gnvs->s5u1 = 1; + gnvs->f4of = FAN4_THRESHOLD_OFF; gnvs->f4on = FAN4_THRESHOLD_ON; gnvs->f4pw = FAN4_PWM; @@ -49,25 +62,6 @@ static void acpi_update_thermal_table(global_nvs_t *gnvs) gnvs->tcrt = CRITICAL_TEMPERATURE; gnvs->tpsv = PASSIVE_TEMPERATURE; gnvs->tmax = MAX_TEMPERATURE; -} - -void acpi_create_gnvs(global_nvs_t *gnvs) -{ - gnvs_ = gnvs; - - /* Enable USB ports in S3 */ - gnvs->s3u0 = 1; - gnvs->s3u1 = 1; - - /* - * Enable Front USB ports in S5 by default - * to be consistent with back port behavior - */ - gnvs->s5u0 = 1; - gnvs->s5u1 = 1; - - - acpi_update_thermal_table(gnvs); // Stumpy has no arms^H^H^H^HEC. gnvs->chromeos.vbt2 = ACTIVE_ECFW_RO; |