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@xxxxxxxxxxxx>
CC: Arnd Bergmann <arnd@xxxxxxxx>
CC: Catalin Marinas <catalin.marinas@xxxxxxx>
CC: Liviu Dudau <Liviu.Dudau@xxxxxxx>
CC: Lorenzo Pieralisi <Lorenzo.Pieralisi@xxxxxxx>
CC: Will Deacon <will.deacon@xxxxxxx>
---
arch/arm64/Kconfig | 4 ++++
arch/arm64/kernel/pci.c | 10 ----------
2 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index d65d315..71032ed 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -86,6 +86,7 @@ config ARM64
select OF_EARLY_FLATTREE
select OF_RESERVED_MEM
select PERF_USE_VMALLOC
+ select PCI_HOST_GENERIC_ACPI if ACPI
select POWER_RESET
select POWER_SUPPLY
select RTC_LIB
@@ -213,6 +214,9 @@ config PCI_MMCONFIG
select PCI_ECAM
depends on ACPI
+config ARCH_PCI_HOST_GENERIC_ACPI
+ def_bool ACPI
+
endmenu
menu "Kernel Features"
diff --git a/arch/arm64/kernel/pci.c b/arch/arm64/kernel/pci.c
index f7948f5..e9cf58b 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>
@@ -50,12 +49,3 @@ int pcibios_enable_device(struct pci_dev *dev, int mask)
return pci_enable_resources(dev, mask);
}
-
-#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
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
