Commit 8b38b5f2 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'remotes/lorenzo/pci/mediatek' 

  - Add mediatek support for MT7629 (Jianjun Wang)

* remotes/lorenzo/pci/mediatek:
  PCI: mediatek: Add controller support for MT7629
  dt-bindings: PCI: Add support for MT7629
parents 5adc7d51 0cccd42e

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

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ Required properties: 
	"mediatek,mt2712-pcie"

	"mediatek,mt7622-pcie"

	"mediatek,mt7623-pcie"

	"mediatek,mt7629-pcie"

- device_type: Must be "pci"

- reg: Base addresses and lengths of the PCIe subsys and root ports.

- reg-names: Names of the above areas to use during resource lookup.

drivers/pci/controller/pcie-mediatek.c

+18 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ 
#define PCIE_MSI_VECTOR		0x0c0



#define PCIE_CONF_VEND_ID	0x100

#define PCIE_CONF_DEVICE_ID	0x102

#define PCIE_CONF_CLASS_ID	0x106



#define PCIE_INT_MASK		0x420
@@ -141,12 +142,16 @@ struct mtk_pcie_port; 
/**

 * struct mtk_pcie_soc - differentiate between host generations

 * @need_fix_class_id: whether this host's class ID needed to be fixed or not

 * @need_fix_device_id: whether this host's device ID needed to be fixed or not

 * @device_id: device ID which this host need to be fixed

 * @ops: pointer to configuration access functions

 * @startup: pointer to controller setting functions

 * @setup_irq: pointer to initialize IRQ functions

 */

struct mtk_pcie_soc {

	bool need_fix_class_id;

	bool need_fix_device_id;

	unsigned int device_id;

	struct pci_ops *ops;

	int (*startup)(struct mtk_pcie_port *port);

	int (*setup_irq)(struct mtk_pcie_port *port, struct device_node *node);
@@ -696,6 +701,9 @@ static int mtk_pcie_startup_port_v2(struct mtk_pcie_port *port) 
		writew(val, port->base + PCIE_CONF_CLASS_ID);

	}



	if (soc->need_fix_device_id)

		writew(soc->device_id, port->base + PCIE_CONF_DEVICE_ID);



	/* 100ms timeout value should be enough for Gen1/2 training */

	err = readl_poll_timeout(port->base + PCIE_LINK_STATUS_V2, val,

				 !!(val & PCIE_PORT_LINKUP_V2), 20,
@@ -1216,11 +1224,21 @@ static const struct mtk_pcie_soc mtk_pcie_soc_mt7622 = { 
	.setup_irq = mtk_pcie_setup_irq,

};



static const struct mtk_pcie_soc mtk_pcie_soc_mt7629 = {

	.need_fix_class_id = true,

	.need_fix_device_id = true,

	.device_id = PCI_DEVICE_ID_MEDIATEK_7629,

	.ops = &mtk_pcie_ops_v2,

	.startup = mtk_pcie_startup_port_v2,

	.setup_irq = mtk_pcie_setup_irq,

};



static const struct of_device_id mtk_pcie_ids[] = {

	{ .compatible = "mediatek,mt2701-pcie", .data = &mtk_pcie_soc_v1 },

	{ .compatible = "mediatek,mt7623-pcie", .data = &mtk_pcie_soc_v1 },

	{ .compatible = "mediatek,mt2712-pcie", .data = &mtk_pcie_soc_mt2712 },

	{ .compatible = "mediatek,mt7622-pcie", .data = &mtk_pcie_soc_mt7622 },

	{ .compatible = "mediatek,mt7629-pcie", .data = &mtk_pcie_soc_mt7629 },

	{},

};

include/linux/pci_ids.h

+1 −0
Original line number Diff line number Diff line
@@ -2132,6 +2132,7 @@ 
#define PCI_VENDOR_ID_MYRICOM		0x14c1



#define PCI_VENDOR_ID_MEDIATEK		0x14c3

#define PCI_DEVICE_ID_MEDIATEK_7629	0x7629



#define PCI_VENDOR_ID_TITAN		0x14D2

#define PCI_DEVICE_ID_TITAN_010L	0x8001