summaryrefslogtreecommitdiff
path: root/src/mainboard/google
diff options
context:
space:
mode:
Diffstat (limited to 'src/mainboard/google')
-rw-r--r--src/mainboard/google/fizz/mainboard.c3
-rw-r--r--src/mainboard/google/poppy/variants/atlas/mainboard.c3
-rw-r--r--src/mainboard/google/poppy/variants/nami/mainboard.c4
-rw-r--r--src/mainboard/google/poppy/variants/nautilus/mainboard.c4
-rw-r--r--src/mainboard/google/poppy/variants/nocturne/mainboard.c3
5 files changed, 7 insertions, 10 deletions
diff --git a/src/mainboard/google/fizz/mainboard.c b/src/mainboard/google/fizz/mainboard.c
index 54fd7dfe6d..6b3423b886 100644
--- a/src/mainboard/google/fizz/mainboard.c
+++ b/src/mainboard/google/fizz/mainboard.c
@@ -221,8 +221,7 @@ static unsigned long mainboard_write_acpi_tables(
static void mainboard_enable(struct device *dev)
{
- struct device *root = SA_DEV_ROOT;
- config_t *conf = root->chip_info;
+ config_t *conf = config_of_path(SA_DEVFN_ROOT);
mainboard_set_power_limits(conf);
diff --git a/src/mainboard/google/poppy/variants/atlas/mainboard.c b/src/mainboard/google/poppy/variants/atlas/mainboard.c
index 07a4e66c1f..d4db98e67e 100644
--- a/src/mainboard/google/poppy/variants/atlas/mainboard.c
+++ b/src/mainboard/google/poppy/variants/atlas/mainboard.c
@@ -37,8 +37,7 @@ static uint32_t get_pl2(void)
/* Override dev tree settings per board */
void variant_devtree_update(void)
{
- struct device *root = SA_DEV_ROOT;
- config_t *cfg = root->chip_info;
+ config_t *cfg = config_of_path(SA_DEVFN_ROOT);
/* Update PL2 based on CPU */
cfg->tdp_pl2_override = get_pl2();
diff --git a/src/mainboard/google/poppy/variants/nami/mainboard.c b/src/mainboard/google/poppy/variants/nami/mainboard.c
index adb8c00579..1ec9e3ae3d 100644
--- a/src/mainboard/google/poppy/variants/nami/mainboard.c
+++ b/src/mainboard/google/poppy/variants/nami/mainboard.c
@@ -234,11 +234,11 @@ void variant_devtree_update(void)
uint32_t sku_id = variant_board_sku();
uint32_t i;
int oem_index;
- struct device *root = SA_DEV_ROOT;
- config_t *cfg = root->chip_info;
uint8_t pl2_id = PL2_ID_DEFAULT;
struct device *spi_fpmcu = PCH_DEV_GSPI1;
+ config_t *cfg = config_of_path(SA_DEVFN_ROOT);
+
switch (sku_id) {
case SKU_0_SONA:
case SKU_1_SONA:
diff --git a/src/mainboard/google/poppy/variants/nautilus/mainboard.c b/src/mainboard/google/poppy/variants/nautilus/mainboard.c
index 6d9f2e99a9..9aa6b724dd 100644
--- a/src/mainboard/google/poppy/variants/nautilus/mainboard.c
+++ b/src/mainboard/google/poppy/variants/nautilus/mainboard.c
@@ -41,11 +41,11 @@ const char *smbios_system_sku(void)
void variant_devtree_update(void)
{
uint32_t sku_id = variant_board_sku();
- struct device *root = SA_DEV_ROOT;
- config_t *cfg = root->chip_info;
uint16_t abase;
uint32_t val32;
+ config_t *cfg = config_of_path(SA_DEVFN_ROOT);
+
switch (sku_id) {
case SKU_0_NAUTILUS:
/* Disable LTE module */
diff --git a/src/mainboard/google/poppy/variants/nocturne/mainboard.c b/src/mainboard/google/poppy/variants/nocturne/mainboard.c
index 28d3d1b24d..f00394ced0 100644
--- a/src/mainboard/google/poppy/variants/nocturne/mainboard.c
+++ b/src/mainboard/google/poppy/variants/nocturne/mainboard.c
@@ -38,8 +38,7 @@ static uint32_t get_pl2(void)
/* Override dev tree settings per board */
void variant_devtree_update(void)
{
- struct device *root = SA_DEV_ROOT;
- config_t *cfg = root->chip_info;
+ config_t *cfg = config_of_path(SA_DEVFN_ROOT);
/* Update PL2 based on CPU */
cfg->tdp_pl2_override = get_pl2();