summaryrefslogtreecommitdiff
path: root/src/mainboard/google/zork
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2020-06-29 21:58:39 +0300
committerAngel Pons <th3fanbus@gmail.com>2021-01-13 18:29:44 +0000
commitc84572e0e1d17a4ccc77f5cc6e35f96417826663 (patch)
treeadcc20be0a6038468d747a30fb293a2dde685e7e /src/mainboard/google/zork
parent2ab4a96668df843da480727ff03974a027db28b9 (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/zork')
-rw-r--r--src/mainboard/google/zork/acpi_tables.c12
-rw-r--r--src/mainboard/google/zork/mainboard.c12
2 files changed, 12 insertions, 12 deletions
diff --git a/src/mainboard/google/zork/acpi_tables.c b/src/mainboard/google/zork/acpi_tables.c
new file mode 100644
index 0000000000..ab36f40a35
--- /dev/null
+++ b/src/mainboard/google/zork/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/zork/mainboard.c b/src/mainboard/google/zork/mainboard.c
index 3a3b1bdbb5..1de593ed49 100644
--- a/src/mainboard/google/zork/mainboard.c
+++ b/src/mainboard/google/zork/mainboard.c
@@ -7,7 +7,6 @@
#include <device/mmio.h>
#include <acpi/acpi.h>
#include <acpi/acpigen.h>
-#include <acpi/acpi_gnvs.h>
#include <amdblocks/amd_pci_util.h>
#include <amdblocks/gpio_banks.h>
#include <amdblocks/smi.h>
@@ -17,7 +16,6 @@
#include <smbios.h>
#include <soc/cpu.h>
#include <soc/gpio.h>
-#include <soc/nvs.h>
#include <soc/pci_devs.h>
#include <soc/platform_descriptors.h>
#include <soc/southbridge.h>
@@ -216,16 +214,6 @@ static void zork_enable(struct device *dev)
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;
- }
-
finalize_gpios(acpi_get_sleep_type());
}