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

Commit 35437e3d authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branches 'pci/host-designware', 'pci/host-dra7xx', 'pci/host-exynos',... 

Merge branches 'pci/host-designware', 'pci/host-dra7xx', 'pci/host-exynos', 'pci/host-generic', 'pci/host-imx6', 'pci/host-keystone', 'pci/host-layerscape', 'pci/host-mvebu', 'pci/host-rcar', 'pci/host-spear' and 'pci/host-tegra' into next

* pci/host-designware:
  PCI: designware: Add a blank line after declarations

* pci/host-dra7xx:
  PCI: dra7xx: Add __init annotation to dra7xx_add_pcie_port()
  PCI: dra7xx: Rename add_pcie_port() to dra7xx_add_pcie_port()

* pci/host-exynos:
  PCI: exynos: Remove unnecessary return statement
  PCI: exynos: Add exynos prefix to add_pcie_port()/pcie_init()

* pci/host-generic:
  PCI: generic: Convert to DT resource parsing API
  PCI: generic: Allocate config space windows after limiting bus number range

* pci/host-imx6:
  PCI: imx6: Use tabs for indentation

* pci/host-keystone:
  PCI: keystone: Remove unnecessary OOM message
  PCI: keystone: Make ks_dw_pcie_msi_domain_ops static

* pci/host-layerscape:
  PCI: layerscape: Add Freescale Layerscape PCIe driver

* pci/host-mvebu:
  PCI: mvebu: Add a blank line after declarations

* pci/host-rcar:
  PCI: rcar: Make rcar_pci static

* pci/host-spear:
  PCI: spear: Remove unnecessary OOM message
  PCI: spear: Add __init annotation to spear13xx_add_pcie_port()
  PCI: spear: Rename add_pcie_port(), pcie_init() to spear13xx_add_pcie_port(), etc.

* pci/host-tegra:
  PCI: tegra: Add Kconfig help text
  PCI: tegra: Do not build on 64-bit ARM
parents f114040e 2c992f37 e73044a0 bc512c5a dbf9826d d88a7ef9 66700707 62d0ff83 cf3a9d6b 3c70637f 20f9ece1 6b1c4d76

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

0 → 100644
+42 −0
Original line number Diff line number Diff line 
Freescale Layerscape PCIe controller



This PCIe host controller is based on the Synopsis Designware PCIe IP

and thus inherits all the common properties defined in designware-pcie.txt.



Required properties:

- compatible: should contain the platform identifier such as "fsl,ls1021a-pcie"

- reg: base addresses and lengths of the PCIe controller

- interrupts: A list of interrupt outputs of the controller. Must contain an

  entry for each entry in the interrupt-names property.

- interrupt-names: Must include the following entries:

  "intr": The interrupt that is asserted for controller interrupts

- fsl,pcie-scfg: Must include two entries.

  The first entry must be a link to the SCFG device node

  The second entry must be '0' or '1' based on physical PCIe controller index.

  This is used to get SCFG PEXN registers



Example:



	pcie@3400000 {

		compatible = "fsl,ls1021a-pcie", "snps,dw-pcie";

		reg = <0x00 0x03400000 0x0 0x00010000   /* controller registers */

		       0x40 0x00000000 0x0 0x00002000>; /* configuration space */

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

		interrupts = <GIC_SPI 177 IRQ_TYPE_LEVEL_HIGH>; /* controller interrupt */

		interrupt-names = "intr";

		fsl,pcie-scfg = <&scfg 0>;

		#address-cells = <3>;

		#size-cells = <2>;

		device_type = "pci";

		num-lanes = <4>;

		bus-range = <0x0 0xff>;

		ranges = <0x81000000 0x0 0x00000000 0x40 0x00010000 0x0 0x00010000   /* downstream I/O */

			  0xc2000000 0x0 0x20000000 0x40 0x20000000 0x0 0x20000000   /* prefetchable memory */

			  0x82000000 0x0 0x40000000 0x40 0x40000000 0x0 0x40000000>; /* non-prefetchable memory */

		#interrupt-cells = <1>;

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

		interrupt-map = <0000 0 0 1 &gic GIC_SPI 91  IRQ_TYPE_LEVEL_HIGH>,

				<0000 0 0 2 &gic GIC_SPI 188 IRQ_TYPE_LEVEL_HIGH>,

				<0000 0 0 3 &gic GIC_SPI 190 IRQ_TYPE_LEVEL_HIGH>,

				<0000 0 0 4 &gic GIC_SPI 192 IRQ_TYPE_LEVEL_HIGH>;

	};

