From 93b4268fb794d334b913eb76a68e37597ad51caa Mon Sep 17 00:00:00 2001
From: Nicholas Chin <nic.c3.14@gmail.com>
Date: Sat, 5 Oct 2024 21:40:38 -0600
Subject: mb/google/*: Explicitly include static.h for DEV_PTR

As per commit 05a13e7ed9b9 ("sconfig: Move (WEAK_)DEV_PTR from device.h
to static.h"), sources that require access to devicetree static devices
should directly include static.h. This allows static.h to be removed
from device.h, eliminating unnecessary dependencies on the devicetree
for objects that only need the device types and function declarations.

The DEV_PTR macro resolves to names declared in static_devices.h, which
is then included in static.h, so include the header whenever the macro
is used.

Change-Id: I05662e601af00866b7f26f4c6c6794b491bf676e
Signed-off-by: Nicholas Chin <nic.c3.14@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/84678
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Jayvik Desai <jayvik@google.com>
Reviewed-by: Felix Singer <service+coreboot-gerrit@felixsinger.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
 src/mainboard/google/brya/mainboard.c                 | 1 +
 src/mainboard/google/brya/variants/agah/variant.c     | 1 +
 src/mainboard/google/brya/variants/aurash/ramstage.c  | 1 +
 src/mainboard/google/brya/variants/craask/variant.c   | 1 +
 src/mainboard/google/brya/variants/craaskov/variant.c | 1 +
 src/mainboard/google/brya/variants/hades/variant.c    | 1 +
 src/mainboard/google/brya/variants/joxer/variant.c    | 1 +
 src/mainboard/google/brya/variants/kinox/ramstage.c   | 1 +
 src/mainboard/google/brya/variants/moli/ramstage.c    | 1 +
 src/mainboard/google/brya/variants/primus/variant.c   | 1 +
 src/mainboard/google/brya/variants/quandiso/variant.c | 1 +
 src/mainboard/google/brya/variants/vell/variant.c     | 1 +
 src/mainboard/google/brya/variants/yaviks/variant.c   | 1 +
 src/mainboard/google/brya/variants/yavilla/variant.c  | 1 +
 14 files changed, 14 insertions(+)

(limited to 'src/mainboard/google/brya')

diff --git a/src/mainboard/google/brya/mainboard.c b/src/mainboard/google/brya/mainboard.c
index 07aa4b5cdc..3d33f6f007 100644
--- a/src/mainboard/google/brya/mainboard.c
+++ b/src/mainboard/google/brya/mainboard.c
@@ -11,6 +11,7 @@
 #include <security/tpm/tss.h>
 #include <soc/gpio.h>
 #include <soc/ramstage.h>
+#include <static.h>
 #include <stdio.h>
 
 WEAK_DEV_PTR(rp6_wwan);
diff --git a/src/mainboard/google/brya/variants/agah/variant.c b/src/mainboard/google/brya/variants/agah/variant.c
index 9acee54284..03720332bd 100644
--- a/src/mainboard/google/brya/variants/agah/variant.c
+++ b/src/mainboard/google/brya/variants/agah/variant.c
@@ -7,6 +7,7 @@
 #include <delay.h>
 #include <device/pci.h>
 #include <gpio.h>
+#include <static.h>
 #include <timer.h>
 #include <types.h>
 
diff --git a/src/mainboard/google/brya/variants/aurash/ramstage.c b/src/mainboard/google/brya/variants/aurash/ramstage.c
index 700d173042..b8845d92a0 100644
--- a/src/mainboard/google/brya/variants/aurash/ramstage.c
+++ b/src/mainboard/google/brya/variants/aurash/ramstage.c
@@ -11,6 +11,7 @@
 #include <fw_config.h>
 #include <intelblocks/power_limit.h>
 #include <drivers/intel/dptf/chip.h>
+#include <static.h>
 
 const struct cpu_power_limits limits[] = {
 	/* SKU_ID, TDP (Watts), pl1_min, pl1_max, pl2_min, pl2_max, pl4 */
diff --git a/src/mainboard/google/brya/variants/craask/variant.c b/src/mainboard/google/brya/variants/craask/variant.c
index 24d7e00934..5f6076ee0e 100644
--- a/src/mainboard/google/brya/variants/craask/variant.c
+++ b/src/mainboard/google/brya/variants/craask/variant.c
@@ -5,6 +5,7 @@
 #include <device/device.h>
 #include <fw_config.h>
 #include <sar.h>
