1 files changed, 26 insertions, 4 deletions

diff --git a/drivers/acpi/pmic/intel_pmic_xpower.c b/drivers/acpi/pmic/intel_pmic_xpower.c
index f8853e5eb838..6a082d4de12c 100644
--- a/drivers/acpi/pmic/intel_pmic_xpower.c
+++ b/drivers/acpi/pmic/intel_pmic_xpower.c
@@ -220,13 +220,35 @@ static struct intel_pmic_opregion_data intel_xpower_pmic_opregion_data = {
         .thermal_table_count = ARRAY_SIZE(thermal_table),
 };
 
+static acpi_status intel_xpower_pmic_gpio_handler(u32 function,
+                acpi_physical_address address, u32 bit_width, u64 *value,
+                void *handler_context, void *region_context)
+{
+        return AE_OK;
+}
 
 static int intel_xpower_pmic_opregion_probe(struct platform_device *pdev)
 {
-        struct axp20x_dev *axp20x = dev_get_drvdata(pdev->dev.parent);
-        return intel_pmic_install_opregion_handler(&pdev->dev,
-                        ACPI_HANDLE(pdev->dev.parent), axp20x->regmap,
-                        &intel_xpower_pmic_opregion_data);
+        struct device *parent = pdev->dev.parent;
+        struct axp20x_dev *axp20x = dev_get_drvdata(parent);
+        acpi_status status;
+        int result;
+
+        status = acpi_install_address_space_handler(ACPI_HANDLE(parent),
+                        ACPI_ADR_SPACE_GPIO, intel_xpower_pmic_gpio_handler,
+                        NULL, NULL);
+        if (ACPI_FAILURE(status))
+                return -ENODEV;
+
+        result = intel_pmic_install_opregion_handler(&pdev->dev,
+                                        ACPI_HANDLE(parent), axp20x->regmap,
+                                        &intel_xpower_pmic_opregion_data);
+        if (result)
+                acpi_remove_address_space_handler(ACPI_HANDLE(parent),
+                                                  ACPI_ADR_SPACE_GPIO,
+                                                  intel_xpower_pmic_gpio_handler);
+
+        return result;
 }
 
 static struct platform_driver intel_xpower_pmic_opregion_driver = {