tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Bjorn Helgaas 43c59341 7fe17980

+4 -3
+4 -3
drivers/pci/controller/pcie-xilinx-nwl.c
··· 718 718 nwl_bridge_writel(pcie, nwl_bridge_readl(pcie, E_ECAM_CONTROL) | 719 719 E_ECAM_CR_ENABLE, E_ECAM_CONTROL); 720 720 721 - nwl_bridge_writel(pcie, nwl_bridge_readl(pcie, E_ECAM_CONTROL) | 722 - (NWL_ECAM_MAX_SIZE << E_ECAM_SIZE_SHIFT), 723 - E_ECAM_CONTROL); 721 + ecam_val = nwl_bridge_readl(pcie, E_ECAM_CONTROL); 722 + ecam_val &= ~E_ECAM_SIZE_LOC; 723 + ecam_val |= NWL_ECAM_MAX_SIZE << E_ECAM_SIZE_SHIFT; 724 + nwl_bridge_writel(pcie, ecam_val, E_ECAM_CONTROL); 724 725 725 726 nwl_bridge_writel(pcie, lower_32_bits(pcie->phys_ecam_base), 726 727 E_ECAM_BASE_LO);