diff options
Diffstat (limited to 'src/drivers/intel')
| -rw-r--r-- | src/drivers/intel/dptf/dptf.c | 2 | ||||
| -rw-r--r-- | src/drivers/intel/ish/ish.c | 2 | ||||
| -rw-r--r-- | src/drivers/intel/mipi_camera/camera.c | 8 | ||||
| -rw-r--r-- | src/drivers/intel/soundwire/soundwire.c | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/drivers/intel/dptf/dptf.c b/src/drivers/intel/dptf/dptf.c index bceb0dea4a..f313540d59 100644 --- a/src/drivers/intel/dptf/dptf.c +++ b/src/drivers/intel/dptf/dptf.c @@ -503,7 +503,7 @@ static void write_device_definitions(const struct device *dev) enum dptf_participant p; /* The CPU device gets an _ADR that matches the ACPI PCI address for 00:04.00 */ - parent = dev && dev->bus ? dev->bus->dev : NULL; + parent = dev && dev->upstream ? dev->upstream->dev : NULL; if (!parent || parent->path.type != DEVICE_PATH_PCI) { printk(BIOS_ERR, "%s: DPTF objects must live under 00:04.0 PCI device\n", __func__); diff --git a/src/drivers/intel/ish/ish.c b/src/drivers/intel/ish/ish.c index 6dba46adc7..0ad0bb86d0 100644 --- a/src/drivers/intel/ish/ish.c +++ b/src/drivers/intel/ish/ish.c @@ -12,7 +12,7 @@ static void ish_fill_ssdt_generator(const struct device *dev) { struct drivers_intel_ish_config *config = dev->chip_info; - struct device *root = dev->bus->dev; + struct device *root = dev->upstream->dev; struct acpi_dp *dsd; if (!config) diff --git a/src/drivers/intel/mipi_camera/camera.c b/src/drivers/intel/mipi_camera/camera.c index 77c86eaeb6..4044a26896 100644 --- a/src/drivers/intel/mipi_camera/camera.c +++ b/src/drivers/intel/mipi_camera/camera.c @@ -199,7 +199,7 @@ static void camera_generate_pld(const struct device *dev) static uint32_t address_for_dev_type(const struct device *dev, uint8_t dev_type) { struct drivers_intel_mipi_camera_config *config = dev->chip_info; - uint16_t i2c_bus = dev->bus ? dev->bus->secondary : 0xFFFF; + uint16_t i2c_bus = dev->upstream ? dev->upstream->secondary : 0xFFFF; uint16_t i2c_addr; switch (dev_type) { @@ -416,7 +416,7 @@ static void camera_fill_sensor(const struct device *dev) .type = DEVICE_PATH_I2C, .i2c.device = config->vcm_address, }; - struct device *vcm_dev = find_dev_path(dev->bus, &path); + struct device *vcm_dev = find_dev_path(dev->upstream, &path); struct drivers_intel_mipi_camera_config *vcm_config; vcm_config = vcm_dev ? vcm_dev->chip_info : NULL; @@ -927,7 +927,7 @@ static void camera_fill_ssdt(const struct device *dev) const struct device *pdev; if (config->has_power_resource) { - pdev = dev->bus->dev; + pdev = dev->upstream->dev; if (!pdev || !pdev->enabled) return; @@ -951,7 +951,7 @@ static void camera_fill_ssdt(const struct device *dev) write_i2c_camera_device(dev, scope); break; case DEVICE_PATH_GENERIC: - pdev = dev->bus->dev; + pdev = dev->upstream->dev; scope = acpi_device_scope(pdev); if (!scope) return; diff --git a/src/drivers/intel/soundwire/soundwire.c b/src/drivers/intel/soundwire/soundwire.c index f9421fc81c..0137dad5b4 100644 --- a/src/drivers/intel/soundwire/soundwire.c +++ b/src/drivers/intel/soundwire/soundwire.c @@ -21,7 +21,7 @@ static bool link_enabled(const struct device *dev, unsigned int link) { struct device *child; - for (child = dev->link_list->children; child; child = child->sibling) { + for (child = dev->downstream->children; child; child = child->sibling) { if (child->enabled && child->path.type == DEVICE_PATH_GENERIC && child->path.generic.id == link) return true; |