Commit 87c71931 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/driver-cleanup' 

- Use of_device_get_match_data(), not of_match_device(), when we only need
  the device data in altera, artpec6, cadence, designware-plat, dra7xx,
  keystone, kirin (Fan Fei)

- Drop pointless of_device_get_match_data() cast in j721e (Bjorn Helgaas)

- Drop redundant struct device * from j721e since struct cdns_pcie already
  has one (Bjorn Helgaas)

- Rename driver structs to *_pcie in intel-gw, iproc, ls-gen4,
  mediatek-gen3, microchip, mt7621, rcar-gen2, tegra194, uniphier, xgene,
  xilinx, xilinx-cpm for consistency across drivers (Fan Fei)

- Fix invalid address space conversions in hisi, spear13xx (Bjorn Helgaas)

* pci/driver-cleanup:
  PCI: spear13xx: Avoid invalid address space conversions
  PCI: hisi: Avoid invalid address space conversions
  PCI: xilinx-cpm: Rename xilinx_cpm_pcie_port to xilinx_cpm_pcie
  PCI: xilinx: Rename xilinx_pcie_port to xilinx_pcie
  PCI: xgene: Rename xgene_pcie_port to xgene_pcie
  PCI: uniphier: Rename uniphier_pcie_priv to uniphier_pcie
  PCI: tegra194: Rename tegra_pcie_dw to tegra194_pcie
  PCI: rcar-gen2: Rename rcar_pci_priv to rcar_pci
  PCI: mt7621: Rename mt7621_pci_ to mt7621_pcie_
  PCI: microchip: Rename mc_port to mc_pcie
  PCI: mediatek-gen3: Rename mtk_pcie_port to mtk_gen3_pcie
  PCI: ls-gen4: Rename ls_pcie_g4 to ls_g4_pcie
  PCI: iproc: Rename iproc_pcie_pltfm_ to iproc_pltfm_pcie_
  PCI: iproc: Rename iproc_pcie_bcma_ to iproc_bcma_pcie_
  PCI: intel-gw: Rename intel_pcie_port to intel_pcie
  PCI: j721e: Drop redundant struct device *
  PCI: j721e: Drop pointless of_device_get_match_data() cast
  PCI: kirin: Prefer of_device_get_match_data()
  PCI: keystone: Prefer of_device_get_match_data()
  PCI: dra7xx: Prefer of_device_get_match_data()
  PCI: designware-plat: Prefer of_device_get_match_data()
  PCI: cadence: Prefer of_device_get_match_data()
  PCI: artpec6: Prefer of_device_get_match_data()
  PCI: altera: Prefer of_device_get_match_data()

# Conflicts:
#	drivers/pci/controller/pcie-mt7621.c
parents f5d3ca6f 73a0c2be

drivers/pci/controller/cadence/pci-j721e.c