MAINTAINERS

+10 −0
Original line number Diff line number Diff line
@@ -6983,6 +6983,16 @@ S: Maintained 
F:	Documentation/devicetree/bindings/pci/xgene-pci.txt

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



PCI DRIVER FOR FREESCALE LAYERSCAPE

M:	Minghuan Lian <minghuan.Lian@freescale.com>

M:	Mingkai Hu <mingkai.hu@freescale.com>

M:	Roy Zang <tie-fei.zang@freescale.com>

L:	linuxppc-dev@lists.ozlabs.org

L:	linux-pci@vger.kernel.org

L:	linux-arm-kernel@lists.infradead.org

S:	Maintained

F:	drivers/pci/host/*layerscape*



PCI DRIVER FOR IMX6

M:	Richard Zhu <r65037@freescale.com>

M:	Lucas Stach <l.stach@pengutronix.de>

drivers/pci/host/Kconfig

+12 −1
Original line number Diff line number Diff line
@@ -32,7 +32,10 @@ config PCI_IMX6 


config PCI_TEGRA

	bool "NVIDIA Tegra PCIe controller"

	depends on ARCH_TEGRA

	depends on ARCH_TEGRA && !ARM64

	help

	  Say Y here if you want support for the PCIe host controller found

	  on NVIDIA Tegra SoCs.



config PCI_RCAR_GEN2

	bool "Renesas R-Car Gen2 Internal PCI controller"
@@ -91,4 +94,12 @@ config PCI_XGENE 
	  There are 5 internal PCIe ports available. Each port is GEN3 capable

	  and have varied lanes from x1 to x8.



config PCI_LAYERSCAPE

	bool "Freescale Layerscape PCIe controller"

	depends on OF && ARM

	select PCIE_DW

	select MFD_SYSCON

	help

	  Say Y here if you want PCIe controller support on Layerscape SoCs.



endmenu

drivers/pci/host/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -11,3 +11,4 @@ obj-$(CONFIG_PCIE_SPEAR13XX) += pcie-spear13xx.o 
obj-$(CONFIG_PCI_KEYSTONE) += pci-keystone-dw.o pci-keystone.o

obj-$(CONFIG_PCIE_XILINX) += pcie-xilinx.o

obj-$(CONFIG_PCI_XGENE) += pci-xgene.o

obj-$(CONFIG_PCI_LAYERSCAPE) += pci-layerscape.o

drivers/pci/host/pci-dra7xx.c

+3 −3
Original line number Diff line number Diff line
@@ -270,7 +270,7 @@ static irqreturn_t dra7xx_pcie_irq_handler(int irq, void *arg) 
	return IRQ_HANDLED;

}



static int add_pcie_port(struct dra7xx_pcie *dra7xx,

static int __init dra7xx_add_pcie_port(struct dra7xx_pcie *dra7xx,

				       struct platform_device *pdev)

{

	int ret;
@@ -398,7 +398,7 @@ static int __init dra7xx_pcie_probe(struct platform_device *pdev) 


	platform_set_drvdata(pdev, dra7xx);



	ret = add_pcie_port(dra7xx, pdev);

	ret = dra7xx_add_pcie_port(dra7xx, pdev);

	if (ret < 0)

		goto err_add_port;