1 files changed, 17 insertions, 4 deletions

diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index 5f837f2e4f41..dab0a5abc391 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -147,7 +147,20 @@ int platform_get_irq(struct platform_device *dev, unsigned int num)
                 irqd_set_trigger_type(irqd, r->flags & IORESOURCE_BITS);
         }
 
-        return r ? r->start : -ENXIO;
+        if (r)
+                return r->start;
+
+        /*
+         * For the index 0 interrupt, allow falling back to GpioInt
+         * resources. While a device could have both Interrupt and GpioInt
+         * resources, making this fallback ambiguous, in many common cases
+         * the device will only expose one IRQ, and this fallback
+         * allows a common code path across either kind of resource.
+         */
+        if (num == 0 && has_acpi_companion(&dev->dev))
+                return acpi_dev_gpio_irq_get(ACPI_COMPANION(&dev->dev), num);
+
+        return -ENXIO;
 #endif
 }
 EXPORT_SYMBOL_GPL(platform_get_irq);
@@ -528,10 +541,12 @@ struct platform_device *platform_device_register_full(
 
         pdev = platform_device_alloc(pdevinfo->name, pdevinfo->id);
         if (!pdev)
-                goto err_alloc;
+                return ERR_PTR(-ENOMEM);
 
         pdev->dev.parent = pdevinfo->parent;
         pdev->dev.fwnode = pdevinfo->fwnode;
+        pdev->dev.of_node = of_node_get(to_of_node(pdev->dev.fwnode));
+        pdev->dev.of_node_reused = pdevinfo->of_node_reused;
 
         if (pdevinfo->dma_mask) {
                 /*
@@ -573,8 +588,6 @@ struct platform_device *platform_device_register_full(
 err:
                 ACPI_COMPANION_SET(&pdev->dev, NULL);
                 kfree(pdev->dev.dma_mask);
-
-err_alloc:
                 platform_device_put(pdev);
                 return ERR_PTR(ret);
         }