Commit a4ffbb7a authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

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
parents 51bc2b7f 52ab55df

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

deleted100644 → 0
+0 −43
Original line number Diff line number Diff line 
HiSilicon Hip05 and Hip06 PCIe host bridge DT description



HiSilicon PCIe host controller is based on the Synopsys DesignWare PCI core.

It shares common functions with the PCIe DesignWare core driver and inherits

common properties defined in

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



Additional properties are described here:



Required properties

- compatible: Should contain "hisilicon,hip05-pcie" or "hisilicon,hip06-pcie".

- reg: Should contain rc_dbi, config registers location and length.

- reg-names: Must include the following entries:

  "rc_dbi": controller configuration registers;

  "config": PCIe configuration space registers.

- msi-parent: Should be its_pcie which is an ITS receiving MSI interrupts.

- port-id: Should be 0, 1, 2 or 3.



Optional properties:

- status: Either "ok" or "disabled".

- dma-coherent: Present if DMA operations are coherent.



Hip05 Example (note that Hip06 is the same except compatible):

	pcie@b0080000 {

		compatible = "hisilicon,hip05-pcie", "snps,dw-pcie";

		reg = <0 0xb0080000 0 0x10000>, <0x220 0x00000000 0 0x2000>;

		reg-names = "rc_dbi", "config";

		bus-range = <0  15>;

		msi-parent = <&its_pcie>;

		#address-cells = <3>;

		#size-cells = <2>;

		device_type = "pci";

		dma-coherent;

		ranges = <0x82000000 0 0x00000000 0x220 0x00000000 0 0x10000000>;

		num-lanes = <8>;

		port-id = <1>;

		#interrupt-cells = <1>;

		interrupt-map-mask = <0xf800 0 0 7>;

		interrupt-map = <0x0 0 0 1 &mbigen_pcie 1 10

				 0x0 0 0 2 &mbigen_pcie 2 11

				 0x0 0 0 3 &mbigen_pcie 3 12

				 0x0 0 0 4 &mbigen_pcie 4 13>;

	};

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -13907,7 +13907,6 @@ PCIE DRIVER FOR HISILICON 
M:	Zhou Wang <wangzhou1@hisilicon.com>

L:	linux-pci@vger.kernel.org

S:	Maintained

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

F:	drivers/pci/controller/dwc/pcie-hisi.c









PCIE DRIVER FOR HISILICON KIRIN
































drivers/pci/controller/mobiveil/Kconfig



+1
−2






























Original line number
Diff line number
Diff line







@@ -24,8 +24,7 @@ config PCIE_MOBIVEIL_PLAT

















config PCIE_LAYERSCAPE_GEN4









	bool "Freescale Layerscape PCIe Gen4 controller"









	depends on PCI









	depends on OF && (ARM64 || ARCH_LAYERSCAPE)









	depends on ARCH_LAYERSCAPE || COMPILE_TEST









	depends on PCI_MSI_IRQ_DOMAIN









	select PCIE_MOBIVEIL_HOST









	help