Skip to content

Commit a4ffbb7

Browse files
committed
Merge branch 'remotes/lorenzo/pci/misc'
- Remove layerscape-gen4 dependencies on OF and ARM64, add dependency on ARCH_LAYERSCAPE (Geert Uytterhoeven) - Remove obsolete HiSilicon PCIe DT description (Dongdong Liu) * remotes/lorenzo/pci/misc: dt-bindings: PCI: hisi: Delete the obsolete HiSilicon PCIe file PCI: mobiveil: Improve PCIE_LAYERSCAPE_GEN4 dependencies
2 parents 51bc2b7 + 52ab55d commit a4ffbb7

File tree

3 files changed

+1
-46
lines changed

3 files changed

+1
-46
lines changed

Documentation/devicetree/bindings/pci/hisilicon-pcie.txt

Lines changed: 0 additions & 43 deletions
This file was deleted.

MAINTAINERS

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13907,7 +13907,6 @@ PCIE DRIVER FOR HISILICON
1390713907
M: Zhou Wang <[email protected]>
1390813908
1390913909
S: Maintained
13910-
F: Documentation/devicetree/bindings/pci/hisilicon-pcie.txt
1391113910
F: drivers/pci/controller/dwc/pcie-hisi.c
1391213911

1391313912
PCIE DRIVER FOR HISILICON KIRIN

drivers/pci/controller/mobiveil/Kconfig

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ config PCIE_MOBIVEIL_PLAT
2424

2525
config PCIE_LAYERSCAPE_GEN4
2626
bool "Freescale Layerscape PCIe Gen4 controller"
27-
depends on PCI
28-
depends on OF && (ARM64 || ARCH_LAYERSCAPE)
27+
depends on ARCH_LAYERSCAPE || COMPILE_TEST
2928
depends on PCI_MSI_IRQ_DOMAIN
3029
select PCIE_MOBIVEIL_HOST
3130
help

0 commit comments

Comments
 (0)