42 lines
1.4 KiB
Diff
42 lines
1.4 KiB
Diff
diff --git a/drivers/media/pci/intel/ipu-bridge.c b/drivers/media/pci/intel/ipu-bridge.c
|
|
--- a/drivers/media/pci/intel/ipu-bridge.c
|
|
+++ b/drivers/media/pci/intel/ipu-bridge.c
|
|
@@ -173,6 +173,19 @@ static const struct acpi_device_id ivsc_acpi_ids[] = {
|
|
{ "INTC10E1" }, /* PTL */
|
|
};
|
|
|
|
+/*
|
|
+ * The subset of ivsc_acpi_ids[] which are IVSC, rather than CVS, devices. The
|
|
+ * CVS IDs are deliberately not listed here: new ones keep being added, whereas
|
|
+ * this list is complete.
|
|
+ */
|
|
+static const struct acpi_device_id ivsc_only_acpi_ids[] = {
|
|
+ { "INTC1059" },
|
|
+ { "INTC1095" },
|
|
+ { "INTC100A" },
|
|
+ { "INTC10CF" },
|
|
+ { }
|
|
+};
|
|
+
|
|
static struct acpi_device *ipu_bridge_get_ivsc_acpi_dev(struct acpi_device *adev)
|
|
{
|
|
unsigned int i;
|
|
@@ -224,6 +237,17 @@ static struct device *ipu_bridge_get_ivsc_csi_dev(struct acpi_device *adev)
|
|
return csi_dev;
|
|
}
|
|
|
|
+ /*
|
|
+ * The lookups below match on the ACPI companion alone. That is fine for
|
|
+ * CVS, which binds a driver to that very device, but not for IVSC: there
|
|
+ * the ACPI device also has a driverless platform device, which would be
|
|
+ * returned instead of the mei-csi client. Return NULL for IVSC so that
|
|
+ * the caller fails and the probe is retried once the IVSC device shows
|
|
+ * up.
|
|
+ */
|
|
+ if (!acpi_match_device_ids(adev, ivsc_only_acpi_ids))
|
|
+ return NULL;
|
|
+
|
|
/* Try to locate CVS device on the I2C bus */
|
|
csi_dev = bus_find_device_by_acpi_dev(&i2c_bus_type, adev);
|
|
if (csi_dev)
|