diff options
| -rw-r--r-- | src/mainboard/google/poppy/variants/nami/Makefile.inc | 1 | ||||
| -rw-r--r-- | src/mainboard/google/poppy/variants/nami/mainboard.c | 21 | ||||
| -rw-r--r-- | src/mainboard/google/poppy/variants/nami/pl2.c | 48 |
3 files changed, 19 insertions, 51 deletions
diff --git a/src/mainboard/google/poppy/variants/nami/Makefile.inc b/src/mainboard/google/poppy/variants/nami/Makefile.inc index e9e90f5080..618011caef 100644 --- a/src/mainboard/google/poppy/variants/nami/Makefile.inc +++ b/src/mainboard/google/poppy/variants/nami/Makefile.inc @@ -33,7 +33,6 @@ romstage-y += memory.c ramstage-y += gpio.c ramstage-y += nhlt.c -ramstage-y += pl2.c ramstage-y += mainboard.c # Add OEM ID table diff --git a/src/mainboard/google/poppy/variants/nami/mainboard.c b/src/mainboard/google/poppy/variants/nami/mainboard.c index 6ff296022b..492167946f 100644 --- a/src/mainboard/google/poppy/variants/nami/mainboard.c +++ b/src/mainboard/google/poppy/variants/nami/mainboard.c @@ -23,11 +23,23 @@ #include <device/device.h> #include <drivers/intel/gma/opregion.h> #include <ec/google/chromeec/ec.h> +#include <intelblocks/mp_init.h> #include <smbios.h> #include <soc/ramstage.h> #include <string.h> #include <variant/sku.h> +#define PL2_I7_SKU 44 +#define PL2_DEFAULT 29 + +static uint32_t get_pl2(void) +{ + if (cpuid_eax(1) == CPUID_KABYLAKE_Y0) + return PL2_I7_SKU; + + return PL2_DEFAULT; +} + uint32_t variant_board_sku(void) { static uint32_t sku_id = SKU_UNKNOWN; @@ -42,16 +54,21 @@ uint32_t variant_board_sku(void) return sku_id; } +/* Override dev tree settings per board */ void variant_devtree_update(void) { - /* Override dev tree settings per board */ uint32_t sku_id = variant_board_sku(); struct device *root = SA_DEV_ROOT; config_t *cfg = root->chip_info; + + /* Update PL2 based on SKU. */ + cfg->tdp_pl2_override = get_pl2(); + switch (sku_id) { case SKU_1_VAYNE: case SKU_2_VAYNE: - cfg->usb2_ports[5].enable = 0;//rear camera + /* Disable unused port USB port */ + cfg->usb2_ports[5].enable = 0; break; default: break; diff --git a/src/mainboard/google/poppy/variants/nami/pl2.c b/src/mainboard/google/poppy/variants/nami/pl2.c deleted file mode 100644 index 6744f2c407..0000000000 --- a/src/mainboard/google/poppy/variants/nami/pl2.c +++ /dev/null @@ -1,48 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright 2017 Google Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#include <arch/cpu.h> -#include <chip.h> -#include <device/device.h> -#include <intelblocks/mp_init.h> - -#define PL2_I7_SKU 44 -#define PL2_DEFAULT 29 - -static uint32_t nami_get_pl2(void) -{ - struct cpuid_result cpuidr; - - cpuidr = cpuid(1); - if (cpuidr.eax == CPUID_KABYLAKE_Y0) - return PL2_I7_SKU; - - return PL2_DEFAULT; -} - -static void nami_enable(device_t dev) -{ - struct device *root = SA_DEV_ROOT; - config_t *conf = root->chip_info; - - if (!conf) - return; - - conf->tdp_pl2_override = nami_get_pl2(); -} - -struct chip_operations nami_ops = { - .enable_dev = nami_enable, -}; |