@@ -8,6 +8,8 @@
* Copyright (C) 2007 MontaVista Software Inc.
* Copyright (C) 2009 Provigent Ltd.
*/
+
+#include <linux/acpi.h>
#include <linux/clk-provider.h>
#include <linux/clk.h>
#include <linux/delay.h>
@@ -86,6 +88,76 @@ static const struct dmi_system_id dw_i2c_hwmon_class_dmi[] = {
{ } /* terminate list */
};
+static const struct dmi_system_id dw_i2c_amd_gpio_defer_dmi[] = {
+ {
+ .ident = "Lenovo Yoga 7 14AGP11",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+ DMI_MATCH(DMI_PRODUCT_NAME, "83TD"),
+ DMI_MATCH(DMI_BOARD_NAME, "LNVNB161216"),
+ },
+ },
+ { } /* terminate list */
+};
+
+static bool dw_i2c_needs_amd_gpio_dep(struct device *device)
+{
+ struct acpi_device *adev;
+
+ if (!dmi_check_system(dw_i2c_amd_gpio_defer_dmi))
+ return false;
+
+ adev = ACPI_COMPANION(device);
+ if (!adev)
+ return false;
+
+ return acpi_dev_hid_uid_match(adev, "AMDI0010", "2");
+}
+
+static int dw_i2c_defer_for_amd_gpio(struct device *device)
+{
+ struct acpi_device *gpio_adev;
+ struct device *gpio_dev;
+
+ if (!dw_i2c_needs_amd_gpio_dep(device))
+ return 0;
+
+ /*
+ * Find the AMD GPIO controller by HID/UID and get its physical
+ * platform device. We need the platform device (not the ACPI device)
+ * because that is what gets bound by the amd_gpio driver.
+ */
+ gpio_adev = acpi_dev_get_first_match_dev("AMDI0030", "0", -1);
+ if (!gpio_adev)
+ return -EPROBE_DEFER;
+
+ gpio_dev = acpi_get_first_physical_node(gpio_adev);
+ acpi_dev_put(gpio_adev);
+ if (!gpio_dev)
+ return -EPROBE_DEFER;
+
+ /*
+ * Check that amd_gpio probe has fully completed, not just that the
+ * driver pointer is set. The driver pointer is assigned before probe
+ * finishes, so checking it would allow i2c_designware to probe before
+ * the GPIO IRQ quirk in amd_gpio_probe() has run.
+ */
+ scoped_guard(device, gpio_dev) {
+ if (!device_is_bound(gpio_dev))
+ return -EPROBE_DEFER;
+ }
+
+ /*
+ * Create a device link so the driver core enforces probe/remove
+ * ordering between this I2C controller and the GPIO controller.
+ */
+ if (!device_link_add(device, gpio_dev, DL_FLAG_AUTOREMOVE_CONSUMER))
+ dev_warn(device, "failed to add device link to %s\n",
+ dev_name(gpio_dev));
+
+ return 0;
+}
+
static const struct i2c_dw_semaphore_callbacks i2c_dw_semaphore_cb_table[] = {
#ifdef CONFIG_I2C_DESIGNWARE_BAYTRAIL
{
@@ -138,6 +210,10 @@ static int dw_i2c_plat_probe(struct platform_device *pdev)
struct dw_i2c_dev *dev;
int irq, ret;
+ ret = dw_i2c_defer_for_amd_gpio(device);
+ if (ret)
+ return ret;
+
irq = platform_get_irq_optional(pdev, 0);
if (irq == -ENXIO)
flags |= ACCESS_POLLING;
On Lenovo Yoga 7 14AGP11 (83TD), the WACF2200 touchscreen fails with lost arbitration errors on AMDI0010:02 at boot. The root cause is a probe ordering issue: i2c_designware probes AMDI0010:02 before pinctrl-amd has finished initialising, so the GPIO 157 interrupt needed by the touchscreen is not yet enabled. Add a DMI-matched deferral in dw_i2c_plat_probe() that uses device_is_bound() under device_lock() to correctly wait until pinctrl-amd's probe has fully completed. Use acpi_dev_get_first_match_dev() for robust HID/UID-based GPIO controller lookup instead of string name matching. Signed-off-by: Hardik Prakash <hardikprakash.official@gmail.com> Assisted-by: Claude:claude-sonnet-4-6 Assisted-by: GPT-Codex:gpt-5.2-codex BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=221494 --- drivers/i2c/busses/i2c-designware-platdrv.c | 76 +++++++++++++++++++++ 1 file changed, 76 insertions(+)