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

Merge branch 'pci/layerscape' 

- Add Layerscape LX2160A rev2 endpoint mode support (Hou Zhiqiang)

- Convert layerscape to builtin_platform_driver() (Michael Walle)

* pci/layerscape:
  PCI: layerscape: Convert to builtin_platform_driver()
  PCI: layerscape: Add LX2160A rev2 EP mode support
  dt-bindings: PCI: layerscape: Add LX2160A rev2 compatible strings
parents 29b10c60 7007b745

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

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ Required properties: 
	"fsl,ls1046a-pcie-ep", "fsl,ls-pcie-ep"

	"fsl,ls1088a-pcie-ep", "fsl,ls-pcie-ep"

	"fsl,ls2088a-pcie-ep", "fsl,ls-pcie-ep"

	"fsl,lx2160ar2-pcie-ep", "fsl,ls-pcie-ep"

- reg: base addresses and lengths of the PCIe controller register blocks.

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

  entry for each entry in the interrupt-names property.

drivers/pci/controller/dwc/pci-layerscape-ep.c

+7 −0
Original line number Diff line number Diff line
@@ -115,10 +115,17 @@ static const struct ls_pcie_ep_drvdata ls2_ep_drvdata = { 
	.dw_pcie_ops = &dw_ls_pcie_ep_ops,

};



static const struct ls_pcie_ep_drvdata lx2_ep_drvdata = {

	.func_offset = 0x8000,

	.ops = &ls_pcie_ep_ops,

	.dw_pcie_ops = &dw_ls_pcie_ep_ops,

};



static const struct of_device_id ls_pcie_ep_of_match[] = {

	{ .compatible = "fsl,ls1046a-pcie-ep", .data = &ls1_ep_drvdata },

	{ .compatible = "fsl,ls1088a-pcie-ep", .data = &ls2_ep_drvdata },

	{ .compatible = "fsl,ls2088a-pcie-ep", .data = &ls2_ep_drvdata },

	{ .compatible = "fsl,lx2160ar2-pcie-ep", .data = &lx2_ep_drvdata },

	{ },

};

drivers/pci/controller/dwc/pci-layerscape.c

+3 −2
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ static const struct of_device_id ls_pcie_of_match[] = { 
	{ },

};



static int __init ls_pcie_probe(struct platform_device *pdev)

static int ls_pcie_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	struct dw_pcie *pci;
@@ -271,10 +271,11 @@ static int __init ls_pcie_probe(struct platform_device *pdev) 
}



static struct platform_driver ls_pcie_driver = {

	.probe = ls_pcie_probe,

	.driver = {

		.name = "layerscape-pcie",

		.of_match_table = ls_pcie_of_match,

		.suppress_bind_attrs = true,

	},

};

builtin_platform_driver_probe(ls_pcie_driver, ls_pcie_probe);
 
builtin_platform_driver(ls_pcie_driver);