aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Roth <martinroth@chromium.org>2021-08-31 17:49:53 -0600
committerMartin Roth <martinroth@google.com>2021-09-02 23:38:35 +0000
commit349f13071dbb5e3c5e6e5fdf72d5f7cf8b3e0cb7 (patch)
tree32c0921f7dd32cda5bf8cdb5e1a2a6b4f9c54875
parentcd8267b69cc51d204c4a9b62fce490abdc34ec59 (diff)
mb/google/guybrush: Update PCIe WWAN path for WWAN PCIe check
variant_has_pcie_wwan() was always coming back as disabled because find_dev_nested_path() couldn't find the device until the domain was added to the array. BUG=b:193036827 TEST=Boot guybrush with PCIe & USB WWAN devices. Signed-off-by: Martin Roth <martinroth@chromium.org> Change-Id: Id94fa0b0ff5c29fa447e869220d27ccfe61438c6 Reviewed-on: https://review.coreboot.org/c/coreboot/+/57315 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Karthik Ramasubramanian <kramasub@google.com>
-rw-r--r--src/mainboard/google/guybrush/variants/baseboard/helpers.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/src/mainboard/google/guybrush/variants/baseboard/helpers.c b/src/mainboard/google/guybrush/variants/baseboard/helpers.c
index 5297a4925b..cde31c22d9 100644
--- a/src/mainboard/google/guybrush/variants/baseboard/helpers.c
+++ b/src/mainboard/google/guybrush/variants/baseboard/helpers.c
@@ -34,11 +34,15 @@ __weak bool variant_has_fpmcu(void)
__weak bool variant_has_pcie_wwan(void)
{
static const struct device_path pcie_wwan_path[] = {
- {
- .type = DEVICE_PATH_PCI,
- .pci.devfn = PCIE_GPP_2_2_DEVFN,
- },
- };
+ {
+ .type = DEVICE_PATH_DOMAIN,
+ .domain.domain = 0x0,
+ },
+ {
+ .type = DEVICE_PATH_PCI,
+ .pci.devfn = WWAN_DEVFN
+ },
+};
return variant_has_device_enabled(pcie_wwan_path, ARRAY_SIZE(pcie_wwan_path));
}