aboutsummaryrefslogtreecommitdiff
path: root/src/mainboard/google/octopus
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2018-06-21 16:20:55 +0300
committerFelix Held <felix-coreboot@felixheld.de>2019-01-06 13:09:54 +0000
commite7377556cc33b10fdba6d956ac83d823478f5eb4 (patch)
tree8843182316aed1730edb12aa0fbc18de4d3be414 /src/mainboard/google/octopus
parentc70eed1e6202c928803f3e7f79161cd247a62b23 (diff)
device: Use pcidev_path_on_root()
Change-Id: I2e28b9f4ecaf258bff8a062b5a54cb3d8e2bb9b0 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/30400 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
Diffstat (limited to 'src/mainboard/google/octopus')
-rw-r--r--src/mainboard/google/octopus/mainboard.c4
-rw-r--r--src/mainboard/google/octopus/variants/phaser/variant.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/mainboard/google/octopus/mainboard.c b/src/mainboard/google/octopus/mainboard.c
index 57a614ee34..5b011c8f19 100644
--- a/src/mainboard/google/octopus/mainboard.c
+++ b/src/mainboard/google/octopus/mainboard.c
@@ -36,7 +36,7 @@
static bool is_cnvi_held_in_reset(void)
{
- struct device *dev = dev_find_slot(0, PCH_DEVFN_CNVI);
+ struct device *dev = pcidev_path_on_root(PCH_DEVFN_CNVI);
uint32_t reg = pci_read_config32(dev, PCI_VENDOR_ID);
/*
@@ -167,7 +167,7 @@ static void wifi_device_update(void)
else
devfn = PCH_DEVFN_PCIE1;
- dev = dev_find_slot(0, devfn);
+ dev = pcidev_path_on_root(devfn);
if (dev)
dev->enabled = 0;
}
diff --git a/src/mainboard/google/octopus/variants/phaser/variant.c b/src/mainboard/google/octopus/variants/phaser/variant.c
index 724dd13251..22f4f71b92 100644
--- a/src/mainboard/google/octopus/variants/phaser/variant.c
+++ b/src/mainboard/google/octopus/variants/phaser/variant.c
@@ -25,7 +25,7 @@ void variant_update_devtree(struct device *dev)
uint32_t sku_id = SKU_UNKNOWN;
struct device *touchscreen_i2c_host;
- touchscreen_i2c_host = dev_find_slot(0, PCH_DEVFN_I2C7);
+ touchscreen_i2c_host = pcidev_path_on_root(PCH_DEVFN_I2C7);
if (touchscreen_i2c_host == NULL)
return;