module_param(quirk, uint, 0444);
 MODULE_PARM_DESC(quirk, "RT5645 pdata quirk override");
 
+static const struct acpi_gpio_mapping *cht_rt5645_gpios;
+
 #define RT5645_DEVICE_ID 0x6308
 #define RT5650_DEVICE_ID 0x6419
 
                rt5645->pdata.dmic2_data_pin = QUIRK_DMIC2_DATA_PIN(quirk);
        }
 
+       if (cht_rt5645_gpios && has_acpi_companion(&i2c->dev))
+               if (devm_acpi_dev_add_driver_gpios(&i2c->dev, cht_rt5645_gpios))
+                       dev_dbg(&i2c->dev, "Failed to add driver gpios\n");
+
        rt5645->gpiod_hp_det = devm_gpiod_get_optional(&i2c->dev, "hp-detect",
                                                       GPIOD_IN);