diff options
| author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2018-01-17 19:34:08 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-01-19 09:15:42 +0100 |
| commit | a912a7584ec39647fb032c1001eb69746f27b1d3 (patch) | |
| tree | 0d0edb9df1358c071a02c0e0e4ef506b78b0a69f /arch/x86/pci | |
| parent | 1da2fd61d956a01ead87173a8367e5c664617f7b (diff) | |
| download | linux-a912a7584ec39647fb032c1001eb69746f27b1d3.tar.bz2 | |
x86/platform/intel-mid: Move PCI initialization to arch_init()
ACPI redefines x86_init.pci.init when enabled. Though we still need special
treatment for MID platforms.
Move our specific callback to x86_init.pci.arch_init() and, by calling
acpi_noirq_set(), take back a control over IRQ assignment.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rafael J. Wysocki <rjw@rjwysocki.net>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-acpi@vger.kernel.org
Link: http://lkml.kernel.org/r/20180117173409.88136-2-andriy.shevchenko@linux.intel.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/pci')
| -rw-r--r-- | arch/x86/pci/intel_mid_pci.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/pci/intel_mid_pci.c b/arch/x86/pci/intel_mid_pci.c index 511921045312..43867bc85368 100644 --- a/arch/x86/pci/intel_mid_pci.c +++ b/arch/x86/pci/intel_mid_pci.c @@ -300,6 +300,7 @@ int __init intel_mid_pci_init(void) pci_root_ops = intel_mid_pci_ops; pci_soc_mode = 1; /* Continue with standard init */ + acpi_noirq_set(); return 1; } |