Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4ed31f24 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/host-hisi' into next 

* pci/host-hisi:
  PCI: hisi: Add HiSilicon SoC Hip05 PCIe driver
parents c2df02bd 500a1d9a

Documentation/devicetree/bindings/arm/hisilicon/hisilicon.txt

+17 −0
Original line number Original line Diff line number Diff line
@@ -166,6 +166,23 @@ Example: 
		reboot-offset = <0x4>;

		reboot-offset = <0x4>;

	};

	};





-----------------------------------------------------------------------

Hisilicon HiP05 PCIe-SAS system controller



Required properties:

- compatible : "hisilicon,pcie-sas-subctrl", "syscon";

- reg : Register address and size



The HiP05 PCIe-SAS system controller is shared by PCIe and SAS controllers in

HiP05 Soc to implement some basic configurations.



Example:

	/* for HiP05 PCIe-SAS system */

	pcie_sas: system_controller@0xb0000000 {

		compatible = "hisilicon,pcie-sas-subctrl", "syscon";

		reg = <0xb0000000 0x10000>;

	};



-----------------------------------------------------------------------

-----------------------------------------------------------------------

Hisilicon CPU controller

Hisilicon CPU controller

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

0 → 100644
+44 −0
Original line number Original line Diff line number Diff line 
HiSilicon PCIe host bridge DT description



HiSilicon PCIe host controller is based on Designware PCI core.

It shares common functions with PCIe Designware core driver and inherits

common properties defined in

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



Additional properties are described here:



Required properties:

- compatible: Should contain "hisilicon,hip05-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.



Example:

	pcie@0xb0080000 {

		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>;

		#interrupts-cells = <1>;

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

		interrupts-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>;

		status = "ok";

	};

MAINTAINERS

+7 −0
Original line number Original line Diff line number Diff line
@@ -8063,6 +8063,13 @@ S: Maintained 
F:	Documentation/devicetree/bindings/pci/xgene-pci-msi.txt

F:	Documentation/devicetree/bindings/pci/xgene-pci-msi.txt

F:	drivers/pci/host/pci-xgene-msi.c

F:	drivers/pci/host/pci-xgene-msi.c





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/host/pcie-hisi.c



PCMCIA SUBSYSTEM

PCMCIA SUBSYSTEM

P:	Linux PCMCIA Team

P:	Linux PCMCIA Team

L:	linux-pcmcia@lists.infradead.org

L:	linux-pcmcia@lists.infradead.org

drivers/pci/host/Kconfig

+8 −0
Original line number Original line Diff line number Diff line
@@ -164,4 +164,12 @@ config PCIE_ALTERA_MSI 
	  Say Y here if you want PCIe MSI support for the Altera FPGA.

	  Say Y here if you want PCIe MSI support for the Altera FPGA.

	  This MSI driver supports Altera MSI to GIC controller IP.

	  This MSI driver supports Altera MSI to GIC controller IP.





config PCI_HISI

	depends on OF && ARM64

	bool "HiSilicon SoC HIP05 PCIe controller"

	select PCIEPORTBUS

	select PCIE_DW

	help

	  Say Y here if you want PCIe controller support on HiSilicon HIP05 SoC



endmenu
 
endmenu

drivers/pci/host/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -19,3 +19,4 @@ obj-$(CONFIG_PCIE_IPROC_PLATFORM) += pcie-iproc-platform.o 
obj-$(CONFIG_PCIE_IPROC_BCMA) += pcie-iproc-bcma.o

obj-$(CONFIG_PCIE_IPROC_BCMA) += pcie-iproc-bcma.o

obj-$(CONFIG_PCIE_ALTERA) += pcie-altera.o

obj-$(CONFIG_PCIE_ALTERA) += pcie-altera.o

obj-$(CONFIG_PCIE_ALTERA_MSI) += pcie-altera-msi.o

obj-$(CONFIG_PCIE_ALTERA_MSI) += pcie-altera-msi.o

obj-$(CONFIG_PCI_HISI) += pcie-hisi.o