From 4e2ae7321db4b84d0fa4e0064f115f98434934ed Mon Sep 17 00:00:00 2001 From: Tomasz Nowicki Date: Tue, 16 Feb 2016 12:36:14 +0100 Subject: arm64, pci, acpi: Start using ACPI based PCI host bridge driver for ARM64. It is perfectly fine to use ACPI_PCI_HOST_GENERIC for ARM64, so lets get rid of PCI init empty stub, related ACPI header and go with full-blown PCI host controller driver. Signed-off-by: Tomasz Nowicki TO: Catalin Marinas TO: Lorenzo Pieralisi TO: Will Deacon TO: Arnd Bergmann CC: Liviu Dudau Tested-by: Duc Dang Tested-by: Dongdong Liu Tested-by: Hanjun Guo Tested-by: Graeme Gregory Tested-by: Sinan Kaya --- arch/arm64/Kconfig | 1 + arch/arm64/kernel/pci.c | 9 --------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 74470b4775bd..4c2f9296724f 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -2,6 +2,7 @@ config ARM64 def_bool y select ACPI_CCA_REQUIRED if ACPI select ACPI_GENERIC_GSI if ACPI + select ACPI_PCI_HOST_GENERIC if ACPI select ACPI_REDUCED_HARDWARE_ONLY if ACPI select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE select ARCH_HAS_ELF_RANDOMIZE diff --git a/arch/arm64/kernel/pci.c b/arch/arm64/kernel/pci.c index 6e77e1bbadaa..1de01684a469 100644 --- a/arch/arm64/kernel/pci.c +++ b/arch/arm64/kernel/pci.c @@ -65,12 +65,3 @@ int pcibios_alloc_irq(struct pci_dev *dev) return 0; } - -#ifdef CONFIG_ACPI -/* Root bridge scanning */ -struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root) -{ - /* TODO: Should be revisited when implementing PCI on ACPI */ - return NULL; -} -#endif -- cgit v1.2.3