diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2020-06-29 21:58:39 +0300 |
|---|---|---|
| committer | Angel Pons <th3fanbus@gmail.com> | 2021-01-13 18:29:44 +0000 |
| commit | c84572e0e1d17a4ccc77f5cc6e35f96417826663 (patch) | |
| tree | adcc20be0a6038468d747a30fb293a2dde685e7e /src/mainboard/google/kahlee | |
| parent | 2ab4a96668df843da480727ff03974a027db28b9 (diff) | |
mb/google/kahlee,zork: Use mainboard_fill_gnvs()
Change-Id: Ic9cdcc497bf1a9f5bfed5e6d95040bfa602b0b89
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/48732
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/mainboard/google/kahlee')
| -rw-r--r-- | src/mainboard/google/kahlee/acpi_tables.c | 12 | ||||
| -rw-r--r-- | src/mainboard/google/kahlee/mainboard.c | 16 |
2 files changed, 12 insertions, 16 deletions
diff --git a/src/mainboard/google/kahlee/acpi_tables.c b/src/mainboard/google/kahlee/acpi_tables.c new file mode 100644 index 0000000000..ab36f40a35 --- /dev/null +++ b/src/mainboard/google/kahlee/acpi_tables.c @@ -0,0 +1,12 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#include <acpi/acpi_gnvs.h> +#include <soc/nvs.h> +#include <variant/thermal.h> + +void mainboard_fill_gnvs(struct global_nvs *gnvs) +{ + gnvs->tmps = CTL_TDP_SENSOR_ID; + gnvs->tcrt = CRITICAL_TEMPERATURE; + gnvs->tpsv = PASSIVE_TEMPERATURE; +} diff --git a/src/mainboard/google/kahlee/mainboard.c b/src/mainboard/google/kahlee/mainboard.c index b40b4bc8e0..570f20ce31 100644 --- a/src/mainboard/google/kahlee/mainboard.c +++ b/src/mainboard/google/kahlee/mainboard.c @@ -5,14 +5,12 @@ #include <device/device.h> #include <device/mmio.h> #include <acpi/acpi.h> -#include <acpi/acpi_gnvs.h> #include <amdblocks/agesawrapper.h> #include <amdblocks/amd_pci_util.h> #include <amdblocks/smi.h> #include <baseboard/variants.h> #include <boardid.h> #include <smbios.h> -#include <soc/nvs.h> #include <soc/pci_devs.h> #include <soc/southbridge.h> #include <soc/smi.h> @@ -161,19 +159,6 @@ static void kahlee_enable(struct device *dev) dev->ops->acpi_inject_dsdt = chromeos_dsdt_generator; } -static void mainboard_final(void *chip_info) -{ - struct global_nvs *gnvs; - - gnvs = acpi_get_gnvs(); - - if (gnvs) { - gnvs->tmps = CTL_TDP_SENSOR_ID; - gnvs->tcrt = CRITICAL_TEMPERATURE; - gnvs->tpsv = PASSIVE_TEMPERATURE; - } -} - int mainboard_get_xhci_oc_map(uint16_t *map) { return variant_get_xhci_oc_map(map); @@ -192,7 +177,6 @@ void mainboard_suspend_resume(void) struct chip_operations mainboard_ops = { .init = mainboard_init, .enable_dev = kahlee_enable, - .final = mainboard_final, }; /* Variants may override these functions so see definitions in variants/ */ |