diff options
Diffstat (limited to 'drivers/pci/controller/dwc')
| -rw-r--r-- | drivers/pci/controller/dwc/pci-keystone.c | 13 | ||||
| -rw-r--r-- | drivers/pci/controller/dwc/pcie-designware.c | 15 | ||||
| -rw-r--r-- | drivers/pci/controller/dwc/pcie-designware.h | 8 | 
3 files changed, 0 insertions, 36 deletions
diff --git a/drivers/pci/controller/dwc/pci-keystone.c b/drivers/pci/controller/dwc/pci-keystone.c index 39a5a72de340..5fe36da0b7c6 100644 --- a/drivers/pci/controller/dwc/pci-keystone.c +++ b/drivers/pci/controller/dwc/pci-keystone.c @@ -881,18 +881,6 @@ static int __init ks_pcie_add_pcie_port(struct keystone_pcie *ks_pcie,  	return 0;  } -static u32 ks_pcie_am654_read_dbi2(struct dw_pcie *pci, void __iomem *base, -				   u32 reg, size_t size) -{ -	struct keystone_pcie *ks_pcie = to_keystone_pcie(pci); -	u32 val; - -	ks_pcie_set_dbi_mode(ks_pcie); -	dw_pcie_read(base + reg, size, &val); -	ks_pcie_clear_dbi_mode(ks_pcie); -	return val; -} -  static void ks_pcie_am654_write_dbi2(struct dw_pcie *pci, void __iomem *base,  				     u32 reg, size_t size, u32 val)  { @@ -907,7 +895,6 @@ static const struct dw_pcie_ops ks_pcie_dw_pcie_ops = {  	.start_link = ks_pcie_start_link,  	.stop_link = ks_pcie_stop_link,  	.link_up = ks_pcie_link_up, -	.read_dbi2 = ks_pcie_am654_read_dbi2,  	.write_dbi2 = ks_pcie_am654_write_dbi2,  }; diff --git a/drivers/pci/controller/dwc/pcie-designware.c b/drivers/pci/controller/dwc/pcie-designware.c index 90dc1674aae5..9e389a9be691 100644 --- a/drivers/pci/controller/dwc/pcie-designware.c +++ b/drivers/pci/controller/dwc/pcie-designware.c @@ -166,21 +166,6 @@ void dw_pcie_write_dbi(struct dw_pcie *pci, u32 reg, size_t size, u32 val)  }  EXPORT_SYMBOL_GPL(dw_pcie_write_dbi); -u32 dw_pcie_read_dbi2(struct dw_pcie *pci, u32 reg, size_t size) -{ -	int ret; -	u32 val; - -	if (pci->ops->read_dbi2) -		return pci->ops->read_dbi2(pci, pci->dbi_base2, reg, size); - -	ret = dw_pcie_read(pci->dbi_base2 + reg, size, &val); -	if (ret) -		dev_err(pci->dev, "read DBI address failed\n"); - -	return val; -} -  void dw_pcie_write_dbi2(struct dw_pcie *pci, u32 reg, size_t size, u32 val)  {  	int ret; diff --git a/drivers/pci/controller/dwc/pcie-designware.h b/drivers/pci/controller/dwc/pcie-designware.h index c56f1adb0d78..9f4db9fb9057 100644 --- a/drivers/pci/controller/dwc/pcie-designware.h +++ b/drivers/pci/controller/dwc/pcie-designware.h @@ -232,8 +232,6 @@ struct dw_pcie_ops {  			    size_t size);  	void	(*write_dbi)(struct dw_pcie *pcie, void __iomem *base, u32 reg,  			     size_t size, u32 val); -	u32     (*read_dbi2)(struct dw_pcie *pcie, void __iomem *base, u32 reg, -			     size_t size);  	void    (*write_dbi2)(struct dw_pcie *pcie, void __iomem *base, u32 reg,  			      size_t size, u32 val);  	int	(*link_up)(struct dw_pcie *pcie); @@ -269,7 +267,6 @@ int dw_pcie_write(void __iomem *addr, int size, u32 val);  u32 dw_pcie_read_dbi(struct dw_pcie *pci, u32 reg, size_t size);  void dw_pcie_write_dbi(struct dw_pcie *pci, u32 reg, size_t size, u32 val); -u32 dw_pcie_read_dbi2(struct dw_pcie *pci, u32 reg, size_t size);  void dw_pcie_write_dbi2(struct dw_pcie *pci, u32 reg, size_t size, u32 val);  u32 dw_pcie_read_atu(struct dw_pcie *pci, u32 reg, size_t size);  void dw_pcie_write_atu(struct dw_pcie *pci, u32 reg, size_t size, u32 val); @@ -322,11 +319,6 @@ static inline void dw_pcie_writel_dbi2(struct dw_pcie *pci, u32 reg, u32 val)  	dw_pcie_write_dbi2(pci, reg, 0x4, val);  } -static inline u32 dw_pcie_readl_dbi2(struct dw_pcie *pci, u32 reg) -{ -	return dw_pcie_read_dbi2(pci, reg, 0x4); -} -  static inline void dw_pcie_writel_atu(struct dw_pcie *pci, u32 reg, u32 val)  {  	dw_pcie_write_atu(pci, reg, 0x4, val);  | 
