diff options
author | Tomasz Nowicki <tn@semihalf.com> | 2016-05-10 15:35:10 +0200 |
---|---|---|
committer | Graeme Gregory <graeme.gregory@linaro.org> | 2016-05-17 11:17:28 +0100 |
commit | fb848e5bb27f841cab6ff1e607b4edc9e3718dc9 (patch) | |
tree | 7104ebbf16e982a69d734a723c830acbe6496ae2 | |
parent | 3e557ac6385c38eff0f4fd21a62b619b4187201e (diff) |
arm64, pci, acpi: Start using ACPI based PCI host controller driver for ARM64.topic-pci-20160517.0
It is perfectly fine to use ACPI_PCI_HOST_GENERIC for ARM64,
so lets get rid of PCI init and RAW ACPI accessor empty stubs
and go with full-blown PCI host controller driver.
Signed-off-by: Tomasz Nowicki <tn@semihalf.com>
To: Catalin Marinas <catalin.marinas@arm.com>
To: Lorenzo Pieralisi <Lorenzo.Pieralisi@arm.com>
To: Will Deacon <will.deacon@arm.com>
To: Arnd Bergmann <arnd@arndb.de>
-rw-r--r-- | arch/arm64/Kconfig | 1 | ||||
-rw-r--r-- | arch/arm64/kernel/pci.c | 24 |
2 files changed, 1 insertions, 24 deletions
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 4f436220384f..1bded87ab574 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_DEVMEM_IS_ALLOWED select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE diff --git a/arch/arm64/kernel/pci.c b/arch/arm64/kernel/pci.c index eeec5f6df82b..e484c9177456 100644 --- a/arch/arm64/kernel/pci.c +++ b/arch/arm64/kernel/pci.c @@ -74,27 +74,3 @@ void pcibios_remove_bus(struct pci_bus *bus) { acpi_pci_remove_bus(bus); } - -/* - * raw_pci_read/write - Platform-specific PCI config space access. - */ -int raw_pci_read(unsigned int domain, unsigned int bus, - unsigned int devfn, int reg, int len, u32 *val) -{ - return -ENXIO; -} - -int raw_pci_write(unsigned int domain, unsigned int bus, - unsigned int devfn, int reg, int len, u32 val) -{ - return -ENXIO; -} - -#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 |