Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android

[firefly-linux-kernel-4.4.55.git] / include / linux / msi.h

diff --git a/include/linux/msi.h b/include/linux/msi.h
index f71a25e5fd25b574bceaf9b397b62e0913419067..f0f43ec45ee7e422fa5aae331694f45fd3012be8 100644 (file)
--- a/include/linux/msi.h
+++ b/include/linux/msi.h
@@ -254,12 +254,12 @@ enum {
         * callbacks.
         */
        MSI_FLAG_USE_DEF_CHIP_OPS       = (1 << 1),
-       /* Build identity map between hwirq and irq */
-       MSI_FLAG_IDENTITY_MAP           = (1 << 2),
        /* Support multiple PCI MSI interrupts */
-       MSI_FLAG_MULTI_PCI_MSI          = (1 << 3),
+       MSI_FLAG_MULTI_PCI_MSI          = (1 << 2),
        /* Support PCI MSIX interrupts */
-       MSI_FLAG_PCI_MSIX               = (1 << 4),
+       MSI_FLAG_PCI_MSIX               = (1 << 3),
+       /* Needs early activate, required for PCI */
+       MSI_FLAG_ACTIVATE_EARLY         = (1 << 4),
 };
 
 int msi_domain_set_affinity(struct irq_data *data, const struct cpumask *mask,