+8 −10
Original line number Diff line number Diff line
@@ -51,11 +51,10 @@ enum link_status { 
#define MAX_LANES			2



struct j721e_pcie {

	struct device		*dev;

	struct cdns_pcie	*cdns_pcie;

	struct clk		*refclk;

	u32			mode;

	u32			num_lanes;

	struct cdns_pcie	*cdns_pcie;

	void __iomem		*user_cfg_base;

	void __iomem		*intd_cfg_base;

	u32			linkdown_irq_regfield;
@@ -99,7 +98,7 @@ static inline void j721e_pcie_intd_writel(struct j721e_pcie *pcie, u32 offset, 
static irqreturn_t j721e_pcie_link_irq_handler(int irq, void *priv)

{

	struct j721e_pcie *pcie = priv;

	struct device *dev = pcie->dev;

	struct device *dev = pcie->cdns_pcie->dev;

	u32 reg;



	reg = j721e_pcie_intd_readl(pcie, STATUS_REG_SYS_2);
@@ -165,7 +164,7 @@ static const struct cdns_pcie_ops j721e_pcie_ops = { 
static int j721e_pcie_set_mode(struct j721e_pcie *pcie, struct regmap *syscon,

			       unsigned int offset)

{

	struct device *dev = pcie->dev;

	struct device *dev = pcie->cdns_pcie->dev;

	u32 mask = J721E_MODE_RC;

	u32 mode = pcie->mode;

	u32 val = 0;
@@ -184,7 +183,7 @@ static int j721e_pcie_set_mode(struct j721e_pcie *pcie, struct regmap *syscon, 
static int j721e_pcie_set_link_speed(struct j721e_pcie *pcie,

				     struct regmap *syscon, unsigned int offset)

{

	struct device *dev = pcie->dev;

	struct device *dev = pcie->cdns_pcie->dev;

	struct device_node *np = dev->of_node;

	int link_speed;

	u32 val = 0;
@@ -205,7 +204,7 @@ static int j721e_pcie_set_link_speed(struct j721e_pcie *pcie, 
static int j721e_pcie_set_lane_count(struct j721e_pcie *pcie,

				     struct regmap *syscon, unsigned int offset)

{

	struct device *dev = pcie->dev;

	struct device *dev = pcie->cdns_pcie->dev;

	u32 lanes = pcie->num_lanes;

	u32 val = 0;

	int ret;
@@ -220,7 +219,7 @@ static int j721e_pcie_set_lane_count(struct j721e_pcie *pcie, 


static int j721e_pcie_ctrl_init(struct j721e_pcie *pcie)

{

	struct device *dev = pcie->dev;

	struct device *dev = pcie->cdns_pcie->dev;

	struct device_node *node = dev->of_node;

	struct of_phandle_args args;

	unsigned int offset = 0;
@@ -354,7 +353,7 @@ static int j721e_pcie_probe(struct platform_device *pdev) 
	struct device *dev = &pdev->dev;

	struct device_node *node = dev->of_node;

	struct pci_host_bridge *bridge;

	struct j721e_pcie_data *data;

	const struct j721e_pcie_data *data;

	struct cdns_pcie *cdns_pcie;

	struct j721e_pcie *pcie;

	struct cdns_pcie_rc *rc;
@@ -367,7 +366,7 @@ static int j721e_pcie_probe(struct platform_device *pdev) 
	int ret;

	int irq;



	data = (struct j721e_pcie_data *)of_device_get_match_data(dev);

	data = of_device_get_match_data(dev);

	if (!data)

		return -EINVAL;
@@ -377,7 +376,6 @@ static int j721e_pcie_probe(struct platform_device *pdev) 
	if (!pcie)

		return -ENOMEM;



	pcie->dev = dev;

	pcie->mode = mode;

	pcie->linkdown_irq_regfield = data->linkdown_irq_regfield;

drivers/pci/controller/cadence/pcie-cadence-plat.c

+2 −4
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ static int cdns_plat_pcie_probe(struct platform_device *pdev) 
{

	const struct cdns_plat_pcie_of_data *data;

	struct cdns_plat_pcie *cdns_plat_pcie;

	const struct of_device_id *match;

	struct device *dev = &pdev->dev;

	struct pci_host_bridge *bridge;

	struct cdns_pcie_ep *ep;
@@ -54,11 +53,10 @@ static int cdns_plat_pcie_probe(struct platform_device *pdev) 
	bool is_rc;

	int ret;



	match = of_match_device(cdns_plat_pcie_of_match, dev);

	if (!match)

	data = of_device_get_match_data(dev);

	if (!data)

		return -EINVAL;



	data = (struct cdns_plat_pcie_of_data *)match->data;

	is_rc = data->is_rc;



	pr_debug(" Started %s with is_rc: %d\n", __func__, is_rc);

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

+2 −4
Original line number Diff line number Diff line
@@ -697,16 +697,14 @@ static int dra7xx_pcie_probe(struct platform_device *pdev) 
	struct device_node *np = dev->of_node;

	char name[10];

	struct gpio_desc *reset;

	const struct of_device_id *match;

	const struct dra7xx_pcie_of_data *data;

	enum dw_pcie_device_mode mode;

	u32 b1co_mode_sel_mask;



	match = of_match_device(of_match_ptr(of_dra7xx_pcie_match), dev);

	if (!match)

	data = of_device_get_match_data(dev);

	if (!data)

		return -EINVAL;



	data = (struct dra7xx_pcie_of_data *)match->data;

	mode = (enum dw_pcie_device_mode)data->mode;

	b1co_mode_sel_mask = data->b1co_mode_sel_mask;

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

+1 −3
Original line number Diff line number Diff line
@@ -1108,7 +1108,6 @@ static int __init ks_pcie_probe(struct platform_device *pdev) 
	struct device *dev = &pdev->dev;

	struct device_node *np = dev->of_node;

	const struct ks_pcie_of_data *data;

	const struct of_device_id *match;

	enum dw_pcie_device_mode mode;

	struct dw_pcie *pci;

	struct keystone_pcie *ks_pcie;
@@ -1125,8 +1124,7 @@ static int __init ks_pcie_probe(struct platform_device *pdev) 
	int irq;

	int i;



	match = of_match_device(of_match_ptr(ks_pcie_of_match), dev);

	data = (struct ks_pcie_of_data *)match->data;

	data = of_device_get_match_data(dev);

	if (!data)

		return -EINVAL;

drivers/pci/controller/dwc/pcie-artpec6.c

+2 −4
Original line number Diff line number Diff line
@@ -380,17 +380,15 @@ static int artpec6_pcie_probe(struct platform_device *pdev) 
	struct dw_pcie *pci;

	struct artpec6_pcie *artpec6_pcie;

	int ret;

	const struct of_device_id *match;

	const struct artpec_pcie_of_data *data;

	enum artpec_pcie_variants variant;

	enum dw_pcie_device_mode mode;

	u32 val;



	match = of_match_device(artpec6_pcie_of_match, dev);

	if (!match)

	data = of_device_get_match_data(dev);

	if (!data)

		return -EINVAL;



	data = (struct artpec_pcie_of_data *)match->data;

	variant = (enum artpec_pcie_variants)data->variant;

	mode = (enum dw_pcie_device_mode)data->mode;