aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomasz Nowicki <tn@semihalf.com>2016-01-12 18:46:23 +0100
committerTomasz Nowicki <tn@semihalf.com>2016-01-22 12:18:47 +0100
commit1696ac6699837ceee188a9fd97087e612509bf6b (patch)
treead2e4e570ab28eb0f16653087ae44f14ddc59ca6
parentfcd544e9cb3f90f552643018fd3eae45fae6e6f9 (diff)
downloadleg-kernel-1696ac6699837ceee188a9fd97087e612509bf6b.tar.gz
arm64, pci, acpi: Start using ACPI based PCI host bridge driver for ARM64.
Lets get rid of empty PCI init stub, related ACPI header and go with full-blown PCI host bridge driver. Signed-off-by: Tomasz Nowicki <tn@semihalf.com> CC: Arnd Bergmann <arnd@arndb.de> CC: Catalin Marinas <catalin.marinas@arm.com> CC: Liviu Dudau <Liviu.Dudau@arm.com> CC: Lorenzo Pieralisi <Lorenzo.Pieralisi@arm.com> CC: Will Deacon <will.deacon@arm.com>
-rw-r--r--arch/arm64/Kconfig1
-rw-r--r--arch/arm64/kernel/pci.c10
2 files changed, 1 insertions, 10 deletions
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index d65d315e2a5b..573bebcb93e4 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 023b983f148f..a0929a6163f6 100644
--- a/arch/arm64/kernel/pci.c
+++ b/arch/arm64/kernel/pci.c
@@ -10,7 +10,6 @@
*
*/
-#include <linux/acpi.h>
#include <linux/init.h>
#include <linux/io.h>
#include <linux/kernel.h>
@@ -60,12 +59,3 @@ int pcibios_add_device(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