Merge tag 'pm+acpi-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[pandora-kernel.git] / drivers / base / platform.c

diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index 9421fed..ebf034b 100644 (file)
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -101,6 +101,15 @@ int platform_get_irq(struct platform_device *dev, unsigned int num)
        }
 
        r = platform_get_resource(dev, IORESOURCE_IRQ, num);
+       /*
+        * The resources may pass trigger flags to the irqs that need
+        * to be set up. It so happens that the trigger flags for
+        * IORESOURCE_BITS correspond 1-to-1 to the IRQF_TRIGGER*
+        * settings.
+        */
+       if (r && r->flags & IORESOURCE_BITS)
+               irqd_set_trigger_type(irq_get_irq_data(r->start),
+                                     r->flags & IORESOURCE_BITS);
 
        return r ? r->start : -ENXIO;
 #endif
@@ -454,7 +463,7 @@ struct platform_device *platform_device_register_full(
                goto err_alloc;
 
        pdev->dev.parent = pdevinfo->parent;
-       ACPI_COMPANION_SET(&pdev->dev, pdevinfo->acpi_node.companion);
+       pdev->dev.fwnode = pdevinfo->fwnode;
 
        if (pdevinfo->dma_mask) {
                /*