+#include <static.h>
 
 const char *get_wifi_sar_cbfs_filename(void)
 {
diff --git a/src/mainboard/google/brya/variants/craaskov/variant.c b/src/mainboard/google/brya/variants/craaskov/variant.c
index 4a06f10f13..406d604330 100644
--- a/src/mainboard/google/brya/variants/craaskov/variant.c
+++ b/src/mainboard/google/brya/variants/craaskov/variant.c
@@ -5,6 +5,7 @@
 #include <device/device.h>
 #include <fw_config.h>
 #include <sar.h>
+#include <static.h>
 
 const char *get_wifi_sar_cbfs_filename(void)
 {
diff --git a/src/mainboard/google/brya/variants/hades/variant.c b/src/mainboard/google/brya/variants/hades/variant.c
index 48e2652e8e..7a258fbf40 100644
--- a/src/mainboard/google/brya/variants/hades/variant.c
+++ b/src/mainboard/google/brya/variants/hades/variant.c
@@ -7,6 +7,7 @@
 #include <delay.h>
 #include <device/pci.h>
 #include <gpio.h>
+#include <static.h>
 #include <timer.h>
 #include <types.h>
 
diff --git a/src/mainboard/google/brya/variants/joxer/variant.c b/src/mainboard/google/brya/variants/joxer/variant.c
index e371ada63d..1f2ea9fc7e 100644
--- a/src/mainboard/google/brya/variants/joxer/variant.c
+++ b/src/mainboard/google/brya/variants/joxer/variant.c
@@ -8,6 +8,7 @@
 #include <fw_config.h>
 #include <soc/bootblock.h>
 #include <sar.h>
+#include <static.h>
 
 WEAK_DEV_PTR(dptf_policy);
 
diff --git a/src/mainboard/google/brya/variants/kinox/ramstage.c b/src/mainboard/google/brya/variants/kinox/ramstage.c
index 3063c62a53..c343c0424e 100644
--- a/src/mainboard/google/brya/variants/kinox/ramstage.c
+++ b/src/mainboard/google/brya/variants/kinox/ramstage.c
@@ -9,6 +9,7 @@
 #include <drivers/intel/dptf/chip.h>
 #include <ec/google/chromeec/ec.h>
 #include <intelblocks/power_limit.h>
+#include <static.h>
 
 WEAK_DEV_PTR(dptf_policy);
 
diff --git a/src/mainboard/google/brya/variants/moli/ramstage.c b/src/mainboard/google/brya/variants/moli/ramstage.c
index 2be75e41bf..af26697072 100644
--- a/src/mainboard/google/brya/variants/moli/ramstage.c
+++ b/src/mainboard/google/brya/variants/moli/ramstage.c
@@ -13,6 +13,7 @@
 #include <drivers/intel/dptf/chip.h>
 #include <boardid.h>
 #include <soc/intel/common/block/pcie/rtd3/chip.h>
+#include <static.h>
 #include <acpi/acpi_device.h>
 
 static void devtree_update_emmc_rtd3(void)
diff --git a/src/mainboard/google/brya/variants/primus/variant.c b/src/mainboard/google/brya/variants/primus/variant.c
index e78dfdc5db..c1ea39eb89 100644
--- a/src/mainboard/google/brya/variants/primus/variant.c
+++ b/src/mainboard/google/brya/variants/primus/variant.c
@@ -6,6 +6,7 @@
 #include <drivers/i2c/hid/chip.h>
 #include <fw_config.h>
 #include <gpio.h>
+#include <static.h>
 
 static void devtree_update_emmc_rtd3(uint32_t board_ver)
 {
diff --git a/src/mainboard/google/brya/variants/quandiso/variant.c b/src/mainboard/google/brya/variants/quandiso/variant.c
index 9140eb043f..4f6ebb8d6b 100644
--- a/src/mainboard/google/brya/variants/quandiso/variant.c
+++ b/src/mainboard/google/brya/variants/quandiso/variant.c
@@ -5,6 +5,7 @@
 #include <device/device.h>
 #include <fw_config.h>
 #include <sar.h>
+#include <static.h>
 
 void variant_devtree_update(void)
 {
diff --git a/src/mainboard/google/brya/variants/vell/variant.c b/src/mainboard/google/brya/variants/vell/variant.c
index 216de3c90d..ce75438ba6 100644
--- a/src/mainboard/google/brya/variants/vell/variant.c
+++ b/src/mainboard/google/brya/variants/vell/variant.c
@@ -4,6 +4,7 @@
 #include <boardid.h>
 #include <sar.h>
 #include <soc/pci_devs.h>
+#include <static.h>
 
 const char *get_wifi_sar_cbfs_filename(void)
 {
diff --git a/src/mainboard/google/brya/variants/yaviks/variant.c b/src/mainboard/google/brya/variants/yaviks/variant.c
index 5c0c9fff64..97691f717f 100644
--- a/src/mainboard/google/brya/variants/yaviks/variant.c
+++ b/src/mainboard/google/brya/variants/yaviks/variant.c
@@ -7,6 +7,7 @@
 #include <drivers/intel/gma/opregion.h>
 #include <fw_config.h>
 #include <sar.h>
+#include <static.h>
 
 const char *get_wifi_sar_cbfs_filename(void)
 {
diff --git a/src/mainboard/google/brya/variants/yavilla/variant.c b/src/mainboard/google/brya/variants/yavilla/variant.c
index 9140eb043f..4f6ebb8d6b 100644
--- a/src/mainboard/google/brya/variants/yavilla/variant.c
+++ b/src/mainboard/google/brya/variants/yavilla/variant.c
@@ -5,6 +5,7 @@
 #include <device/device.h>
 #include <fw_config.h>
 #include <sar.h>
+#include <static.h>
 
 void variant_devtree_update(void)
 {
-- 
cgit v1.2.3