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>
This commit is contained in:
parent
1da2fd61d9
commit
a912a7584e
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
@ -194,7 +194,7 @@ void __init x86_intel_mid_early_setup(void)
|
|||
x86_platform.calibrate_tsc = intel_mid_calibrate_tsc;
|
||||
x86_platform.get_nmi_reason = intel_mid_get_nmi_reason;
|
||||
|
||||
x86_init.pci.init = intel_mid_pci_init;
|
||||
x86_init.pci.arch_init = intel_mid_pci_init;
|
||||
x86_init.pci.fixup_irqs = x86_init_noop;
|
||||
|
||||
legacy_pic = &null_legacy_pic;
|
||||
|
|
Loading…
Reference in a new issue