Commit 43c59341 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/controller/xilinx-nwl' 

- Clear bootloader E_ECAM_CONTROL before merging in the new driver value
  (Jani Nurminen)

* pci/controller/xilinx-nwl:
  PCI: xilinx-nwl: Fix ECAM programming
parents 7fe17980 98a4f5b7

drivers/pci/controller/pcie-xilinx-nwl.c

+4 −3
Original line number Diff line number Diff line
@@ -718,9 +718,10 @@ static int nwl_pcie_bridge_init(struct nwl_pcie *pcie) 
	nwl_bridge_writel(pcie, nwl_bridge_readl(pcie, E_ECAM_CONTROL) |

			  E_ECAM_CR_ENABLE, E_ECAM_CONTROL);



	nwl_bridge_writel(pcie, nwl_bridge_readl(pcie, E_ECAM_CONTROL) |

			  (NWL_ECAM_MAX_SIZE << E_ECAM_SIZE_SHIFT),

			  E_ECAM_CONTROL);

	ecam_val = nwl_bridge_readl(pcie, E_ECAM_CONTROL);

	ecam_val &= ~E_ECAM_SIZE_LOC;

	ecam_val |= NWL_ECAM_MAX_SIZE << E_ECAM_SIZE_SHIFT;

	nwl_bridge_writel(pcie, ecam_val, E_ECAM_CONTROL);



	nwl_bridge_writel(pcie, lower_32_bits(pcie->phys_ecam_base),

			  E_ECAM_BASE_LO);